Diff
Modified: trunk/LayoutTests/ChangeLog (92545 => 92546)
--- trunk/LayoutTests/ChangeLog 2011-08-06 08:25:44 UTC (rev 92545)
+++ trunk/LayoutTests/ChangeLog 2011-08-06 09:19:44 UTC (rev 92546)
@@ -1,5 +1,18 @@
2011-08-06 Nikolas Zimmermann <[email protected]>
+ Follow-up for r92545.
+
+ Rebaseline some tests on gtk/qt and win.
+
+ * platform/gtk/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt:
+ * platform/gtk/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt:
+ * platform/qt/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt:
+ * platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt:
+ * platform/win/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt: Added.
+ * platform/win/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt: Removed.
+
+2011-08-06 Nikolas Zimmermann <[email protected]>
+
REGRESSION(87526): ASSERT(!needsLayout()) followed by graphical glitches on google charts (svg loaded in iframe)
https://bugs.webkit.org/show_bug.cgi?id=64974
Modified: trunk/LayoutTests/platform/gtk/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt (92545 => 92546)
--- trunk/LayoutTests/platform/gtk/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt 2011-08-06 08:25:44 UTC (rev 92545)
+++ trunk/LayoutTests/platform/gtk/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt 2011-08-06 09:19:44 UTC (rev 92546)
@@ -24,12 +24,12 @@
RenderSVGPath {path} at (13,4) size 61x14 [fill={[type=SOLID] [color=#008000]}] [data="" 500 50 L 150 200 L 850 200 Z"]
RenderBlock {P} at (1,156) size 115x7
RenderEmbeddedObject {OBJECT} at (7,0) size 101x36 [bgcolor=#FF0000] [border: (7px solid #0000FF)]
- layer at (0,0) size 87x22
- RenderView at (0,0) size 87x22
- layer at (0,0) size 87x22
- RenderSVGRoot {svg} at (0,0) size 87x22
- RenderSVGPath {rect} at (0,0) size 87x22 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
- RenderSVGPath {path} at (13,4) size 61x14 [fill={[type=SOLID] [color=#008000]}] [data="" 500 50 L 150 200 L 850 200 Z"]
+ layer at (0,0) size 106x30
+ RenderView at (0,0) size 106x30
+ layer at (0,0) size 106x30
+ RenderSVGRoot {svg} at (0,0) size 106x28
+ RenderSVGPath {rect} at (0,0) size 106x28 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
+ RenderSVGPath {path} at (15,5) size 76x17 [fill={[type=SOLID] [color=#008000]}] [data="" 500 50 L 150 200 L 850 200 Z"]
RenderTable at (1,209) size 115x36
RenderTableSection (anonymous) at (0,0) size 115x36
RenderTableRow (anonymous) at (0,0) size 115x36
Modified: trunk/LayoutTests/platform/gtk/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt (92545 => 92546)
--- trunk/LayoutTests/platform/gtk/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt 2011-08-06 08:25:44 UTC (rev 92545)
+++ trunk/LayoutTests/platform/gtk/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt 2011-08-06 09:19:44 UTC (rev 92546)
@@ -4,17 +4,17 @@
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 183x183
+ RenderView at (0,0) size 183x183
layer at (0,0) size 152x152
- RenderView at (0,0) size 136x136
- 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
- RenderView at (0,0) size 136x136
- 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
Modified: trunk/LayoutTests/platform/qt/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt (92545 => 92546)
--- trunk/LayoutTests/platform/qt/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt 2011-08-06 08:25:44 UTC (rev 92545)
+++ trunk/LayoutTests/platform/qt/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt 2011-08-06 09:19:44 UTC (rev 92546)
@@ -54,9 +54,9 @@
RenderSVGPath {path} at (13,4) size 61x14 [fill={[type=SOLID] [color=#008000]}] [data="" 500 50 L 150 200 L 850 200 Z"]
RenderBlock (floating) {P} at (1,375) size 115x7
RenderEmbeddedObject {OBJECT} at (7,0) size 101x36 [bgcolor=#FF0000] [border: (7px solid #0000FF)]
- layer at (0,0) size 87x22
- RenderView at (0,0) size 87x22
- layer at (0,0) size 87x22
- RenderSVGRoot {svg} at (0,0) size 87x22
- RenderSVGPath {rect} at (0,0) size 87x22 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
- RenderSVGPath {path} at (13,4) size 61x14 [fill={[type=SOLID] [color=#008000]}] [data="" 500 50 L 150 200 L 850 200 Z"]
+ layer at (0,0) size 106x30
+ RenderView at (0,0) size 106x30
+ layer at (0,0) size 106x30
+ RenderSVGRoot {svg} at (0,0) size 106x28
+ RenderSVGPath {rect} at (0,0) size 106x28 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
+ RenderSVGPath {path} at (15,5) size 76x17 [fill={[type=SOLID] [color=#008000]}] [data="" 500 50 L 150 200 L 850 200 Z"]
Modified: trunk/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt (92545 => 92546)
--- trunk/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt 2011-08-06 08:25:44 UTC (rev 92545)
+++ trunk/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt 2011-08-06 09:19:44 UTC (rev 92546)
@@ -25,7 +25,7 @@
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
+ RenderView at (0,0) size 138x69
layer at (0,0) size 138x69
RenderSVGRoot {svg} at (23,0) size 92x69
RenderSVGContainer {g} at (27,8) size 73x46
Added: trunk/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt (0 => 92546)
--- trunk/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt 2011-08-06 09:19:44 UTC (rev 92546)
@@ -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 137x137
+ 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
Deleted: trunk/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt (92545 => 92546)
--- trunk/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt 2011-08-06 08:25:44 UTC (rev 92545)
+++ trunk/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt 2011-08-06 09:19:44 UTC (rev 92546)
@@ -1,47 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x376
- RenderBlock {html} at (0,0) size 800x376
- RenderBody {body} at (5,5) size 790x366
- RenderTable {table} at (44,0) size 701x366
- RenderTableSection (anonymous) at (0,0) size 701x366
- RenderTableRow {tr} at (0,0) size 701x366
- RenderTableCell {td} at (0,0) size 701x366 [r=0 c=0 rs=1 cs=3]
- RenderTable {table} at (6,6) size 689x354
- RenderTableSection (anonymous) at (0,0) size 689x354
- RenderTableRow {tr} at (0,1) size 689x64
- RenderTableCell {td} at (1,1) size 687x64 [r=0 c=0 rs=1 cs=2]
- RenderBlock {h1} at (5,19) size 677x26
- RenderText {#text} at (99,0) size 479x26
- text run at (99,0) width 479: "Both sides should have identical size after zooming"
- RenderTableRow {tr} at (0,66) size 689x23
- RenderTableCell {td} at (1,66) size 343x23 [r=1 c=0 rs=1 cs=1]
- RenderText {#text} at (144,5) size 55x13
- text run at (144,5) width 55: "SVG Image"
- RenderTableCell {td} at (345,66) size 343x23 [r=1 c=1 rs=1 cs=1]
- RenderText {#text} at (144,5) size 55x13
- text run at (144,5) width 55: "PNG Image"
- RenderTableRow {tr} at (0,90) size 689x263
- RenderTableCell {td} at (1,90) size 343x263 [r=2 c=0 rs=1 cs=1]
- RenderEmbeddedObject {object} at (5,5) size 333x250
- layer at (0,0) size 333x250
- RenderView at (0,0) size 318x235
- layer at (0,0) size 333x250
- RenderSVGRoot {svg} at (0,0) size 333x250
- RenderSVGContainer {g} at (18,31) size 260x164
- RenderSVGPath {rect} at (20,31) size 37x58 [stroke={[type=SOLID] [color=#000000]}] [x=30.00] [y=46.00] [width=50.00] [height=80.00]
- RenderSVGPath {rect} at (90,32) size 35x56 [fill={[type=SOLID] [color=#FF0000]}] [x=130.00] [y=46.00] [width=50.00] [height=80.00]
- RenderSVGPath {rect} at (172,31) size 37x58 [stroke={[type=SOLID] [color=#000000]}] [x=250.00] [y=46.00] [width=50.00] [height=80.00]
- RenderSVGPath {rect} at (242,32) size 36x56 [fill={[type=SOLID] [color=#FF0000]}] [x=350.00] [y=46.00] [width=50.00] [height=80.00]
- RenderSVGPath {rect} at (18,133) size 41x62 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=30.00] [y=196.00] [width=50.00] [height=80.00]
- RenderSVGPath {rect} at (87,133) size 41x62 [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 (170,133) size 41x62 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=250.00] [y=196.00] [width=50.00] [height=80.00]
- RenderSVGPath {rect} at (242,136) size 36x56 [fill={[type=SOLID] [color=#00FF00]}] [x=350.00] [y=196.00] [width=50.00] [height=80.00]
- RenderSVGText {text} at (10,303) size 267x48 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 267x48
- chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 266.67: "$Revision: 1.7 $"
- RenderSVGPath {rect} at (0,0) size 333x250 [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 (345,90) size 343x262 [r=2 c=1 rs=1 cs=1]
- RenderImage {img} at (5,5) size 333x249
- RenderText {#text} at (0,0) size 0x0
