Diff
Modified: trunk/LayoutTests/ChangeLog (113411 => 113412)
--- trunk/LayoutTests/ChangeLog 2012-04-06 04:26:50 UTC (rev 113411)
+++ trunk/LayoutTests/ChangeLog 2012-04-06 04:49:34 UTC (rev 113412)
@@ -1,3 +1,10 @@
+2012-04-05 Martin Robinson <mrobin...@igalia.com>
+
+ Rebaseline a couple tests for GTK+.
+
+ * platform/gtk/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-expected.txt:
+ * platform/gtk/fast/frames/flattening/iframe-flattening-nested-expected.txt:
+
2012-04-05 Raphael Kubo da Costa <rak...@webkit.org>
[EFL] Gardening; update expctations in fast/css-generated-content.
Modified: trunk/LayoutTests/platform/gtk/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-expected.txt (113411 => 113412)
--- trunk/LayoutTests/platform/gtk/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-expected.txt 2012-04-06 04:26:50 UTC (rev 113411)
+++ trunk/LayoutTests/platform/gtk/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-expected.txt 2012-04-06 04:49:34 UTC (rev 113412)
@@ -3,14 +3,15 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#008000]
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 432x19
- text run at (0,0) width 432: "Test for iframe flattening. The flattening only works inside the DRT."
- RenderBlock {P} at (0,35) size 784x19
- RenderText {#text} at (0,0) size 778x19
- text run at (0,0) width 434: "This inner frame should be 200px in each direction, disregarding the "
- text run at (434,0) width 344: "border, and it must not be scrollable or have scrollbars."
- RenderBlock {P} at (0,70) size 784x204
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 441x17
+ text run at (0,0) width 441: "Test for iframe flattening. The flattening only works inside the DRT."
+ RenderBlock {P} at (0,34) size 784x36
+ RenderText {#text} at (0,0) size 725x35
+ text run at (0,0) width 443: "This inner frame should be 200px in each direction, disregarding the "
+ text run at (442,0) width 283: "border, and it must not be scrollable or have"
+ text run at (0,18) width 67: "scrollbars."
+ RenderBlock {P} at (0,86) size 784x204
RenderPartObject {IFRAME} at (0,0) size 204x204 [border: (2px inset #000000)]
layer at (0,0) size 400x400
RenderView at (0,0) size 200x200
Modified: trunk/LayoutTests/platform/gtk/fast/frames/flattening/iframe-flattening-nested-expected.txt (113411 => 113412)
--- trunk/LayoutTests/platform/gtk/fast/frames/flattening/iframe-flattening-nested-expected.txt 2012-04-06 04:26:50 UTC (rev 113411)
+++ trunk/LayoutTests/platform/gtk/fast/frames/flattening/iframe-flattening-nested-expected.txt 2012-04-06 04:49:34 UTC (rev 113412)
@@ -7,20 +7,20 @@
RenderPartObject {IFRAME} at (0,0) size 502x402 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
layer at (0,0) size 500x400
RenderView at (0,0) size 500x400
- layer at (0,0) size 500x235
- RenderBlock {HTML} at (0,0) size 500x235
- RenderBody {BODY} at (8,16) size 484x211
- RenderBlock {P} at (0,0) size 484x19
- RenderText {#text} at (0,0) size 186x19
- text run at (0,0) width 186: "This is the intermediate frame"
- RenderBlock (anonymous) at (0,35) size 484x176
+ layer at (0,0) size 500x234
+ RenderBlock {HTML} at (0,0) size 500x234
+ RenderBody {BODY} at (8,16) size 484x210
+ RenderBlock {P} at (0,0) size 484x18
+ RenderText {#text} at (0,0) size 192x17
+ text run at (0,0) width 192: "This is the intermediate frame"
+ RenderBlock (anonymous) at (0,34) size 484x176
RenderPartObject {IFRAME} at (0,0) size 252x172 [border: (1px solid #000000)]
layer at (0,0) size 250x170
RenderView at (0,0) size 250x170
- layer at (0,0) size 250x51
- RenderBlock {HTML} at (0,0) size 250x51
- RenderBody {BODY} at (8,16) size 234x19 [bgcolor=#C0C0C0]
- RenderBlock {P} at (0,0) size 234x19
- RenderText {#text} at (0,0) size 145x19
- text run at (0,0) width 145: "This is the inner frame."
+ layer at (0,0) size 250x50
+ RenderBlock {HTML} at (0,0) size 250x50
+ RenderBody {BODY} at (8,16) size 234x18 [bgcolor=#C0C0C0]
+ RenderBlock {P} at (0,0) size 234x18
+ RenderText {#text} at (0,0) size 149x17
+ text run at (0,0) width 149: "This is the inner frame."
RenderText {#text} at (0,0) size 0x0
