Diff
Modified: trunk/LayoutTests/ChangeLog (112026 => 112027)
--- trunk/LayoutTests/ChangeLog 2012-03-25 12:16:02 UTC (rev 112026)
+++ trunk/LayoutTests/ChangeLog 2012-03-25 12:39:13 UTC (rev 112027)
@@ -1,3 +1,15 @@
+2012-03-25 Nikolas Zimmermann <[email protected]>
+
+ Not reviewed. Rebaseline foreignObject results, after Florins changes.
+ Eventually the zoom-foreign-content-expected.png needs to be moved to platform/mac/, let's see.
+
+ * platform/mac/svg/zoom/page/zoom-foreignObject-expected.png:
+ * platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt:
+ * platform/mac/svg/zoom/text/zoom-foreignObject-expected.png:
+ * platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt:
+ * platform/mac/test_expectations.txt:
+ * svg/zoom/page/zoom-foreign-content-expected.png:
+
2012-03-25 Pavel Feldman <[email protected]>
Not reviewed: new chromium baseline for r112022.
Modified: trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt (112026 => 112027)
--- trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt 2012-03-25 12:16:02 UTC (rev 112026)
+++ trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt 2012-03-25 12:39:13 UTC (rev 112027)
@@ -1,15 +1,33 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (13,13) size 787x587
- RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
- RenderBlock {xhtml:div} at (0,0) size 580x18
- RenderText {#text} at (0,0) size 78x18
- text run at (0,0) width 78: "This is a test"
- RenderBlock (anonymous) at (0,18) size 580x18
+ RenderSVGRoot {svg} at (0,0) size 800x600
+ RenderSVGForeignObject {foreignObject} at (0,0) size 250x200
+ RenderBlock {xhtml:div} at (0,0) size 250x18
+ RenderText {#text} at (0,0) size 80x18
+ text run at (0,0) width 80: "This is a text"
+ RenderBlock (anonymous) at (0,18) size 250x18
RenderInline {xhtml:a} at (0,0) size 66x18 [color=#0000EE]
RenderText {#text} at (0,0) size 66x18
text run at (0,0) width 66: "and a link."
RenderBR {xhtml:br} at (66,0) size 0x18
- RenderSVGRect {rect} at (13,13) size 787x550 [stroke={[type=SOLID] [color=#008000]}] [x=10.00] [y=10.00] [width=580.00] [height=380.00]
+ RenderBlock {xhtml:div} at (0,36) size 250x18
+ RenderText {#text} at (0,0) size 56x18
+ text run at (0,0) width 56: "[HTML]"
+ RenderSVGRect {rect} at (0,0) size 361x289 [stroke={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=250.00] [height=200.00]
+ RenderSVGForeignObject {foreignObject} at (260,0) size 250x200
+ RenderSVGRoot {svg} at (260,3) size 250x200
+ RenderSVGContainer {g} at (260,3) size 250x200 [transform={m=((3.00,0.26)(0.26,3.02)) t=(0.00,0.00)}]
+ RenderSVGText {text} at (0,1) size 82x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 82x19
+ chunk 1 text run 1 at (0.00,16.00) startOffset 0 endOffset 14 width 81.05: "This is a text"
+ RenderSVGContainer {a} at (265,60) size 207x76
+ RenderSVGText {text} at (0,20) size 67x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 67x19
+ chunk 1 text run 1 at (0.00,35.00) startOffset 0 endOffset 11 width 66.16: "and a link."
+ RenderSVGText {text} at (0,41) size 43x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 43x19
+ chunk 1 text run 1 at (0.00,56.00) startOffset 0 endOffset 5 width 42.67: "[SVG]"
+ RenderText {#text} at (0,0) size 0x0
+ RenderSVGRect {rect} at (373,0) size 363x289 [stroke={[type=SOLID] [color=#008000]}] [x=260.00] [y=0.00] [width=250.00] [height=200.00]
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/svg/zoom/text/zoom-foreignObject-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt (112026 => 112027)
--- trunk/LayoutTests/platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt 2012-03-25 12:16:02 UTC (rev 112026)
+++ trunk/LayoutTests/platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt 2012-03-25 12:39:13 UTC (rev 112027)
@@ -1,15 +1,33 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (9,9) size 791x591
- RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
- RenderBlock {xhtml:div} at (0,0) size 580x18
- RenderText {#text} at (0,0) size 78x18
- text run at (0,0) width 78: "This is a test"
- RenderBlock (anonymous) at (0,18) size 580x18
+ RenderSVGRoot {svg} at (0,0) size 800x600
+ RenderSVGForeignObject {foreignObject} at (0,0) size 250x200
+ RenderBlock {xhtml:div} at (0,0) size 250x18
+ RenderText {#text} at (0,0) size 80x18
+ text run at (0,0) width 80: "This is a text"
+ RenderBlock (anonymous) at (0,18) size 250x18
RenderInline {xhtml:a} at (0,0) size 66x18 [color=#0000EE]
RenderText {#text} at (0,0) size 66x18
text run at (0,0) width 66: "and a link."
RenderBR {xhtml:br} at (66,0) size 0x18
- RenderSVGRect {rect} at (9,9) size 582x382 [stroke={[type=SOLID] [color=#008000]}] [x=10.00] [y=10.00] [width=580.00] [height=380.00]
+ RenderBlock {xhtml:div} at (0,36) size 250x18
+ RenderText {#text} at (0,0) size 56x18
+ text run at (0,0) width 56: "[HTML]"
+ RenderSVGRect {rect} at (0,0) size 251x201 [stroke={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=250.00] [height=200.00]
+ RenderSVGForeignObject {foreignObject} at (260,0) size 250x200
+ RenderSVGRoot {svg} at (260,3) size 250x200
+ RenderSVGContainer {g} at (260,3) size 250x200 [transform={m=((3.00,0.26)(0.26,3.02)) t=(0.00,0.00)}]
+ RenderSVGText {text} at (0,1) size 82x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 82x19
+ chunk 1 text run 1 at (0.00,16.00) startOffset 0 endOffset 14 width 81.05: "This is a text"
+ RenderSVGContainer {a} at (265,60) size 207x76
+ RenderSVGText {text} at (0,20) size 67x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 67x19
+ chunk 1 text run 1 at (0.00,35.00) startOffset 0 endOffset 11 width 66.16: "and a link."
+ RenderSVGText {text} at (0,41) size 43x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 43x19
+ chunk 1 text run 1 at (0.00,56.00) startOffset 0 endOffset 5 width 42.67: "[SVG]"
+ RenderText {#text} at (0,0) size 0x0
+ RenderSVGRect {rect} at (259,0) size 252x201 [stroke={[type=SOLID] [color=#008000]}] [x=260.00] [y=0.00] [width=250.00] [height=200.00]
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/test_expectations.txt (112026 => 112027)
--- trunk/LayoutTests/platform/mac/test_expectations.txt 2012-03-25 12:16:02 UTC (rev 112026)
+++ trunk/LayoutTests/platform/mac/test_expectations.txt 2012-03-25 12:39:13 UTC (rev 112027)
@@ -210,10 +210,6 @@
BUGWK69210: fast/inline/continuation-outlines-with-layers.html = TEXT
BUGWK69210: fast/repaint/transform-absolute-in-positioned-container.html = TEXT
-// Need rebaselining after 76282
-BUGWK76282 : svg/zoom/page/zoom-foreignObject.svg = IMAGE+TEXT IMAGE TEXT PASS
-BUGWK76282 : svg/zoom/text/zoom-foreignObject.svg = IMAGE+TEXT IMAGE TEXT PASS
-
// Those tests need a text baseline after lazily allocating layers.
// The change should only be layer removal.
BUGWK75568 : animations/combo-transform-translate+scale.html = TEXT
Modified: trunk/LayoutTests/svg/zoom/page/zoom-foreign-content-expected.png (112026 => 112027)
--- trunk/LayoutTests/svg/zoom/page/zoom-foreign-content-expected.png 2012-03-25 12:16:02 UTC (rev 112026)
+++ trunk/LayoutTests/svg/zoom/page/zoom-foreign-content-expected.png 2012-03-25 12:39:13 UTC (rev 112027)
@@ -1,7 +1,5 @@
\x89PNG
-IHDR X ' )tEXtchecksum 44d4003a3ac1b2f04cedd4e230b33526F]/
-\xCEIDATx\x9C\xED\xD9Q
-\x83@ DAh\xAA\xA3* \xC0K\xB5\x9CQj\xE2\x95K茂\xFD|ɮ\xCBg\x81k\x8C}\xEFc\xF6
- \xF8\xB9\xC7\xEC w#\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 bϱ\x8F\xD9\xF8\xDBk\x9B= \xAE\xB0\x9E\xE79{ \xC0\xAD\xB8 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b &\xB0 b_\x8AK\xD3I35\xA0 IEND\xAEB`\x82
\ No newline at end of file
+IHDR X \x9Av\x82p )tEXtchecksum 7d6102c6f8c552d6ee4357e14070454cn\xE8*O \x94IDATx\x9C\xED\xDAA
+\xC2@ Dі\xA0 \xA8\x8A\x9Ek1\xEBs\xD1\xC0\xE5o\xDES0ן̾}\xB6\xB9?\xE7خ\xF7\xB5z \xC0\xAD<V \xFE\x87 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2\xCFq\x8E\xD5\xE0\x96\x8Eױz \xC0\xED\xECsιz \xF0\\xB0 \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8|~<֫k\xED IEND\xAEB`\x82
\ No newline at end of file