Unreviewed GTK gardening, updating baselines after r121789.

* platform/gtk/TestExpectations:
* platform/gtk/css1/formatting_model/floating_elements-expected.png: Added.
* platform/gtk/css1/formatting_model/floating_elements-expected.txt:
* platform/gtk/fast/block/float/010-expected.png:
* platform/gtk/fast/block/float/010-expected.txt:
* platform/gtk/fast/block/float/independent-align-positioning-expected.png:
* platform/gtk/fast/block/float/independent-align-positioning-expected.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121841 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 52a4a69..ac092a3 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2012-07-04  Zan Dobersek  <zandobersek@gmail.com>
+
+        Unreviewed GTK gardening, updating baselines after r121789.
+
+        * platform/gtk/TestExpectations:
+        * platform/gtk/css1/formatting_model/floating_elements-expected.png: Added.
+        * platform/gtk/css1/formatting_model/floating_elements-expected.txt:
+        * platform/gtk/fast/block/float/010-expected.png:
+        * platform/gtk/fast/block/float/010-expected.txt:
+        * platform/gtk/fast/block/float/independent-align-positioning-expected.png:
+        * platform/gtk/fast/block/float/independent-align-positioning-expected.txt:
+
 2012-07-04  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
 
         [Qt] Unreviewed gardening. Skip failing test.

diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
index e3b0f3a..0f2d837 100644 (file)
--- a/LayoutTests/platform/gtk/TestExpectations
+++ b/LayoutTests/platform/gtk/TestExpectations
@@ -1243,11 +1243,6 @@ BUGWK89845 : fast/forms/input-set-composition-scroll.html = TEXT
 
 BUGWK90007 : http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html = TEXT
 
-// Require rebaseline after bug 88171
-BUGWK88171 : fast/block/float/independent-align-positioning.html = TEXT
-BUGWK88171 : fast/block/float/010.html = TEXT
-BUGWK88171 : css1/formatting_model/floating_elements.html = TEXT
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // End of Tests failing
 //////////////////////////////////////////////////////////////////////////////////////////

diff --git a/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.png b/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.png
new file mode 100644 (file)
index 0000000..d495cce
Binary files /dev/null and b/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.png differ

