Diff
Modified: trunk/LayoutTests/ChangeLog (92547 => 92548)
--- trunk/LayoutTests/ChangeLog 2011-08-06 09:27:19 UTC (rev 92547)
+++ trunk/LayoutTests/ChangeLog 2011-08-06 09:40:43 UTC (rev 92548)
@@ -1,5 +1,20 @@
2011-08-06 Nikolas Zimmermann <[email protected]>
+ More gardening: Fix mac-leopard/mac-wk2 failing SVG tests.
+
+ Not reviewed.
+
+ * platform/mac-leopard/svg/W3C-SVG-1.1-SE/text-intro-02-b-expected.txt:
+ * platform/mac-leopard/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.txt:
+ * platform/mac-leopard/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt: Added.
+ * platform/mac-wk2/svg/W3C-SVG-1.1: Added.
+ * platform/mac-wk2/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.txt: Added.
+ * platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt: Added.
+ * platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-huge-size-expected.txt: Added.
+ * platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.txt: Added.
+
+2011-08-06 Nikolas Zimmermann <[email protected]>
+
Win gardening: Rebaseline four svg tests that only needed an update, win7/winxp svg results are clean again.
Not reviewed.
Modified: trunk/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1-SE/text-intro-02-b-expected.txt (92547 => 92548)
--- trunk/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1-SE/text-intro-02-b-expected.txt 2011-08-06 09:27:19 UTC (rev 92547)
+++ trunk/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1-SE/text-intro-02-b-expected.txt 2011-08-06 09:40:43 UTC (rev 92548)
@@ -27,8 +27,11 @@
chunk 1 (end anchor) text run 1 at (10.00,280.00) startOffset 0 endOffset 12 width 99.00: "is in Hebrew"
chunk 1 (end anchor) text run 1 at (109.00,280.00) startOffset 0 endOffset 40 width 308.14 RTL: " \"\x{5D0}\x{5E0}\x{5D9} \x{5D9}\x{5DB}\x{5D5}\x{5DC} \x{5DC}\x{5D0}\x{5DB}\x{5D5}\x{5DC} \x{5D6}\x{5DB}\x{5D5}\x{5DB}\x{5D9}\x{5EA} \x{5D5}\x{5D6}\x{5D4} \x{5DC}\x{5D0} \x{5DE}\x{5D6}\x{5D9}\x{5E7} \x{5DC}\x{5D9}\" "
chunk 1 (end anchor) text run 1 at (417.14,280.00) startOffset 0 endOffset 4 width 35.00: "Text"
- RenderSVGContainer {g} at (10,310) size 231x38
- RenderSVGText {text} at (10,310) size 231x38 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 231x38
- chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 231.00: "$Revision: 1.9 $"
+ RenderSVGContainer {g} at (10,314) size 227x33
+ RenderSVGText {text} at (10,314) size 227x33 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 227x33
+ chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
+ chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
+ chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
+ chunk 1 text run 4 at (182.83,340.00) startOffset 12 endOffset 16 width 53.38: ".9 $"
RenderSVGPath {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
Modified: trunk/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.txt (92547 => 92548)
--- trunk/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.txt 2011-08-06 09:27:19 UTC (rev 92547)
+++ trunk/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.txt 2011-08-06 09:40:43 UTC (rev 92548)
@@ -13,8 +13,11 @@
RenderSVGText {text} at (119,212) size 341x36 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 341x36
chunk 1 text run 1 at (119.00,240.00) startOffset 0 endOffset 37 width 341.00 RTL: "\x{644}\x{645}\x{627}\x{630}\x{627} \x{644}\x{627} \x{64A}\x{62A}\x{643}\x{644}\x{645}\x{648}\x{646} \x{627}\x{644}\x{644}\x{651}\x{63A}\x{629} \x{627}\x{644}\x{639}\x{631}\x{628}\x{64A}\x{629} \x{641}\x{62D}\x{633}\x{628}\x{61F}"
- RenderSVGContainer {g} at (10,310) size 231x38
- RenderSVGText {text} at (10,310) size 231x38 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 231x38
- chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 231.00: "$Revision: 1.7 $"
+ RenderSVGContainer {g} at (10,314) size 227x33
+ RenderSVGText {text} at (10,314) size 227x33 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 227x33
+ chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
+ chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
+ chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
+ chunk 1 text run 4 at (182.83,340.00) startOffset 12 endOffset 16 width 53.38: ".7 $"
RenderSVGPath {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
Added: trunk/LayoutTests/platform/mac-leopard/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt (0 => 92548)
--- trunk/LayoutTests/platform/mac-leopard/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-leopard/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt 2011-08-06 09:40:43 UTC (rev 92548)
@@ -0,0 +1,23 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x171
+ RenderBlock {HTML} at (0,0) size 800x171
+ RenderBody {BODY} at (5,5) size 790x161
+ RenderEmbeddedObject {OBJECT} at (0,0) size 158x158 [border: (1px dashed #800000)]
+ layer at (0,0) size 152x152
+ RenderView at (0,0) size 152x152
+ layer at (0,0) size 152x152
+ RenderSVGRoot {svg} at (0,0) size 152x152
+ RenderSVGPath {circle} at (0,0) size 152x152 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [cx=110.00] [cy=110.00] [r=110.00]
+ RenderText {#text} at (158,148) size 3x13
+ text run at (158,148) width 3: " "
+ RenderEmbeddedObject {OBJECT} at (161,0) size 158x158 [border: (1px dashed #800000)]
+ layer at (0,0) size 183x183
+ RenderView at (0,0) size 183x183
+ layer at (0,0) size 152x152
+ RenderSVGRoot {svg} at (0,0) size 152x152
+ RenderSVGPath {circle} at (0,0) size 152x152 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [cx=110.00] [cy=110.00] [r=110.00]
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
Added: trunk/LayoutTests/platform/mac-wk2/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.txt (0 => 92548)
--- trunk/LayoutTests/platform/mac-wk2/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.txt 2011-08-06 09:40:43 UTC (rev 92548)
@@ -0,0 +1,39 @@
+layer at (0,0) size 480x360
+ RenderView at (0,0) size 480x360
+layer at (0,0) size 480x360
+ RenderSVGRoot {svg} at (0,0) size 480x360
+ RenderSVGContainer {g} at (26,7) size 391x236
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGText {text} at (26,7) size 391x36 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 391x36
+ chunk 1 text run 1 at (26.00,35.00) startOffset 0 endOffset 31 width 391.00: "External SVG font element (css)"
+ RenderSVGContainer {g} at (31,81) size 345x162
+ RenderSVGText {text} at (31,113) size 105x22 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 105x22
+ chunk 1 text run 1 at (31.00,130.00) startOffset 0 endOffset 13 width 105.00: "Placed Glyphs"
+ RenderSVGContainer {g} at (164,81) size 212x162 [transform={m=((1.00,0.00)(-0.00,-1.00)) t=(165.00,140.00)}]
+ RenderSVGPath {line} at (165,139) size 210x2 [stroke={[type=SOLID] [color=#888888]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=0.00] [x2=210.00] [y2=0.00]
+ RenderSVGContainer {g} at (164,81) size 212x162 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
+ RenderSVGPath {line} at (164,81) size 2x162 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=-3500.00] [x2=0.00] [y2=2000.00]
+ RenderSVGPath {path} at (168,96) size 37x45 [fill={[type=SOLID] [color=#000000]}] [data="" 1250 -30 C 1188.67 -30 1135.33 48.6667 1090 206 C 1072.67 266 1051 371 1025 521 C 957 511.667 868 495 758 471 L 492 416 C 458.667 328.667 401.667 201 321 33 C 299.667 -4.33333 270.667 -23 234 -23 C 207.333 -23 183.667 -13.3333 163 6 C 142.333 25.3333 131.667 49.3333 131 78 C 131 110 181.333 231.667 282 443 C 270.667 460.333 265 480.333 265 503 C 265 557 297.667 591.667 363 607 C 439 749.667 535 913.667 651 1099 C 809 1351.67 907.333 1478 946 1478 C 998.667 1478 1034.67 1441.33 1054 1368 L 1117 1032 L 1266 337 L 1323 179 C 1342.33 125 1352 89 1352 71 C 1352 42.3333 1341.67 18.3333 1321 -1 C 1300.33 -20.3333 1276.67 -30 1250 -30 Z M 897 1113 L 611 652 C 691.667 672.667 814 697.667 978 727 L 897 1113 Z"]
+ RenderSVGPath {line} at (208,81) size 2x162 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=1498.00] [y1=-3500.00] [x2=1498.00] [y2=2000.00]
+ RenderSVGPath {path} at (208,109) size 31x48 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="" 1011 892 L 665 144 C 579.667 -38 514.333 -190.333 469 -313 L 403 -507 C 385.667 -555 355.667 -579 313 -579 C 285 -579 261 -570 241 -552 C 221 -534 210.667 -511 210 -483 C 210 -416.333 282 -223.333 426 96 L 68 785 L 23 858 C 5 888.667 -4 914.333 -4 935 C -4 962.333 6.33333 986.333 27 1007 C 47.6667 1027.67 71.3333 1038 98 1038 C 128.667 1038 152.333 1026.33 169 1003 C 282.333 845.667 404 621.667 534 331 L 682 676 C 735.333 795.333 786.667 898 836 984 C 857.333 1021.33 885.333 1040 920 1040 C 947.333 1040 971.333 1030.33 992 1011 C 1012.67 991.667 1023.33 968.667 1024 942 C 1024 927.333 1019.67 910.667 1011 892 Z"]
+ RenderSVGPath {line} at (239,81) size 2x162 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=2564.00] [y1=-3500.00] [x2=2564.00] [y2=2000.00]
+ RenderSVGPath {path} at (243,85) size 43x57 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="" 802 -61 C 614 -61 454.667 -4.66667 324 108 C 185.333 228 116 382.667 116 572 C 116 802.667 184.333 1012.33 321 1201 C 473.667 1410.33 664 1515 892 1515 C 1111.33 1515 1274.33 1465.67 1381 1367 C 1492.33 1264.33 1548 1102.33 1548 881 C 1548 650.333 1485.33 442.333 1360 257 C 1216 45 1030 -61 802 -61 Z M 892 1310 C 728.667 1310 590.333 1228.67 477 1066 C 372.333 916.667 320 752 320 572 C 320 443.333 367.667 338.667 463 258 C 554.333 182 667.333 144 802 144 C 964 144 1097.67 225.667 1203 389 C 1297 535 1344 699 1344 881 C 1344 1040.33 1308.33 1152.33 1237 1217 C 1169 1279 1054 1310 892 1310 Z M 682 1848 C 769.333 1848 813 1813 813 1743 C 813 1723 798.333 1703.67 769 1685 C 742.333 1668.33 717.333 1660 694 1660 C 612 1660 571 1694.33 571 1763 C 571 1782.33 583.333 1801.33 608 1820 C 632.667 1838.67 657.333 1848 682 1848 Z M 1221 1856 C 1243.67 1856 1266.67 1845.67 1290 1825 C 1313.33 1804.33 1325 1783.67 1325 1763 C 1325 1701.67 1277.33 1671 1182 1671 C 1154.67 1671 1130.33 1678 1109 1692 C 1085 1708 1073 1729 1073 1755 C 1073 1801 1088 1830.67 1118 1844 C 1134.67 1852 1169 1856 1221 1856 Z"]
+ RenderSVGPath {line} at (287,81) size 2x162 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=4199.00] [y1=-3500.00] [x2=4199.00] [y2=2000.00]
+ RenderSVGPath {path} at (291,92) size 49x53 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="" 1306 412 C 1235.33 412 1174.33 422.333 1123 443 C 1071.67 463.667 1030.33 494.333 999 535 C 963 499.667 928 473 894 455 C 860 437 826.333 428 793 428 C 719 428 649.333 458 584 518 C 518.667 578 485.667 644.333 485 717 C 485 840.333 533.333 953 630 1055 C 726.667 1157 837 1208 961 1208 C 989 1208 1012.33 1197.67 1031 1177 C 1049.67 1156.33 1059 1131.33 1059 1102 C 1059 1062 1025.67 1032.33 959 1013 C 870.333 987.667 807.667 958.667 771 926 C 717 878.667 690 809 690 717 C 690 697.667 699 679 717 661 C 737.667 641 763.333 631.667 794 633 C 852 635.667 905.667 689.667 955 795 C 999.667 887 1039.33 933 1074 933 C 1102 933 1124.67 922.667 1142 902 C 1159.33 881.333 1168 856 1168 826 C 1168 812.667 1166 792.667 1162 766 C 1158 739.333 1155.67 719.333 1155 706 C 1155 662.667 1173.67 635.333 1211 624 C 1225.67 619.333 1257.33 617 1306 617 C 1397.33 617 1461.33 639.333 1498 684 C 1531.33 724 1548 790.333 1548 883 C 1548 1046.33 1482.33 1179.67 1351 1283 C 1231 1377.67 1087.67 1425 921 1425 C 727 1425 575 1351.67 465 1205 C 365.667 1074.33 316 910 316 712 C 316 529.333 374.333 375.333 491 250 C 612.333 119.333 768.333 54 959 54 C 1013 54 1074 64.3333 1142 85 L 1317 150 C 1346.33 160.667 1365.33 166 1374 166 C 1401.33 166 1425 155.333 1445 134 C 1465 112.667 1475 87.3333 1475 58 C 1475 -5.33333 1404 -56.6667 1262 -96 C 1154.67 -125.333 1054.33 -140 961 -140 C 867 -140 771 -122 673 -86 C 575 -50 490.667 -1.33333 420 60 C 213.333 238.667 110 456 110 712 C 110 968 180.667 1182 322 1354 C 472 1538 671.667 1630 921 1630 C 1146.33 1630 1339.33 1562.33 1500 1427 C 1668.67 1283.67 1753 1102.33 1753 883 C 1753 733 1716.33 617.667 1643 537 C 1566.33 453.667 1454 412 1306 412 Z"]
+ RenderSVGPath {line} at (343,81) size 2x162 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=6106.00] [y1=-3500.00] [x2=6106.00] [y2=2000.00]
+ RenderSVGPath {path} at (346,108) size 27x46 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="" 770 -196 C 770 -278.667 750 -340.667 710 -382 C 670 -423.333 609.333 -444.333 528 -445 C 471.333 -445 417.667 -434.333 367 -413 C 303 -385 271 -346.667 271 -298 C 271 -262 293.667 -244 339 -244 C 363 -244 390 -252 420 -268 C 450 -284 482.333 -292.333 517 -293 C 549.667 -292.333 574 -284.333 590 -269 C 606 -253.667 614 -231 614 -201 C 614 -169 601.667 -140.333 577 -115 C 552.333 -89.6667 514.333 -67.3333 463 -48 C 357 -24 272 26.6667 208 104 C 139.333 186 105 286 105 404 C 105 539.333 150 679 240 823 C 340 983 452.667 1063 578 1063 C 643.333 1063 716.333 1047.67 797 1017 C 899 977.667 950 929.667 950 873 C 950 847.667 941.667 825.333 925 806 C 908.333 786.667 887.667 776.667 863 776 C 843.667 776 827 781.667 813 793 C 799 804.333 785 816 771 828 C 731.667 859.333 667.333 875 578 875 C 510 875 442.667 814.333 376 693 C 315.333 581.667 285 485.333 285 404 C 285 316 315 246.667 375 196 C 431 148.667 503 125 591 125 C 631 125 673.667 135.667 719 157 L 835 219 C 855 229.667 869.333 235 878 235 C 902.667 235 924 225.333 942 206 C 960 186.667 969 164 969 138 C 969 69.3333 883.667 10 713 -40 C 732.333 -65.3333 746.667 -91 756 -117 C 765.333 -143 770 -169.333 770 -196 Z"]
+ RenderSVGPath {line} at (373,81) size 3x162 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=7158.00] [y1=-3500.00] [x2=7158.00] [y2=2000.00]
+ RenderSVGText {text} at (67,193) size 74x22 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 74x22
+ chunk 1 text run 1 at (67.00,210.00) startOffset 0 endOffset 8 width 74.00: "SVG Font"
+ RenderSVGContainer {g} at (165,166) size 210x69 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,220.00)}]
+ RenderSVGPath {line} at (165,219) size 210x2 [stroke={[type=SOLID] [color=#888888]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=0.00] [x2=210.00] [y2=0.00]
+ RenderSVGText {text} at (0,-54) size 198x69 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 198x69
+ chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 5 width 198.00: "Ay\x{D6}@\x{E7}"
+ RenderSVGText {text} at (10,304) size 264x46 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 264x46
+ chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.1 $"
+ RenderSVGPath {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
Added: trunk/LayoutTests/platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt (0 => 92548)
--- trunk/LayoutTests/platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt 2011-08-06 09:40:43 UTC (rev 92548)
@@ -0,0 +1,47 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x195
+ RenderBlock {html} at (0,0) size 800x195
+ RenderBody {body} at (5,5) size 790x185
+ RenderTable {table} at (144,0) size 502x185
+ RenderTableSection (anonymous) at (0,0) size 502x185
+ RenderTableRow {tr} at (0,0) size 502x185
+ RenderTableCell {td} at (0,0) size 502x185 [r=0 c=0 rs=1 cs=3]
+ RenderTable {table} at (6,6) size 490x173
+ RenderTableSection (anonymous) at (0,0) size 490x173
+ RenderTableRow {tr} at (0,1) size 490x64
+ RenderTableCell {td} at (1,1) size 488x64 [r=0 c=0 rs=1 cs=2]
+ RenderBlock {h1} at (5,19) size 478x26
+ RenderText {#text} at (0,0) size 478x26
+ text run at (0,0) width 478: "Both sides should have identical size after zooming"
+ RenderTableRow {tr} at (0,66) size 490x23
+ RenderTableCell {td} at (1,66) size 243x23 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (94,5) size 55x13
+ text run at (94,5) width 55: "SVG Image"
+ RenderTableCell {td} at (245,66) size 244x23 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (95,5) size 54x13
+ text run at (95,5) width 54: "PNG Image"
+ RenderTableRow {tr} at (0,90) size 490x82
+ RenderTableCell {td} at (1,90) size 243x82 [r=2 c=0 rs=1 cs=1]
+ RenderEmbeddedObject {object} at (100,5) size 138x69
+ layer at (0,0) size 138x69
+ RenderView at (0,0) size 123x54
+ layer at (0,0) size 138x69
+ RenderSVGRoot {svg} at (22,0) size 93x69
+ RenderSVGContainer {g} at (27,8) size 73x46
+ RenderSVGPath {rect} at (28,8) size 11x17 [stroke={[type=SOLID] [color=#000000]}] [x=30.00] [y=46.00] [width=50.00] [height=80.00]
+ RenderSVGPath {rect} at (47,8) size 11x17 [fill={[type=SOLID] [color=#FF0000]}] [x=130.00] [y=46.00] [width=50.00] [height=80.00]
+ RenderSVGPath {rect} at (70,8) size 11x17 [stroke={[type=SOLID] [color=#000000]}] [x=250.00] [y=46.00] [width=50.00] [height=80.00]
+ RenderSVGPath {rect} at (90,8) size 10x17 [fill={[type=SOLID] [color=#FF0000]}] [x=350.00] [y=46.00] [width=50.00] [height=80.00]
+ RenderSVGPath {rect} at (27,36) size 13x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=30.00] [y=196.00] [width=50.00] [height=80.00]
+ RenderSVGPath {rect} at (47,36) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=130.00] [y=196.00] [width=50.00] [height=80.00]
+ RenderSVGPath {rect} at (70,36) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=250.00] [y=196.00] [width=50.00] [height=80.00]
+ RenderSVGPath {rect} at (90,37) size 10x16 [fill={[type=SOLID] [color=#00FF00]}] [x=350.00] [y=196.00] [width=50.00] [height=80.00]
+ RenderSVGText {text} at (10,303) size 272x48 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 272x48
+ chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 271.30: "$Revision: 1.7 $"
+ RenderSVGPath {rect} at (22,0) size 93x69 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
+ RenderText {#text} at (0,0) size 0x0
+ RenderTableCell {td} at (245,90) size 244x82 [r=2 c=1 rs=1 cs=1]
+ RenderImage {img} at (5,5) size 138x69
+ RenderText {#text} at (0,0) size 0x0
Added: trunk/LayoutTests/platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-huge-size-expected.txt (0 => 92548)
--- trunk/LayoutTests/platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-huge-size-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-huge-size-expected.txt 2011-08-06 09:40:43 UTC (rev 92548)
@@ -0,0 +1,19 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x350
+ RenderBlock {html} at (0,0) size 800x350
+ RenderBody {body} at (5,11) size 790x328
+ RenderBlock {p} at (0,0) size 790x13
+ RenderText {#text} at (0,0) size 89x13
+ text run at (0,0) width 89: "Text above the rect"
+ RenderBlock (anonymous) at (0,24) size 790x280
+ RenderEmbeddedObject {object} at (0,0) size 277x277
+ layer at (0,0) size 277x277
+ RenderView at (0,0) size 262x262
+ layer at (0,0) size 277x277
+ RenderSVGRoot {svg} at (0,0) size 277x277
+ RenderSVGPath {rect} at (0,0) size 277x277 [stroke={[type=SOLID] [color=#008000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {p} at (0,315) size 790x13
+ RenderText {#text} at (0,0) size 89x13
+ text run at (0,0) width 89: "Text below the rect"
Added: trunk/LayoutTests/platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.txt (0 => 92548)
--- trunk/LayoutTests/platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.txt 2011-08-06 09:40:43 UTC (rev 92548)
@@ -0,0 +1,46 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x375
+ RenderBlock {HTML} at (0,0) size 800x375
+ RenderBody {BODY} at (5,5) size 790x365
+ RenderEmbeddedObject {OBJECT} at (0,0) size 349x349 [border: (1px solid #FF0000)]
+ layer at (0,0) size 347x347
+ RenderView at (0,0) size 332x332
+ layer at (0,0) size 347x347
+ RenderSVGRoot {svg} at (24,0) size 298x347
+ RenderSVGContainer {g} at (24,0) size 298x347
+ RenderSVGContainer {g} at (24,0) size 298x347
+ RenderSVGResourceLinearGradient {linearGradient} [id="XMLID_1_"] [gradientUnits=userSpaceOnUse] [start=(2.84,9.24)] [end=(26.34,35.24)]
+ RenderSVGGradientStop {stop} [offset=0.00] [color=#FFFFFF]
+ RenderSVGGradientStop {stop} [offset=1.00] [color=#000000]
+ RenderSVGPath {path} at (62,0) size 236x343 [fill={[type=LINEAR-GRADIENT] [id="XMLID_1_"] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="" 96.658 84.788 C 95.021 91.534 86.719 105.601 82.313 111.808 C 77.91 118.033 78.448 123.634 70.292 121.456 C 62.17 119.261 59.876 119.671 51.492 120.161 C 43.139 120.651 44.957 119.917 39.717 122.257 C 34.524 124.616 17.052 93.712 15.627 87.966 C 14.252 82.218 13.58 82.903 17.199 76.683 C 20.817 70.476 21.325 64.334 26.124 56.801 C 30.906 49.235 36.424 45.402 36.031 39.622 C 34.477 18.183 33.233 7.474 42.748 2.51 C 51.819 -2.188 59.384 0.612 62.383 2.217 C 63.678 2.922 66.298 4.248 68.264 6.604 C 70.21 8.915 71.98 12.403 72.963 16.825 C 75.01 25.668 72.127 22.736 74.438 32.872 C 76.714 42.994 81.349 47.956 86.999 55.947 C 92.647 63.958 98.543 77.157 96.658 84.788 Z"]
+ RenderSVGContainer {g} at (130,47) size 75x48
+ RenderSVGPath {path} at (130,50) size 28x45 [fill={[type=SOLID] [color=#FFFFFF] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="" 45.074 19.969 C 43.959 18.429 42.175 18.348 41.062 18.562 C 40.423 18.66 39.571 19.479 39.015 20.691 C 38.638 21.508 38.342 22.542 38.31 23.639 C 38.244 26.553 38.491 27.682 39.162 29.664 C 39.948 31.989 41.88 33.201 43.323 32.629 C 44.814 32.038 44.862 32.088 45.845 29.927 C 46.646 28.272 47.038 27.422 47.006 24.899 C 47.005 22.426 46.236 21.575 45.074 19.969 Z"]
+ RenderSVGPath {path} at (166,47) size 39x45 [fill={[type=SOLID] [color=#FFFFFF] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="" 63.332 21.001 C 61.762 18.232 60.877 17.791 58.617 17.611 C 55.145 17.317 53.523 19.738 52.77 21.476 C 51.951 23.356 52.115 23.096 52.164 25.471 C 52.213 27.976 52.984 29.007 53.835 30.579 C 54.704 32.102 58.24 32.971 58.666 32.954 C 62.383 32.56 63.693 31.119 64.364 28.615 C 64.97 26.389 64.987 23.916 63.332 21.001 Z"]
+ RenderSVGPath {path} at (133,61) size 17x25 [fill={[type=SOLID] [color=#000000] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="" 41.928 22.542 C 42.682 22.542 43.616 23.048 44.057 23.703 C 44.532 24.376 44.876 25.326 44.876 26.39 C 44.876 27.979 44.712 29.731 43.762 30.272 C 43.468 30.451 42.829 30.6 42.452 30.6 C 41.601 30.6 41.536 30.059 40.732 29.241 C 40.471 28.946 39.653 27.505 39.653 26.311 C 39.653 25.574 39.472 24.507 40.127 23.559 C 40.571 22.868 41.143 22.542 41.928 22.542 Z"]
+ RenderSVGPath {path} at (138,63) size 12x15 [fill={[type=SOLID] [color=#999999] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="" 43.616 24.556 C 43.188 23.639 42.026 23.425 41.733 23.867 C 41.438 24.325 41.815 24.766 42.47 25.717 C 43.14 26.732 42.895 27.846 43.665 27.601 C 43.958 27.502 44.026 25.488 43.616 24.556 Z"]
+ RenderSVGPath {path} at (177,61) size 20x25 [fill={[type=SOLID] [color=#000000] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="" 58.37 22.443 C 60.238 22.443 61.319 24.112 61.695 26.241 C 61.841 27.208 61.615 28.321 61.023 29.09 C 60.353 29.976 59.158 30.532 58.191 30.532 C 57.273 30.532 56.242 30.68 55.7 29.927 C 55.145 29.156 55.03 27.453 55.03 26.241 C 55.03 24.883 55.424 23.916 56.109 23.145 C 56.636 22.573 57.585 22.443 58.37 22.443 Z"]
+ RenderSVGPath {path} at (182,61) size 15x14 [fill={[type=SOLID] [color=#999999] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="" 60.042 23.949 C 59.384 23.212 58.83 22.982 58.485 23.212 C 57.813 23.654 58.355 24.032 58.959 24.702 C 59.353 25.128 59.55 26.128 60.206 25.799 C 61.041 25.34 60.746 24.734 60.042 23.949 Z"]
+ RenderSVGPath {path} at (92,96) size 151x223 [fill={[type=SOLID] [color=#FFFFFF] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="" 78.171 82.167 C 78.171 77.009 77.58 71.753 76.387 67.902 C 75.305 64.284 73.569 61.763 72.078 58.488 C 69.099 51.967 69.246 49.036 66.606 44.877 C 63.579 40.062 65.068 36.868 61.056 37.065 C 56.045 37.344 52.016 44.206 47.283 44.403 C 44.057 44.534 38.965 35.508 38.834 39.243 C 38.735 42.421 38.899 42.371 38.899 45.45 C 38.899 47.497 37.965 47.644 35.934 50.756 C 34.885 52.378 34.066 54.146 33.428 55.932 C 33.035 56.996 32.658 58.109 32.364 59.207 C 32.233 59.746 32.02 60.32 31.888 60.861 C 30.873 64.611 27.255 69.212 26.418 72.946 C 25.568 76.663 24.585 79.04 24.7 84.016 C 24.831 88.995 24.88 87.571 26.386 88.797 C 27.876 90.041 29.415 91.205 31.775 93.285 C 34.248 95.447 39.404 99.213 40.095 100.377 C 40.848 101.572 40.814 104.242 40.373 105.107 C 39.93 105.959 36.031 106.42 36.048 106.42 C 36.031 106.42 39.455 111.135 40.126 111.805 C 40.765 112.446 43.532 115.541 54.832 113.444 C 57.831 112.881 60.509 111.794 62.876 110.442 C 62.925 110.415 62.974 110.389 63.022 110.362 C 63.109 110.315 63.196 110.27 63.278 110.223 C 63.502 110.108 63.721 109.989 63.936 109.868 C 63.969 109.847 64.004 109.831 64.039 109.813 C 65.407 109.059 66.574 108.208 67.43 107.272 C 68.241 106.602 68.999 105.917 69.704 105.241 C 74.307 100.753 71.979 99.46 72.569 97.2 C 73.437 93.958 76.269 92.745 76.909 89.077 C 76.991 88.554 77.155 88.159 77.63 87.389 C 78.351 86.296 78.171 84.149 78.171 82.167 Z"]
+ RenderSVGResourceLinearGradient {linearGradient} [id="XMLID_2_"] [gradientUnits=userSpaceOnUse] [start=(54.99,39.65)] [end=(41.91,26.22)]
+ RenderSVGGradientStop {stop} [offset=0.00] [color=#FFA700]
+ RenderSVGGradientStop {stop} [offset=0.69] [color=#FFFF00]
+ RenderSVGPath {path} at (127,74) size 78x53 [fill={[type=LINEAR-GRADIENT] [id="XMLID_2_"]}] [data="" 57.177 30.008 C 56.209 29.681 55.474 29.255 54.408 28.468 C 53.278 27.635 50.804 27.174 48.986 27.404 C 47.71 27.552 46.908 27.422 45.678 28.044 C 44.336 28.749 42.404 30.304 41.34 31.238 C 39.308 33.005 37.868 33.727 37.933 35.937 C 37.982 38.016 39.702 39.607 41.537 41.08 C 43.37 42.604 44.926 44.486 46.04 44.879 C 47.202 45.305 49.217 45.224 50.659 45.224 C 53.869 45.224 58.027 41.179 60.354 40.474 C 63.25 39.558 64.267 37.984 64.496 34.497 C 64.692 31.565 60.434 31.072 57.177 30.008 Z"]
+ RenderSVGResourceLinearGradient {linearGradient} [id="XMLID_3_"] [gradientUnits=userSpaceOnUse] [start=(89.48,113.08)] [end=(65.41,88.33)]
+ RenderSVGGradientStop {stop} [offset=0.00] [color=#FFA700]
+ RenderSVGGradientStop {stop} [offset=0.69] [color=#FFFF00]
+ RenderSVGPath {path} at (215,241) size 107x106 [fill={[type=LINEAR-GRADIENT] [id="XMLID_3_"]}] [data="" 107.124 107.241 C 107.149 106.339 106.798 105.737 106.318 105.284 C 105.836 104.819 105.218 104.507 104.715 104.227 C 104.565 104.137 104.379 104.018 104.172 103.879 C 102.514 102.756 99.404 100.137 97.773 97.529 C 96.658 95.744 98.25 92.843 96.708 90.617 C 95.793 89.275 94.17 89.847 93.909 89.847 C 93.647 89.847 92.222 92.322 91.665 93.04 C 91.059 93.776 89.455 95.071 88.308 95.792 C 87.177 96.513 86.278 96.905 83.854 96.743 C 81.43 96.528 80.726 95.727 79.956 95.071 C 79.186 94.399 78.418 93.891 78.58 92.268 C 78.696 91.147 78.824 90.252 78.726 89.647 C 78.718 89.551 78.702 89.459 78.668 89.372 L 78.667 89.366 C 78.663 89.356 78.657 89.348 78.654 89.341 L 78.65 89.333 L 78.645 89.327 L 78.644 89.321 C 78.638 89.309 78.633 89.3 78.633 89.3 C 78.624 89.28 78.618 89.267 78.612 89.255 C 78.599 89.235 78.592 89.212 78.579 89.192 L 78.578 89.19 L 78.576 89.186 L 78.572 89.182 L 78.57 89.178 L 78.569 89.176 L 78.567 89.172 C 78.565 89.17 78.564 89.17 78.564 89.17 L 78.561 89.164 L 78.559 89.162 C 78.559 89.162 78.558 89.16 78.557 89.158 L 78.555 89.156 C 78.524 89.111 78.49 89.066 78.448 89.027 C 77.941 88.504 77.204 88.404 75.615 88.404 C 74.044 88.404 73.732 88.455 72.405 89.304 C 71.653 89.747 71.602 92.695 71.602 96.167 C 71.602 98.917 71.636 102.013 71.391 104.519 C 70.819 110.332 69.621 113.755 69.522 117.505 C 69.408 121.271 70.668 123.794 71.798 124.794 C 72.945 125.808 74.599 126.577 78.3 126.577 C 81.985 126.577 84.294 125.757 86.718 123.335 C 88.291 121.765 89.943 120.306 94.759 117.013 C 98.576 114.411 104.323 111.56 105.469 110.413 C 105.819 110.054 106.356 109.706 106.723 108.987 C 106.946 108.563 107.105 108.005 107.124 107.241 Z"]
+ RenderSVGResourceLinearGradient {linearGradient} [id="XMLID_4_"] [gradientUnits=userSpaceOnUse] [start=(29.61,119.31)] [end=(-6.89,84.81)]
+ RenderSVGGradientStop {stop} [offset=0.00] [color=#FFA700]
+ RenderSVGGradientStop {stop} [offset=0.69] [color=#FFFF00]
+ RenderSVGPath {path} at (24,233) size 118x114 [fill={[type=LINEAR-GRADIENT] [id="XMLID_4_"]}] [data="" 41.699 117.28 C 41.635 112.628 38.637 111.235 35.23 105.866 C 31.841 100.475 31.301 99.495 29.041 95.925 C 26.781 92.402 22.327 85.999 19.772 85.935 C 17.742 85.886 16.595 86.966 15.334 88.259 C 15.274 88.322 15.214 88.388 15.154 88.46 C 13.924 89.86 12.412 92.89 10.273 94.437 C 8.046 96.041 2.396 95.892 0.955 97.775 C -0.452 99.658 1.005 102.394 0.989 107.437 C 0.989 109.599 0.611 111.236 0.367 112.548 C 0.343 112.657 0.318 112.763 0.295 112.868 C 0.29 112.882 0.289 112.897 0.284 112.913 C 0.16 113.386 0.064 113.788 0.002 114.142 C -0.099 114.697 -0.103 115.124 0.023 115.513 C 0.05 115.597 0.082 115.683 0.119 115.765 C 0.147 115.833 0.179 115.902 0.213 115.97 C 0.217 115.98 0.22 115.991 0.227 116.001 L 0.228 116.007 C 0.294 116.187 0.376 116.364 0.482 116.544 C 0.538 116.636 0.595 116.724 0.657 116.808 C 1.939 118.718 4.261 119.292 15.417 121.619 C 21.641 122.914 27.502 126.256 31.45 126.582 C 35.396 126.877 36.232 125.566 38.64 123.437 C 41.011 121.292 41.781 121.962 41.699 117.28 Z"]
+ RenderSVGContainer {g} at (239,230) size 45x23
+ RenderSVGPath {path} at (239,230) size 21x15 [fill={[type=SOLID] [color=#4D4D4D] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="" 82.495 85.034 C 81.004 85.229 80.005 85.999 79.415 86.704 C 78.842 87.358 78.202 88.311 78.498 88.604 C 78.772 88.879 79.025 88.653 79.279 88.317 C 79.302 88.29 79.324 88.26 79.348 88.231 C 79.438 88.131 79.526 88.012 79.615 87.887 C 79.638 87.86 79.663 87.83 79.685 87.799 C 79.728 87.748 79.771 87.695 79.816 87.639 C 79.842 87.61 79.865 87.578 79.891 87.545 C 79.931 87.502 79.969 87.455 80.01 87.404 C 80.536 86.97 81.37 86.082 83.033 86.082 C 84.721 86.082 84.59 86.031 84.524 85.377 C 84.475 84.772 83.969 84.821 82.495 85.034 Z"]
+ RenderSVGPath {path} at (259,230) size 25x23 [fill={[type=SOLID] [color=#4D4D4D] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="" 90.503 85.853 C 89.061 85.314 88.014 85.066 86.751 85.017 C 85.064 84.935 85.213 85.361 85.213 85.361 C 85.213 86.148 86.834 86.429 88.358 86.656 C 89.881 86.867 91.091 87.164 91.157 88.752 C 91.241 90.326 90.848 91.438 91.536 91.309 C 93.023 91.028 93.565 89.424 93.549 88.688 C 93.548 87.933 92.451 86.608 90.503 85.853 Z"]
+ RenderText {#text} at (349,339) size 3x13
+ text run at (349,339) width 3: " "
+ RenderBR {BR} at (352,339) size 0x13
+ RenderText {#text} at (0,352) size 234x13
+ text run at (0,352) width 234: "The image of Tux should fill the entire red square."
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