diff --git a/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.txt b/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.txt
index ea7b253..cd1c9a6 100644 (file)
--- a/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.txt
+++ b/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x6285
+layer at (0,0) size 785x6281
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x6285
-  RenderBlock {HTML} at (0,0) size 785x6285
-    RenderBody {BODY} at (8,8) size 769x6269 [bgcolor=#CCCCCC]
+layer at (0,0) size 785x6281
+  RenderBlock {HTML} at (0,0) size 785x6281
+    RenderBody {BODY} at (8,8) size 769x6265 [bgcolor=#CCCCCC]
       RenderBlock {P} at (0,0) size 769x18
         RenderText {#text} at (0,0) size 355x19
           text run at (0,0) width 355: "The style declarations which apply to the text below are:"
@@ -108,7 +108,7 @@ layer at (0,0) size 785x6285
           text run at (45,149) width 307: "The first two should be side by side, whereas the"
           text run at (5,167) width 213: "third should be on the next \"line.\""
       RenderBlock {HR} at (24,976) size 578x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (2,1002) size 314x352 [border: (5px solid #800080)]
+      RenderBlock {DIV} at (2,1002) size 314x350 [border: (5px solid #800080)]
         RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
           RenderText {#text} at (17,17) size 130x55
             text run at (17,17) width 130: "This is a left-floating"
@@ -119,50 +119,47 @@ layer at (0,0) size 785x6285
             text run at (17,17) width 139: "This is a right-floating"
             text run at (17,35) width 132: "paragraph (second in"
             text run at (17,53) width 50: "source)."
-        RenderText {#text} at (199,5) size 295x343
+        RenderText {#text} at (199,5) size 304x341
           text run at (199,5) width 69: "This is text"
           text run at (199,23) width 100: "within the DIV."
           text run at (199,41) width 77: "The floating"
           text run at (199,59) width 99: "elements within"
-          text run at (199,77) width 101: "this DIV should"
-          text run at (5,95) width 91: "not go beyond"
-          text run at (5,113) width 93: "the left or right"
-          text run at (5,131) width 109: "inner edge of this"
-          text run at (5,149) width 76: "DIV, which"
-          text run at (5,167) width 90: "means that the"
-          text run at (5,185) width 268: "borders of the floating elements should not"
-          text run at (5,203) width 280: "overlap the top or side borders of the DIV in"
-          text run at (5,221) width 62: "any way. "
-          text run at (67,221) width 224: "In addition, they should not overlap"
-          text run at (5,239) width 284: "each other in any way, nor should the floated"
-          text run at (5,257) width 261: "elements be overwritten by the DIV text. "
-          text run at (266,257) width 13: "In"
-          text run at (5,275) width 273: "addition, the floated elements should not be"
-          text run at (5,293) width 268: "side-by-side, but instead the first should be"
-          text run at (5,311) width 288: "floated left, and the second floated to the right"
-          text run at (5,329) width 94: "below the first."
-      RenderBlock {HR} at (364,1362) size 40x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (2,1372) size 410x226 [border: (5px solid #800080)]
+          text run at (5,93) width 101: "this DIV should"
+          text run at (5,111) width 91: "not go beyond"
+          text run at (5,129) width 93: "the left or right"
+          text run at (5,147) width 109: "inner edge of this"
+          text run at (5,165) width 76: "DIV, which"
+          text run at (5,183) width 292: "means that the borders of the floating elements"
+          text run at (5,201) width 301: "should not overlap the top or side borders of the"
+          text run at (5,219) width 111: "DIV in any way. "
+          text run at (116,219) width 173: "In addition, they should not"
+          text run at (5,237) width 288: "overlap each other in any way, nor should the"
+          text run at (5,255) width 304: "floated elements be overwritten by the DIV text."
+          text run at (5,273) width 290: "In addition, the floated elements should not be"
+          text run at (5,291) width 268: "side-by-side, but instead the first should be"
+          text run at (5,309) width 288: "floated left, and the second floated to the right"
+          text run at (5,327) width 94: "below the first."
+      RenderBlock {HR} at (364,1360) size 40x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (2,1370) size 410x226 [border: (5px solid #800080)]
         RenderImage {IMG} at (5,5) size 256x36 [border: (3px solid #000000)]
         RenderImage {IMG} at (149,41) size 256x36 [border: (3px solid #000000)]
-        RenderText {#text} at (261,5) size 392x217
+        RenderText {#text} at (261,5) size 398x217
           text run at (261,5) width 136: "This is text within the"
-          text run at (261,23) width 37: "DIV. "
-          text run at (298,23) width 77: "The floating"
-          text run at (5,41) width 114: "images within this"
-          text run at (5,59) width 119: "DIV should not go"
-          text run at (5,77) width 381: "beyond the left or right inner edge of this DIV, which means"
-          text run at (5,95) width 381: "that the borders of the floating images should not overlap the"
-          text run at (5,113) width 272: "top or side borders of the DIV in any way. "
-          text run at (277,113) width 103: "In addition, they"
-          text run at (5,131) width 358: "should not overlap each other in any way, nor should the"
-          text run at (5,149) width 308: "floated elements be overwritten by the DIV text. "
-          text run at (313,149) width 72: "In addition,"
-          text run at (5,167) width 382: "the floated images should not be side-by-side, but instead the"
-          text run at (5,185) width 381: "first should be floated left, and the second floated to the right"
-          text run at (5,203) width 94: "below the first."
-      RenderBlock {HR} at (24,1622) size 578x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (2,1648) size 765x118 [border: (5px solid #800080)]
+          text run at (5,41) width 37: "DIV. "
+          text run at (42,41) width 77: "The floating"
+          text run at (5,59) width 114: "images within this"
+          text run at (5,77) width 380: "DIV should not go beyond the left or right inner edge of this"
+          text run at (5,95) width 361: "DIV, which means that the borders of the floating images"
+          text run at (5,113) width 377: "should not overlap the top or side borders of the DIV in any"
+          text run at (5,131) width 35: "way. "
+          text run at (40,131) width 336: "In addition, they should not overlap each other in any"
+          text run at (5,149) width 369: "way, nor should the floated elements be overwritten by the"
+          text run at (5,167) width 64: "DIV text. "
+          text run at (69,167) width 334: "In addition, the floated images should not be side-by-"
+          text run at (5,185) width 390: "side, but instead the first should be floated left, and the second"
+          text run at (5,203) width 213: "floated to the right below the first."
+      RenderBlock {HR} at (24,1620) size 578x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (2,1646) size 765x118 [border: (5px solid #800080)]
         RenderBlock (floating) {P} at (566,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
           RenderText {#text} at (17,17) size 139x55
             text run at (17,17) width 139: "This is a right-floating"
@@ -182,8 +179,8 @@ layer at (0,0) size 785x6285
           text run at (199,77) width 62: "any way. "
           text run at (261,77) width 264: "In addition, the top of the left-floating box"
           text run at (5,95) width 365: "should not be higher than the top of the right-floating box."
-      RenderBlock {HR} at (364,1774) size 40x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (2,1784) size 765x64 [border: (5px solid #800080)]
+      RenderBlock {HR} at (364,1772) size 40x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (2,1782) size 765x64 [border: (5px solid #800080)]
         RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)]
         RenderImage {IMG} at (745,5) size 15x36 [border: (3px solid #000000)]
         RenderText {#text} at (20,5) size 720x55
@@ -192,8 +189,8 @@ layer at (0,0) size 785x6285
           text run at (20,23) width 705: "which means that the borders of the floating images should not overlap the top or side borders of the DIV in any"
           text run at (5,41) width 35: "way. "
           text run at (40,41) width 661: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image."
-      RenderBlock {HR} at (24,1872) size 578x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (2,1898) size 765x136 [border: (5px solid #800080)]
+      RenderBlock {HR} at (24,1870) size 578x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (2,1896) size 765x136 [border: (5px solid #800080)]
         RenderText {#text} at (199,5) size 185x19
           text run at (199,5) width 177: "This is text within the DIV. "
           text run at (376,5) width 8: "*"
@@ -219,8 +216,8 @@ layer at (0,0) size 785x6285
           text run at (530,77) width 13: "In"
           text run at (5,95) width 545: "order to mark these points clearly, an asterisk has been inserted just before each floated"
           text run at (5,113) width 53: "element."
-      RenderBlock {HR} at (364,2042) size 40x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (2,2052) size 765x82 [border: (5px solid #800080)]
+      RenderBlock {HR} at (364,2040) size 40x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (2,2050) size 765x82 [border: (5px solid #800080)]
         RenderText {#text} at (20,5) size 185x19
           text run at (20,5) width 177: "This is text within the DIV. "
           text run at (197,5) width 8: "*"
@@ -235,8 +232,8 @@ layer at (0,0) size 785x6285
           text run at (5,41) width 725: "high as the top edge of the inline element containing the content just before the floating images occur in the source. "
           text run at (730,41) width 13: "In"
           text run at (5,59) width 591: "order to mark these points clearly, an asterisk has been inserted just before each floated image."
-      RenderBlock {HR} at (24,2158) size 578x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (2,2184) size 765x262 [border: (5px solid #800080)]
+      RenderBlock {HR} at (24,2156) size 578x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (2,2182) size 765x262 [border: (5px solid #800080)]
         RenderText {#text} at (199,5) size 185x19
           text run at (199,5) width 177: "This is text within the DIV. "
           text run at (376,5) width 8: "*"
@@ -285,8 +282,8 @@ layer at (0,0) size 785x6285
           text run at (5,221) width 722: "has room for a floated element, then the element should float so that its top is aligned with the top of the line-box in"
           text run at (5,239) width 173: "which the asterisk appears. "
           text run at (178,239) width 402: "Otherwise, its top should align with the top of the next line-box."
-      RenderBlock {HR} at (364,2454) size 40x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (2,2464) size 765x118 [border: (5px solid #800080)]
+      RenderBlock {HR} at (364,2452) size 40x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (2,2462) size 765x118 [border: (5px solid #800080)]
         RenderText {#text} at (20,5) size 185x19
           text run at (20,5) width 177: "This is text within the DIV. "
           text run at (197,5) width 8: "*"
@@ -312,8 +309,8 @@ layer at (0,0) size 785x6285
           text run at (20,77) width 700: "has room for a floated image, then the image should float so that its top is aligned with the top of the line-box in"
           text run at (5,95) width 173: "which the asterisk appears. "
           text run at (178,95) width 402: "Otherwise, its top should align with the top of the next line-box."
-      RenderBlock {HR} at (24,2606) size 578x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (2,2632) size 490x298 [border: (5px solid #800080)]
+      RenderBlock {HR} at (24,2604) size 578x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (2,2630) size 490x298 [border: (5px solid #800080)]
         RenderText {#text} at (199,5) size 54x19
           text run at (199,5) width 54: "This is *"
         RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
@@ -345,8 +342,8 @@ layer at (0,0) size 785x6285
           text run at (5,239) width 475: "align with the top of the line-box following the insertion point of the floated"
           text run at (5,257) width 466: "element to avoid floating elements appearing before text which precedes it"
           text run at (5,275) width 150: "in the source document."
-      RenderBlock {HR} at (364,2938) size 40x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (2,2948) size 490x226 [border: (5px solid #800080)]
+      RenderBlock {HR} at (364,2936) size 40x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (2,2946) size 490x226 [border: (5px solid #800080)]
         RenderText {#text} at (20,5) size 54x19
           text run at (20,5) width 54: "This is *"
         RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)]
@@ -368,19 +365,19 @@ layer at (0,0) size 785x6285
           text run at (5,167) width 429: "line-box following the insertion point of the floated element to avoid"
           text run at (5,185) width 442: "floating elements appearing before text which precedes it in the source"
           text run at (5,203) width 66: "document."
-      RenderBlock {HR} at (24,3198) size 578x2 [border: (1px inset #000000)]
-      RenderTable {TABLE} at (0,3224) size 769x3045 [border: (1px outset #808080)]
-        RenderTableSection {TBODY} at (1,1) size 767x3043
+      RenderBlock {HR} at (24,3196) size 578x2 [border: (1px inset #000000)]
+      RenderTable {TABLE} at (0,3222) size 769x3043 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 767x3041
           RenderTableRow {TR} at (0,0) size 767x26
             RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
               RenderInline {STRONG} at (0,0) size 163x19
                 RenderText {#text} at (4,4) size 163x19
                   text run at (4,4) width 163: "TABLE Testing Section"
-          RenderTableRow {TR} at (0,26) size 767x3017
-            RenderTableCell {TD} at (0,1521) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,26) size 767x3015
+            RenderTableCell {TD} at (0,1520) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 4x19
                 text run at (4,4) width 4: " "
-            RenderTableCell {TD} at (12,26) size 755x3017 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (12,26) size 755x3015 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
               RenderBlock {P} at (4,4) size 747x54
                 RenderText {#text} at (0,0) size 740x55
                   text run at (0,0) width 681: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. "
@@ -464,7 +461,7 @@ layer at (0,0) size 785x6285
                   text run at (45,149) width 307: "The first two should be side by side, whereas the"
                   text run at (5,167) width 213: "third should be on the next \"line.\""
               RenderBlock {HR} at (28,798) size 562x2 [border: (1px inset #000000)]
-              RenderBlock {DIV} at (6,824) size 314x352 [border: (5px solid #800080)]
+              RenderBlock {DIV} at (6,824) size 314x350 [border: (5px solid #800080)]
                 RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
                   RenderText {#text} at (17,17) size 130x55
                     text run at (17,17) width 130: "This is a left-floating"
@@ -475,50 +472,47 @@ layer at (0,0) size 785x6285
                     text run at (17,17) width 139: "This is a right-floating"
                     text run at (17,35) width 132: "paragraph (second in"
                     text run at (17,53) width 50: "source)."
-                RenderText {#text} at (199,5) size 295x343
+                RenderText {#text} at (199,5) size 304x341
                   text run at (199,5) width 69: "This is text"
                   text run at (199,23) width 100: "within the DIV."
                   text run at (199,41) width 77: "The floating"
                   text run at (199,59) width 99: "elements within"
-                  text run at (199,77) width 101: "this DIV should"
-                  text run at (5,95) width 91: "not go beyond"
-                  text run at (5,113) width 93: "the left or right"
-                  text run at (5,131) width 109: "inner edge of this"
-                  text run at (5,149) width 76: "DIV, which"
-                  text run at (5,167) width 90: "means that the"
-                  text run at (5,185) width 268: "borders of the floating elements should not"
-                  text run at (5,203) width 280: "overlap the top or side borders of the DIV in"
-                  text run at (5,221) width 62: "any way. "
-                  text run at (67,221) width 224: "In addition, they should not overlap"
-                  text run at (5,239) width 284: "each other in any way, nor should the floated"
-                  text run at (5,257) width 261: "elements be overwritten by the DIV text. "
-                  text run at (266,257) width 13: "In"
-                  text run at (5,275) width 273: "addition, the floated elements should not be"
-                  text run at (5,293) width 268: "side-by-side, but instead the first should be"
-                  text run at (5,311) width 288: "floated left, and the second floated to the right"
-                  text run at (5,329) width 94: "below the first."
-              RenderBlock {HR} at (358,1184) size 39x2 [border: (1px inset #000000)]
-              RenderBlock {DIV} at (6,1194) size 410x226 [border: (5px solid #800080)]
+                  text run at (5,93) width 101: "this DIV should"
+                  text run at (5,111) width 91: "not go beyond"
+                  text run at (5,129) width 93: "the left or right"
+                  text run at (5,147) width 109: "inner edge of this"
+                  text run at (5,165) width 76: "DIV, which"
+                  text run at (5,183) width 292: "means that the borders of the floating elements"
+                  text run at (5,201) width 301: "should not overlap the top or side borders of the"
+                  text run at (5,219) width 111: "DIV in any way. "
+                  text run at (116,219) width 173: "In addition, they should not"
+                  text run at (5,237) width 288: "overlap each other in any way, nor should the"
+                  text run at (5,255) width 304: "floated elements be overwritten by the DIV text."
+                  text run at (5,273) width 290: "In addition, the floated elements should not be"
+                  text run at (5,291) width 268: "side-by-side, but instead the first should be"
+                  text run at (5,309) width 288: "floated left, and the second floated to the right"
+                  text run at (5,327) width 94: "below the first."
+              RenderBlock {HR} at (358,1182) size 39x2 [border: (1px inset #000000)]
+              RenderBlock {DIV} at (6,1192) size 410x226 [border: (5px solid #800080)]
                 RenderImage {IMG} at (5,5) size 256x36 [border: (3px solid #000000)]
                 RenderImage {IMG} at (149,41) size 256x36 [border: (3px solid #000000)]
-                RenderText {#text} at (261,5) size 392x217
+                RenderText {#text} at (261,5) size 398x217
                   text run at (261,5) width 136: "This is text within the"
-                  text run at (261,23) width 37: "DIV. "
-                  text run at (298,23) width 77: "The floating"
-                  text run at (5,41) width 114: "images within this"
-                  text run at (5,59) width 119: "DIV should not go"
-                  text run at (5,77) width 381: "beyond the left or right inner edge of this DIV, which means"
-                  text run at (5,95) width 381: "that the borders of the floating images should not overlap the"
-                  text run at (5,113) width 272: "top or side borders of the DIV in any way. "
-                  text run at (277,113) width 103: "In addition, they"
-                  text run at (5,131) width 358: "should not overlap each other in any way, nor should the"
-                  text run at (5,149) width 308: "floated elements be overwritten by the DIV text. "
-                  text run at (313,149) width 72: "In addition,"
-                  text run at (5,167) width 382: "the floated images should not be side-by-side, but instead the"
-                  text run at (5,185) width 381: "first should be floated left, and the second floated to the right"
-                  text run at (5,203) width 94: "below the first."
-              RenderBlock {HR} at (28,1444) size 562x2 [border: (1px inset #000000)]
-              RenderBlock {DIV} at (6,1470) size 743x118 [border: (5px solid #800080)]
+                  text run at (5,41) width 37: "DIV. "
+                  text run at (42,41) width 77: "The floating"
+                  text run at (5,59) width 114: "images within this"
+                  text run at (5,77) width 380: "DIV should not go beyond the left or right inner edge of this"
+                  text run at (5,95) width 361: "DIV, which means that the borders of the floating images"
+                  text run at (5,113) width 377: "should not overlap the top or side borders of the DIV in any"
+                  text run at (5,131) width 35: "way. "
+                  text run at (40,131) width 336: "In addition, they should not overlap each other in any"
+                  text run at (5,149) width 369: "way, nor should the floated elements be overwritten by the"
+                  text run at (5,167) width 64: "DIV text. "
+                  text run at (69,167) width 334: "In addition, the floated images should not be side-by-"
+                  text run at (5,185) width 390: "side, but instead the first should be floated left, and the second"
+                  text run at (5,203) width 213: "floated to the right below the first."
+              RenderBlock {HR} at (28,1442) size 562x2 [border: (1px inset #000000)]
+              RenderBlock {DIV} at (6,1468) size 743x118 [border: (5px solid #800080)]
                 RenderBlock (floating) {P} at (544,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
                   RenderText {#text} at (17,17) size 139x55
                     text run at (17,17) width 139: "This is a right-floating"
@@ -538,8 +532,8 @@ layer at (0,0) size 785x6285
                   text run at (199,77) width 134: "the DIV in any way. "
                   text run at (333,77) width 188: "In addition, the top of the left-"
                   text run at (5,95) width 445: "floating box should not be higher than the top of the right-floating box."
-              RenderBlock {HR} at (358,1596) size 39x2 [border: (1px inset #000000)]
-              RenderBlock {DIV} at (6,1606) size 743x64 [border: (5px solid #800080)]
+              RenderBlock {HR} at (358,1594) size 39x2 [border: (1px inset #000000)]
+              RenderBlock {DIV} at (6,1604) size 743x64 [border: (5px solid #800080)]
                 RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)]
                 RenderImage {IMG} at (723,5) size 15x36 [border: (3px solid #000000)]
                 RenderText {#text} at (20,5) size 723x55
@@ -548,8 +542,8 @@ layer at (0,0) size 785x6285
                   text run at (20,23) width 678: "which means that the borders of the floating images should not overlap the top or side borders of the DIV in"
                   text run at (5,41) width 62: "any way. "
                   text run at (67,41) width 661: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image."
-              RenderBlock {HR} at (28,1694) size 562x2 [border: (1px inset #000000)]
-              RenderBlock {DIV} at (6,1720) size 743x136 [border: (5px solid #800080)]
+              RenderBlock {HR} at (28,1692) size 562x2 [border: (1px inset #000000)]
+              RenderBlock {DIV} at (6,1718) size 743x136 [border: (5px solid #800080)]
                 RenderText {#text} at (199,5) size 185x19
                   text run at (199,5) width 177: "This is text within the DIV. "
                   text run at (376,5) width 8: "*"
@@ -574,8 +568,8 @@ layer at (0,0) size 785x6285
                   text run at (5,95) width 127: "occur in the source. "
                   text run at (132,95) width 412: "In order to mark these points clearly, an asterisk has been inserted"
                   text run at (5,113) width 203: "just before each floated element."
-              RenderBlock {HR} at (358,1864) size 39x2 [border: (1px inset #000000)]
-              RenderBlock {DIV} at (6,1874) size 743x82 [border: (5px solid #800080)]
+              RenderBlock {HR} at (358,1862) size 39x2 [border: (1px inset #000000)]
+              RenderBlock {DIV} at (6,1872) size 743x82 [border: (5px solid #800080)]
                 RenderText {#text} at (20,5) size 185x19
                   text run at (20,5) width 177: "This is text within the DIV. "
                   text run at (197,5) width 8: "*"
@@ -590,8 +584,8 @@ layer at (0,0) size 785x6285
                   text run at (5,41) width 689: "as high as the top edge of the inline element containing the content just before the floating images occur in the"
                   text run at (5,59) width 49: "source. "
                   text run at (54,59) width 608: "In order to mark these points clearly, an asterisk has been inserted just before each floated image."
-              RenderBlock {HR} at (28,1980) size 562x2 [border: (1px inset #000000)]
-              RenderBlock {DIV} at (6,2006) size 743x226 [border: (5px solid #800080)]
+              RenderBlock {HR} at (28,1978) size 562x2 [border: (1px inset #000000)]
+              RenderBlock {DIV} at (6,2004) size 743x226 [border: (5px solid #800080)]
                 RenderText {#text} at (199,5) size 185x19
                   text run at (199,5) width 177: "This is text within the DIV. "
                   text run at (376,5) width 8: "*"
@@ -637,8 +631,8 @@ layer at (0,0) size 785x6285
                   text run at (199,185) width 470: "its top is aligned with the top of the line-box in which the asterisk appears. "
                   text run at (669,185) width 69: "Otherwise,"
                   text run at (199,203) width 329: "its top should align with the top of the next line-box."
-              RenderBlock {HR} at (358,2243) size 39x2 [border: (1px inset #000000)]
-              RenderBlock {DIV} at (6,2253) size 743x118 [border: (5px solid #800080)]
+              RenderBlock {HR} at (358,2241) size 39x2 [border: (1px inset #000000)]
+              RenderBlock {DIV} at (6,2251) size 743x118 [border: (5px solid #800080)]
                 RenderText {#text} at (20,5) size 185x19
                   text run at (20,5) width 177: "This is text within the DIV. "
                   text run at (197,5) width 8: "*"
@@ -663,8 +657,8 @@ layer at (0,0) size 785x6285
                   text run at (20,77) width 712: "If a line has room for a floated image, then the image should float so that its top is aligned with the top of the line-"
                   text run at (5,95) width 217: "box in which the asterisk appears. "
                   text run at (222,95) width 402: "Otherwise, its top should align with the top of the next line-box."
-              RenderBlock {HR} at (28,2395) size 562x2 [border: (1px inset #000000)]
-              RenderBlock {DIV} at (6,2421) size 490x298 [border: (5px solid #800080)]
+              RenderBlock {HR} at (28,2393) size 562x2 [border: (1px inset #000000)]
+              RenderBlock {DIV} at (6,2419) size 490x298 [border: (5px solid #800080)]
                 RenderText {#text} at (199,5) size 54x19
                   text run at (199,5) width 54: "This is *"
                 RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
@@ -696,8 +690,8 @@ layer at (0,0) size 785x6285
                   text run at (5,239) width 475: "align with the top of the line-box following the insertion point of the floated"
                   text run at (5,257) width 466: "element to avoid floating elements appearing before text which precedes it"
                   text run at (5,275) width 150: "in the source document."
-              RenderBlock {HR} at (358,2727) size 39x2 [border: (1px inset #000000)]
-              RenderBlock {DIV} at (6,2737) size 490x226 [border: (5px solid #800080)]
+              RenderBlock {HR} at (358,2725) size 39x2 [border: (1px inset #000000)]
+              RenderBlock {DIV} at (6,2735) size 490x226 [border: (5px solid #800080)]
                 RenderText {#text} at (20,5) size 54x19
                   text run at (20,5) width 54: "This is *"
                 RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)]
@@ -719,4 +713,4 @@ layer at (0,0) size 785x6285
                   text run at (5,167) width 429: "line-box following the insertion point of the floated element to avoid"
                   text run at (5,185) width 442: "floating elements appearing before text which precedes it in the source"
                   text run at (5,203) width 66: "document."
-              RenderBlock {HR} at (28,2987) size 562x2 [border: (1px inset #000000)]
+              RenderBlock {HR} at (28,2985) size 562x2 [border: (1px inset #000000)]

diff --git a/LayoutTests/platform/gtk/fast/block/float/010-expected.png b/LayoutTests/platform/gtk/fast/block/float/010-expected.png
index e184c6d..aa85061 100644 (file)
Binary files a/LayoutTests/platform/gtk/fast/block/float/010-expected.png and b/LayoutTests/platform/gtk/fast/block/float/010-expected.png differ

diff --git a/LayoutTests/platform/gtk/fast/block/float/010-expected.txt b/LayoutTests/platform/gtk/fast/block/float/010-expected.txt
index 7236546..66e540e 100644 (file)
--- a/LayoutTests/platform/gtk/fast/block/float/010-expected.txt
+++ b/LayoutTests/platform/gtk/fast/block/float/010-expected.txt
@@ -9,14 +9,13 @@ layer at (0,0) size 800x600
       RenderBlock (floating) {DIV} at (484,100) size 100x50 [bgcolor=#0000FF]
       RenderBlock (floating) {DIV} at (0,100) size 160x200 [bgcolor=#FF0000]
       RenderBlock (floating) {DIV} at (384,100) size 100x100 [bgcolor=#808000]
-      RenderText {#text} at (492,0) size 415x163
+      RenderText {#text} at (492,0) size 415x155
         text run at (492,0) width 67: "Some text."
         text run at (492,18) width 74: "This should"
         text run at (492,36) width 83: "find a way to"
         text run at (492,54) width 79: "wrap among"
         text run at (492,72) width 76: "all the floats"
-        text run at (492,90) width 48: "without"
-        text run at (160,108) width 162: "overlapping any of them. "
-        text run at (322,108) width 55: "It should"
-        text run at (160,126) width 201: "start just under the blue box and"
-        text run at (160,144) width 133: "wrap to several lines."
+        text run at (160,100) width 214: "without overlapping any of them. "
+        text run at (374,100) width 9: "It"
+        text run at (160,118) width 220: "should start just under the blue box"
+        text run at (160,136) width 160: "and wrap to several lines."

diff --git a/LayoutTests/platform/gtk/fast/block/float/independent-align-positioning-expected.png b/LayoutTests/platform/gtk/fast/block/float/independent-align-positioning-expected.png
index ac63e70..bea937a 100644 (file)
Binary files a/LayoutTests/platform/gtk/fast/block/float/independent-align-positioning-expected.png and b/LayoutTests/platform/gtk/fast/block/float/independent-align-positioning-expected.png differ

diff --git a/LayoutTests/platform/gtk/fast/block/float/independent-align-positioning-expected.txt b/LayoutTests/platform/gtk/fast/block/float/independent-align-positioning-expected.txt
index cc7e359..44b7dac 100644 (file)
--- a/LayoutTests/platform/gtk/fast/block/float/independent-align-positioning-expected.txt
+++ b/LayoutTests/platform/gtk/fast/block/float/independent-align-positioning-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x140
-  RenderBlock {HTML} at (0,0) size 800x140
-    RenderBody {BODY} at (8,16) size 784x108
+layer at (0,0) size 800x158
+  RenderBlock {HTML} at (0,0) size 800x158
+    RenderBody {BODY} at (8,16) size 784x126
       RenderBlock (floating) {DIV} at (556,0) size 228x58 [bgcolor=#CC6666]
         RenderText {#text} at (20,20) size 188x19
           text run at (20,20) width 188: "DIV NUMBER 1: float:right;"
@@ -12,15 +12,16 @@ layer at (0,0) size 800x140
       RenderBlock (floating) {DIV} at (0,58) size 219x58 [bgcolor=#6699FF]
         RenderText {#text} at (20,20) size 179x19
           text run at (20,20) width 179: "DIV NUMBER 3: float:left;"
-      RenderBlock {P} at (0,0) size 784x108
-        RenderText {#text} at (0,0) size 556x91
+      RenderBlock {P} at (0,0) size 784x126
+        RenderText {#text} at (0,0) size 556x109
           text run at (0,0) width 528: "The first element is floated to the right. The second element clears the right float and"
           text run at (0,18) width 556: "also floats right. The third element is floated to the left, but is forced below the bottom of"
           text run at (0,36) width 525: "the first element. Yet, somehow this paragraph comes at the end of the markup, and"
-          text run at (0,54) width 530: "manages to rise to the top of the page. This behavior is present in Firefox, Safari and"
-          text run at (219,72) width 47: "Opera. "
-        RenderInline {A} at (0,0) size 227x37 [color=#0000EE]
-          RenderInline {STRONG} at (0,0) size 227x37
-            RenderText {#text} at (266,72) size 227x37
-              text run at (266,72) width 180: "Click here for a real world"
-              text run at (219,90) width 135: "example of this bug."
+          text run at (219,54) width 238: "manages to rise to the top of the page."
+          text run at (219,72) width 261: "This behavior is present in Firefox, Safari"
+          text run at (219,90) width 74: "and Opera. "
+        RenderInline {A} at (0,0) size 254x37 [color=#0000EE]
+          RenderInline {STRONG} at (0,0) size 254x37
+            RenderText {#text} at (293,90) size 254x37
+              text run at (293,90) width 180: "Click here for a real world"
+              text run at (219,108) width 135: "example of this bug."