Revised layout test with image and float changes.

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

diff --git a/LayoutTests/css1/conformance/forward_compatible_parsing-expected.txt b/LayoutTests/css1/conformance/forward_compatible_parsing-expected.txt
index 91951bd78baa19c5bb0d68f0e6c47457f856481c..56cd327f1f7ec42aec1dbe683fe11af6c1669e42 100644 (file)
--- a/LayoutTests/css1/conformance/forward_compatible_parsing-expected.txt
+++ b/LayoutTests/css1/conformance/forward_compatible_parsing-expected.txt
@@ -139,9 +139,9 @@ layer at (0,0) size 800x4035
           text run at (0,0) width 688: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to CSS2,"
           text run at (0,18) width 184: "the selector should not apply."
       RenderBlock {P} at (0,1641) size 784x36
-        RenderInline {ACRONYM} at (0,0) size 752x36
-          RenderText {TEXT} at (0,0) size 752x36
-            text run at (0,0) width 752: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector"
+        RenderInline {ACRONYM} at (0,0) size 748x36
+          RenderText {TEXT} at (0,0) size 748x36
+            text run at (0,0) width 748: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector"
             text run at (0,18) width 109: "should not apply."
       RenderBlock {ADDRESS} at (0,1693) size 784x36
         RenderText {TEXT} at (0,0) size 745x36
@@ -357,9 +357,9 @@ layer at (0,0) size 800x4035
                   text run at (0,0) width 643: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to"
                   text run at (0,18) width 229: "CSS2, the selector should not apply."
               RenderBlock {P} at (4,770) size 762x36
-                RenderInline {ACRONYM} at (0,0) size 752x36
-                  RenderText {TEXT} at (0,0) size 752x36
-                    text run at (0,0) width 752: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector"
+                RenderInline {ACRONYM} at (0,0) size 748x36
+                  RenderText {TEXT} at (0,0) size 748x36
+                    text run at (0,0) width 748: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector"
                     text run at (0,18) width 109: "should not apply."
               RenderBlock {ADDRESS} at (4,822) size 762x36
                 RenderText {TEXT} at (0,0) size 745x36

diff --git a/LayoutTests/fast/block/float/015-expected.txt b/LayoutTests/fast/block/float/015-expected.txt
index b29e30e8054ff0946c4d3833f0f80a3360c87167..8f592ab41cee2bd3844e7b8972842ea347470446 100644 (file)
--- a/LayoutTests/fast/block/float/015-expected.txt
+++ b/LayoutTests/fast/block/float/015-expected.txt
@@ -3,23 +3,22 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderTable {TABLE} at (0,0) size 671x148 [border: (1px outset #808080)]
-        RenderTableSection {TBODY} at (1,1) size 0x146
+      RenderTable {TABLE} at (0,0) size 671x130 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 0x128
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (0,60) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,51) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
               RenderText {TEXT} at (4,4) size 4x18
                 text run at (4,4) width 4: " "
-            RenderTableCell {TD} at (12,0) size 657x146 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (12,0) size 657x128 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
               RenderBlock (anonymous) at (4,4) size 649x0
-                RenderImage {IMG} at (0,0) size 102x50 [bgcolor=#FFA500]
+                RenderImage {IMG} at (0,0) size 50x50 [bgcolor=#FFA500]
                 RenderText {TEXT} at (0,0) size 0x0
-              RenderBlock {P} at (4,4) size 649x36
-                RenderText {TEXT} at (105,0) size 535x36
-                  text run at (105,0) width 535: "This text should be flowing past a tall orange rectangle on the left side of the browser"
-                  text run at (105,18) width 56: "window."
-              RenderBlock {DIV} at (4,56) size 649x18 [bgcolor=#008000]
-                RenderBR {BR} at (0,0) size 0x18
-              RenderImage {IMG} at (4,74) size 102x50 [bgcolor=#FFA500]
-              RenderBlock {DIV} at (4,124) size 649x18
+              RenderBlock {P} at (4,4) size 649x18
+                RenderText {TEXT} at (53,0) size 595x18
+                  text run at (53,0) width 595: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
+              RenderBlock {DIV} at (4,38) size 649x18 [bgcolor=#008000]
+                RenderBR {BR} at (53,0) size 0x18
+              RenderImage {IMG} at (4,56) size 50x50 [bgcolor=#FFA500]
+              RenderBlock {DIV} at (4,106) size 649x18
                 RenderText {TEXT} at (0,0) size 649x18
                   text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it."

diff --git a/LayoutTests/fast/encoding/utf-16-big-endian-expected.txt b/LayoutTests/fast/encoding/utf-16-big-endian-expected.txt
index 8b29c916dcbdfc72c807eacff84f8472cb0b589b..adfb6ae90f1e30f5eb8d83f54df396d9bfedb5fe 100644 (file)
--- a/LayoutTests/fast/encoding/utf-16-big-endian-expected.txt
+++ b/LayoutTests/fast/encoding/utf-16-big-endian-expected.txt
@@ -22,14 +22,14 @@ layer at (0,0) size 800x1138
       RenderBlock (anonymous) at (0,26) size 784x2
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
       RenderBlock (anonymous) at (0,34) size 784x51
-        RenderInline {SPAN} at (0,0) size 110x46
-          RenderInline {SPAN} at (0,0) size 110x46
-            RenderInline {SPAN} at (0,0) size 110x17
+        RenderInline {SPAN} at (0,0) size 108x46
+          RenderInline {SPAN} at (0,0) size 108x46
+            RenderInline {SPAN} at (0,0) size 81x17
               RenderText {TEXT} at (0,0) size 0x0
-              RenderImage {IMG} at (0,0) size 53x24
-              RenderText {TEXT} at (53,3) size 57x18
-                text run at (53,3) width 4: " "
-                text run at (57,3) width 53: "Names"
+              RenderImage {IMG} at (0,0) size 24x24
+              RenderText {TEXT} at (24,3) size 57x18
+                text run at (24,3) width 4: " "
+                text run at (28,3) width 53: "Names"
               RenderBR {BR} at (0,0) size 0x0
               RenderText {TEXT} at (0,0) size 0x0
             RenderText {TEXT} at (0,0) size 0x0
@@ -42,12 +42,12 @@ layer at (0,0) size 800x1138
       RenderBlock (anonymous) at (0,99) size 784x78
         RenderInline {SPAN} at (0,0) size 596x74
           RenderInline {SPAN} at (0,0) size 596x74
-            RenderImage {IMG} at (0,0) size 62x24
-            RenderText {TEXT} at (62,4) size 4x15
-              text run at (62,4) width 4: " "
+            RenderImage {IMG} at (0,0) size 24x24
+            RenderText {TEXT} at (24,4) size 4x15
+              text run at (24,4) width 4: " "
             RenderInline {SPAN} at (0,0) size 83x17
-              RenderText {TEXT} at (66,2) size 83x18
-                text run at (66,2) width 83: "Addresses"
+              RenderText {TEXT} at (28,2) size 83x18
+                text run at (28,2) width 83: "Addresses"
               RenderBR {BR} at (0,0) size 0x0
               RenderText {TEXT} at (0,0) size 0x0
             RenderText {TEXT} at (0,0) size 0x0
@@ -56,14 +56,14 @@ layer at (0,0) size 800x1138
       RenderBlock (anonymous) at (0,183) size 784x2
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
       RenderBlock (anonymous) at (0,191) size 784x48
-        RenderInline {SPAN} at (0,0) size 126x43
-          RenderInline {SPAN} at (0,0) size 126x43
-            RenderInline {SPAN} at (0,0) size 126x17
+        RenderInline {SPAN} at (0,0) size 91x43
+          RenderInline {SPAN} at (0,0) size 91x43
+            RenderInline {SPAN} at (0,0) size 91x17
               RenderText {TEXT} at (0,0) size 0x0
-              RenderImage {IMG} at (0,0) size 59x24
-              RenderText {TEXT} at (59,3) size 67x18
-                text run at (59,3) width 4: " "
-                text run at (63,3) width 63: "Phones "
+              RenderImage {IMG} at (0,0) size 24x24
+              RenderText {TEXT} at (24,3) size 67x18
+                text run at (24,3) width 4: " "
+                text run at (28,3) width 63: "Phones "
               RenderBR {BR} at (0,0) size 0x0
               RenderText {TEXT} at (0,0) size 0x0
             RenderText {TEXT} at (0,0) size 0x0
@@ -76,28 +76,28 @@ layer at (0,0) size 800x1138
       RenderBlock (anonymous) at (0,297) size 784x2
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
       RenderBlock (anonymous) at (0,305) size 784x24
-        RenderInline {SPAN} at (0,0) size 128x15
-          RenderInline {SPAN} at (0,0) size 128x15
-            RenderInline {SPAN} at (0,0) size 128x17
+        RenderInline {SPAN} at (0,0) size 90x15
+          RenderInline {SPAN} at (0,0) size 90x15
+            RenderInline {SPAN} at (0,0) size 90x17
               RenderText {TEXT} at (0,0) size 0x0
-              RenderImage {IMG} at (0,0) size 62x24
-              RenderText {TEXT} at (62,3) size 66x18
-                text run at (62,3) width 4: " "
-                text run at (66,3) width 62: "Itinerary"
+              RenderImage {IMG} at (0,0) size 24x24
+              RenderText {TEXT} at (24,3) size 66x18
+                text run at (24,3) width 4: " "
+                text run at (28,3) width 62: "Itinerary"
             RenderText {TEXT} at (0,0) size 0x0
             RenderInline {SPAN} at (0,0) size 0x0
               RenderInline {SPAN} at (0,0) size 0x0
                 RenderText {TEXT} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,329) size 784x60
-        RenderTable {TABLE} at (0,0) size 581x60
+        RenderTable {TABLE} at (0,0) size 458x60
           RenderTableSection {TBODY} at (0,0) size 0x60
             RenderTableRow {TR} at (0,0) size 0x0
               RenderTableCell {TD} at (2,29) size 2x2 [r=0 c=0 rs=1 cs=1]
               RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
-              RenderTableCell {TD} at (10,17) size 149x26 [r=0 c=2 rs=1 cs=1]
-                RenderImage {IMG} at (1,1) size 147x24
+              RenderTableCell {TD} at (10,17) size 26x26 [r=0 c=2 rs=1 cs=1]
+                RenderImage {IMG} at (1,1) size 24x24
                 RenderText {TEXT} at (0,0) size 0x0
-              RenderTableCell {TD} at (161,2) size 418x56 [r=0 c=3 rs=1 cs=1]
+              RenderTableCell {TD} at (38,2) size 418x56 [r=0 c=3 rs=1 cs=1]
                 RenderText {TEXT} at (1,1) size 147x18
                   text run at (1,1) width 147: "TUR - Tour Package"
                 RenderBR {BR} at (0,0) size 0x0
@@ -120,15 +120,15 @@ layer at (0,0) size 800x1138
             RenderInline {SPAN} at (0,0) size 0x0
               RenderInline {SPAN} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,403) size 784x196
-        RenderTable {TABLE} at (0,0) size 710x196
+        RenderTable {TABLE} at (0,0) size 646x196
           RenderTableSection {TBODY} at (0,0) size 0x196
             RenderTableRow {TR} at (0,0) size 0x0
               RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
               RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
-              RenderTableCell {TD} at (10,85) size 90x26 [r=0 c=2 rs=1 cs=1]
-                RenderImage {IMG} at (1,1) size 88x24
+              RenderTableCell {TD} at (10,85) size 26x26 [r=0 c=2 rs=1 cs=1]
+                RenderImage {IMG} at (1,1) size 24x24
                 RenderText {TEXT} at (0,0) size 0x0
-              RenderTableCell {TD} at (102,2) size 606x192 [r=0 c=3 rs=1 cs=1]
+              RenderTableCell {TD} at (38,2) size 606x192 [r=0 c=3 rs=1 cs=1]
                 RenderBlock (anonymous) at (1,1) size 604x126
                   RenderText {TEXT} at (0,0) size 24x18
                     text run at (0,0) width 24: "Air "
@@ -213,15 +213,15 @@ layer at (0,0) size 800x1138
             RenderInline {SPAN} at (0,0) size 0x0
               RenderInline {SPAN} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,613) size 784x196
-        RenderTable {TABLE} at (0,0) size 599x196
+        RenderTable {TABLE} at (0,0) size 535x196
           RenderTableSection {TBODY} at (0,0) size 0x196
             RenderTableRow {TR} at (0,0) size 0x0
               RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
               RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
-              RenderTableCell {TD} at (10,85) size 90x26 [r=0 c=2 rs=1 cs=1]
-                RenderImage {IMG} at (1,1) size 88x24
+              RenderTableCell {TD} at (10,85) size 26x26 [r=0 c=2 rs=1 cs=1]
+                RenderImage {IMG} at (1,1) size 24x24
                 RenderText {TEXT} at (0,0) size 0x0
-              RenderTableCell {TD} at (102,2) size 495x192 [r=0 c=3 rs=1 cs=1]
+              RenderTableCell {TD} at (38,2) size 495x192 [r=0 c=3 rs=1 cs=1]
                 RenderBlock (anonymous) at (1,1) size 493x126
                   RenderText {TEXT} at (0,0) size 24x18
                     text run at (0,0) width 24: "Air "
@@ -306,15 +306,15 @@ layer at (0,0) size 800x1138
             RenderInline {SPAN} at (0,0) size 0x0
               RenderInline {SPAN} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,823) size 784x114
-        RenderTable {TABLE} at (0,0) size 614x114
+        RenderTable {TABLE} at (0,0) size 550x114
           RenderTableSection {TBODY} at (0,0) size 0x114
             RenderTableRow {TR} at (0,0) size 0x0
               RenderTableCell {TD} at (2,56) size 2x2 [r=0 c=0 rs=1 cs=1]
               RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
-              RenderTableCell {TD} at (10,44) size 90x26 [r=0 c=2 rs=1 cs=1]
-                RenderImage {IMG} at (1,1) size 88x24
+              RenderTableCell {TD} at (10,44) size 26x26 [r=0 c=2 rs=1 cs=1]
+                RenderImage {IMG} at (1,1) size 24x24
                 RenderText {TEXT} at (0,0) size 0x0
-              RenderTableCell {TD} at (102,2) size 510x110 [r=0 c=3 rs=1 cs=1]
+              RenderTableCell {TD} at (38,2) size 510x110 [r=0 c=3 rs=1 cs=1]
                 RenderText {TEXT} at (1,1) size 24x18
                   text run at (1,1) width 24: "Air "
                 RenderBR {BR} at (0,0) size 0x0
@@ -377,16 +377,16 @@ layer at (0,0) size 800x1138
       RenderBlock (anonymous) at (0,1011) size 784x2
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
       RenderBlock (anonymous) at (0,1019) size 784x24
-        RenderInline {SPAN} at (0,0) size 182x15
-          RenderInline {SPAN} at (0,0) size 182x17
-            RenderImage {IMG} at (0,0) size 62x24
-            RenderText {TEXT} at (62,3) size 4x18
-              text run at (62,3) width 4: " "
+        RenderInline {SPAN} at (0,0) size 144x15
+          RenderInline {SPAN} at (0,0) size 144x17
+            RenderImage {IMG} at (0,0) size 24x24
+            RenderText {TEXT} at (24,3) size 4x18
+              text run at (24,3) width 4: " "
             RenderInline {B} at (0,0) size 112x17
-              RenderText {TEXT} at (66,3) size 112x18
-                text run at (66,3) width 112: "Web Bookings"
-            RenderText {TEXT} at (178,3) size 4x18
-              text run at (178,3) width 4: " "
+              RenderText {TEXT} at (28,3) size 112x18
+                text run at (28,3) width 112: "Web Bookings"
+            RenderText {TEXT} at (140,3) size 4x18
+              text run at (140,3) width 4: " "
             RenderInline {SPAN} at (0,0) size 0x0
               RenderBR {BR} at (0,0) size 0x0
               RenderInline {SPAN} at (0,0) size 0x0

diff --git a/LayoutTests/fast/encoding/utf-16-little-endian-expected.txt b/LayoutTests/fast/encoding/utf-16-little-endian-expected.txt
index 8b29c916dcbdfc72c807eacff84f8472cb0b589b..adfb6ae90f1e30f5eb8d83f54df396d9bfedb5fe 100644 (file)
--- a/LayoutTests/fast/encoding/utf-16-little-endian-expected.txt
+++ b/LayoutTests/fast/encoding/utf-16-little-endian-expected.txt
@@ -22,14 +22,14 @@ layer at (0,0) size 800x1138
       RenderBlock (anonymous) at (0,26) size 784x2
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
       RenderBlock (anonymous) at (0,34) size 784x51
-        RenderInline {SPAN} at (0,0) size 110x46
-          RenderInline {SPAN} at (0,0) size 110x46
-            RenderInline {SPAN} at (0,0) size 110x17
+        RenderInline {SPAN} at (0,0) size 108x46
+          RenderInline {SPAN} at (0,0) size 108x46
+            RenderInline {SPAN} at (0,0) size 81x17
               RenderText {TEXT} at (0,0) size 0x0
-              RenderImage {IMG} at (0,0) size 53x24
-              RenderText {TEXT} at (53,3) size 57x18
-                text run at (53,3) width 4: " "
-                text run at (57,3) width 53: "Names"
+              RenderImage {IMG} at (0,0) size 24x24
+              RenderText {TEXT} at (24,3) size 57x18
+                text run at (24,3) width 4: " "
+                text run at (28,3) width 53: "Names"
               RenderBR {BR} at (0,0) size 0x0
               RenderText {TEXT} at (0,0) size 0x0
             RenderText {TEXT} at (0,0) size 0x0
@@ -42,12 +42,12 @@ layer at (0,0) size 800x1138
       RenderBlock (anonymous) at (0,99) size 784x78
         RenderInline {SPAN} at (0,0) size 596x74
           RenderInline {SPAN} at (0,0) size 596x74
-            RenderImage {IMG} at (0,0) size 62x24
-            RenderText {TEXT} at (62,4) size 4x15
-              text run at (62,4) width 4: " "
+            RenderImage {IMG} at (0,0) size 24x24
+            RenderText {TEXT} at (24,4) size 4x15
+              text run at (24,4) width 4: " "
             RenderInline {SPAN} at (0,0) size 83x17
-              RenderText {TEXT} at (66,2) size 83x18
-                text run at (66,2) width 83: "Addresses"
+              RenderText {TEXT} at (28,2) size 83x18
+                text run at (28,2) width 83: "Addresses"
               RenderBR {BR} at (0,0) size 0x0
               RenderText {TEXT} at (0,0) size 0x0
             RenderText {TEXT} at (0,0) size 0x0
@@ -56,14 +56,14 @@ layer at (0,0) size 800x1138
       RenderBlock (anonymous) at (0,183) size 784x2
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
       RenderBlock (anonymous) at (0,191) size 784x48
-        RenderInline {SPAN} at (0,0) size 126x43
-          RenderInline {SPAN} at (0,0) size 126x43
-            RenderInline {SPAN} at (0,0) size 126x17
+        RenderInline {SPAN} at (0,0) size 91x43
+          RenderInline {SPAN} at (0,0) size 91x43
+            RenderInline {SPAN} at (0,0) size 91x17
               RenderText {TEXT} at (0,0) size 0x0
-              RenderImage {IMG} at (0,0) size 59x24
-              RenderText {TEXT} at (59,3) size 67x18
-                text run at (59,3) width 4: " "
-                text run at (63,3) width 63: "Phones "
+              RenderImage {IMG} at (0,0) size 24x24
+              RenderText {TEXT} at (24,3) size 67x18
+                text run at (24,3) width 4: " "
+                text run at (28,3) width 63: "Phones "
               RenderBR {BR} at (0,0) size 0x0
               RenderText {TEXT} at (0,0) size 0x0
             RenderText {TEXT} at (0,0) size 0x0
@@ -76,28 +76,28 @@ layer at (0,0) size 800x1138
       RenderBlock (anonymous) at (0,297) size 784x2
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
       RenderBlock (anonymous) at (0,305) size 784x24
-        RenderInline {SPAN} at (0,0) size 128x15
-          RenderInline {SPAN} at (0,0) size 128x15
-            RenderInline {SPAN} at (0,0) size 128x17
+        RenderInline {SPAN} at (0,0) size 90x15
+          RenderInline {SPAN} at (0,0) size 90x15
+            RenderInline {SPAN} at (0,0) size 90x17
               RenderText {TEXT} at (0,0) size 0x0
-              RenderImage {IMG} at (0,0) size 62x24
-              RenderText {TEXT} at (62,3) size 66x18
-                text run at (62,3) width 4: " "
-                text run at (66,3) width 62: "Itinerary"
+              RenderImage {IMG} at (0,0) size 24x24
+              RenderText {TEXT} at (24,3) size 66x18
+                text run at (24,3) width 4: " "
+                text run at (28,3) width 62: "Itinerary"
             RenderText {TEXT} at (0,0) size 0x0
             RenderInline {SPAN} at (0,0) size 0x0
               RenderInline {SPAN} at (0,0) size 0x0
                 RenderText {TEXT} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,329) size 784x60
-        RenderTable {TABLE} at (0,0) size 581x60
+        RenderTable {TABLE} at (0,0) size 458x60
           RenderTableSection {TBODY} at (0,0) size 0x60
             RenderTableRow {TR} at (0,0) size 0x0
               RenderTableCell {TD} at (2,29) size 2x2 [r=0 c=0 rs=1 cs=1]
               RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
-              RenderTableCell {TD} at (10,17) size 149x26 [r=0 c=2 rs=1 cs=1]
-                RenderImage {IMG} at (1,1) size 147x24
+              RenderTableCell {TD} at (10,17) size 26x26 [r=0 c=2 rs=1 cs=1]
+                RenderImage {IMG} at (1,1) size 24x24
                 RenderText {TEXT} at (0,0) size 0x0
-              RenderTableCell {TD} at (161,2) size 418x56 [r=0 c=3 rs=1 cs=1]
+              RenderTableCell {TD} at (38,2) size 418x56 [r=0 c=3 rs=1 cs=1]
                 RenderText {TEXT} at (1,1) size 147x18
                   text run at (1,1) width 147: "TUR - Tour Package"
                 RenderBR {BR} at (0,0) size 0x0
@@ -120,15 +120,15 @@ layer at (0,0) size 800x1138
             RenderInline {SPAN} at (0,0) size 0x0
               RenderInline {SPAN} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,403) size 784x196
-        RenderTable {TABLE} at (0,0) size 710x196
+        RenderTable {TABLE} at (0,0) size 646x196
           RenderTableSection {TBODY} at (0,0) size 0x196
             RenderTableRow {TR} at (0,0) size 0x0
               RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
               RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
-              RenderTableCell {TD} at (10,85) size 90x26 [r=0 c=2 rs=1 cs=1]
-                RenderImage {IMG} at (1,1) size 88x24
+              RenderTableCell {TD} at (10,85) size 26x26 [r=0 c=2 rs=1 cs=1]
+                RenderImage {IMG} at (1,1) size 24x24
                 RenderText {TEXT} at (0,0) size 0x0
-              RenderTableCell {TD} at (102,2) size 606x192 [r=0 c=3 rs=1 cs=1]
+              RenderTableCell {TD} at (38,2) size 606x192 [r=0 c=3 rs=1 cs=1]
                 RenderBlock (anonymous) at (1,1) size 604x126
                   RenderText {TEXT} at (0,0) size 24x18
                     text run at (0,0) width 24: "Air "
@@ -213,15 +213,15 @@ layer at (0,0) size 800x1138
             RenderInline {SPAN} at (0,0) size 0x0
               RenderInline {SPAN} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,613) size 784x196
-        RenderTable {TABLE} at (0,0) size 599x196
+        RenderTable {TABLE} at (0,0) size 535x196
           RenderTableSection {TBODY} at (0,0) size 0x196
             RenderTableRow {TR} at (0,0) size 0x0
               RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
               RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
-              RenderTableCell {TD} at (10,85) size 90x26 [r=0 c=2 rs=1 cs=1]
-                RenderImage {IMG} at (1,1) size 88x24
+              RenderTableCell {TD} at (10,85) size 26x26 [r=0 c=2 rs=1 cs=1]
+                RenderImage {IMG} at (1,1) size 24x24
                 RenderText {TEXT} at (0,0) size 0x0
-              RenderTableCell {TD} at (102,2) size 495x192 [r=0 c=3 rs=1 cs=1]
+              RenderTableCell {TD} at (38,2) size 495x192 [r=0 c=3 rs=1 cs=1]
                 RenderBlock (anonymous) at (1,1) size 493x126
                   RenderText {TEXT} at (0,0) size 24x18
                     text run at (0,0) width 24: "Air "
@@ -306,15 +306,15 @@ layer at (0,0) size 800x1138
             RenderInline {SPAN} at (0,0) size 0x0
               RenderInline {SPAN} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,823) size 784x114
-        RenderTable {TABLE} at (0,0) size 614x114
+        RenderTable {TABLE} at (0,0) size 550x114
           RenderTableSection {TBODY} at (0,0) size 0x114
             RenderTableRow {TR} at (0,0) size 0x0
               RenderTableCell {TD} at (2,56) size 2x2 [r=0 c=0 rs=1 cs=1]
               RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
-              RenderTableCell {TD} at (10,44) size 90x26 [r=0 c=2 rs=1 cs=1]
-                RenderImage {IMG} at (1,1) size 88x24
+              RenderTableCell {TD} at (10,44) size 26x26 [r=0 c=2 rs=1 cs=1]
+                RenderImage {IMG} at (1,1) size 24x24
                 RenderText {TEXT} at (0,0) size 0x0
-              RenderTableCell {TD} at (102,2) size 510x110 [r=0 c=3 rs=1 cs=1]
+              RenderTableCell {TD} at (38,2) size 510x110 [r=0 c=3 rs=1 cs=1]
                 RenderText {TEXT} at (1,1) size 24x18
                   text run at (1,1) width 24: "Air "
                 RenderBR {BR} at (0,0) size 0x0
@@ -377,16 +377,16 @@ layer at (0,0) size 800x1138
       RenderBlock (anonymous) at (0,1011) size 784x2
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
       RenderBlock (anonymous) at (0,1019) size 784x24
-        RenderInline {SPAN} at (0,0) size 182x15
-          RenderInline {SPAN} at (0,0) size 182x17
-            RenderImage {IMG} at (0,0) size 62x24
-            RenderText {TEXT} at (62,3) size 4x18
-              text run at (62,3) width 4: " "
+        RenderInline {SPAN} at (0,0) size 144x15
+          RenderInline {SPAN} at (0,0) size 144x17
+            RenderImage {IMG} at (0,0) size 24x24
+            RenderText {TEXT} at (24,3) size 4x18
+              text run at (24,3) width 4: " "
             RenderInline {B} at (0,0) size 112x17
-              RenderText {TEXT} at (66,3) size 112x18
-                text run at (66,3) width 112: "Web Bookings"
-            RenderText {TEXT} at (178,3) size 4x18
-              text run at (178,3) width 4: " "
+              RenderText {TEXT} at (28,3) size 112x18
+                text run at (28,3) width 112: "Web Bookings"
+            RenderText {TEXT} at (140,3) size 4x18
+              text run at (140,3) width 4: " "
             RenderInline {SPAN} at (0,0) size 0x0
               RenderBR {BR} at (0,0) size 0x0
               RenderInline {SPAN} at (0,0) size 0x0

diff --git a/LayoutTests/fast/table/014-expected.txt b/LayoutTests/fast/table/014-expected.txt
index 86633718a3bc29aee6b3b539bbc26341d974f2be..c9c5617427b9df3a19835c02e42ea60f80a20b2e 100644 (file)
--- a/LayoutTests/fast/table/014-expected.txt
+++ b/LayoutTests/fast/table/014-expected.txt
@@ -7,14 +7,13 @@ layer at (0,0) size 800x600
         RenderImage {IMG} at (0,0) size 132x86
         RenderText {TEXT} at (0,0) size 0x0
       RenderBlock {H2} at (0,105) size 784x0
-      RenderBlock (anonymous) at (0,105) size 784x0
-        RenderTable {TABLE} at (0,0) size 132x36
-          RenderTableSection {TBODY} at (0,0) size 0x36
-            RenderTableRow {TR} at (0,0) size 0x0
-              RenderTableCell {TD} at (0,0) size 132x18 [r=0 c=0 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 31x18
-                  text run at (0,0) width 31: "hello"
-            RenderTableRow {TR} at (0,0) size 0x0
-              RenderTableCell {TD} at (0,18) size 132x18 [r=1 c=0 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 55x18
-                  text run at (0,0) width 55: "goodbye"
+      RenderTable {TABLE} at (0,105) size 132x36
+        RenderTableSection {TBODY} at (0,0) size 0x36
+          RenderTableRow {TR} at (0,0) size 0x0
+            RenderTableCell {TD} at (0,0) size 132x18 [r=0 c=0 rs=1 cs=1]
+              RenderText {TEXT} at (0,0) size 31x18
+                text run at (0,0) width 31: "hello"
+          RenderTableRow {TR} at (0,0) size 0x0
+            RenderTableCell {TD} at (0,18) size 132x18 [r=1 c=0 rs=1 cs=1]
+              RenderText {TEXT} at (0,0) size 55x18
+                text run at (0,0) width 55: "goodbye"

diff --git a/LayoutTests/fast/text/basic/004-expected.txt b/LayoutTests/fast/text/basic/004-expected.txt
index 1469675a9b690371a41e9bf3ea497d1f88b21dc9..f27fcbc669fcf1d0b5e6e290fd1d112723335ce5 100644 (file)
--- a/LayoutTests/fast/text/basic/004-expected.txt
+++ b/LayoutTests/fast/text/basic/004-expected.txt
@@ -3,11 +3,10 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock (anonymous) at (0,0) size 784x0
-        RenderBlock (floating) {P} at (0,16) size 649x22 [border: (2px solid #008000)]
-          RenderText {TEXT} at (2,2) size 645x18
-            text run at (2,2) width 212: "There should be 30"
-            text run at (214,2) width 433: "px of word spacing between each word."
+      RenderBlock (floating) {P} at (0,16) size 649x22 [border: (2px solid #008000)]
+        RenderText {TEXT} at (2,2) size 645x18
+          text run at (2,2) width 212: "There should be 30"
+          text run at (214,2) width 433: "px of word spacing between each word."
       RenderBlock {DIV} at (0,0) size 784x100
       RenderTable {TABLE} at (0,100) size 100x130
         RenderTableSection {TBODY} at (0,0) size 0x130

diff --git a/LayoutTests/traversal/tree-walker-001-expected.txt b/LayoutTests/traversal/tree-walker-001-expected.txt
index b749bbeebcc726851707eb13eae69fd738008808..aa489222567364bf749415cd1a13f5af3d339b93 100644 (file)
--- a/LayoutTests/traversal/tree-walker-001-expected.txt
+++ b/LayoutTests/traversal/tree-walker-001-expected.txt
@@ -51,8 +51,8 @@ layer at (0,0) size 800x600
         RenderText {TEXT} at (0,0) size 0x0
         RenderInline {SPAN} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,0) size 784x272
-        RenderBlock {P} at (0,0) size 784x272
+      RenderBlock {DIV} at (0,0) size 784x288
+        RenderBlock {P} at (0,0) size 784x288
           RenderInline {B} at (0,0) size 104x16
             RenderText {TEXT} at (0,0) size 104x16
               text run at (0,0) width 104: "Tree Walker: "

diff --git a/LayoutTests/traversal/tree-walker-002-expected.txt b/LayoutTests/traversal/tree-walker-002-expected.txt
index 5b985bd0a342f041c5783cd027d67599b96d4d78..6a4fcadf91f6d70719898425dcb567eb331758c1 100644 (file)
--- a/LayoutTests/traversal/tree-walker-002-expected.txt
+++ b/LayoutTests/traversal/tree-walker-002-expected.txt
@@ -51,8 +51,8 @@ layer at (0,0) size 800x600
         RenderText {TEXT} at (0,0) size 0x0
         RenderInline {SPAN} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,0) size 784x208
-        RenderBlock {P} at (0,0) size 784x208
+      RenderBlock {DIV} at (0,0) size 784x224
+        RenderBlock {P} at (0,0) size 784x224
           RenderInline {B} at (0,0) size 104x16
             RenderText {TEXT} at (0,0) size 104x16
               text run at (0,0) width 104: "Tree Walker: "

diff --git a/LayoutTests/traversal/tree-walker-003-expected.txt b/LayoutTests/traversal/tree-walker-003-expected.txt
index e4addb1a2f1a3d37ba6490f211769ee244034177..f84af544a2cbafe3403a6497dfaf41215f9bd148 100644 (file)
--- a/LayoutTests/traversal/tree-walker-003-expected.txt
+++ b/LayoutTests/traversal/tree-walker-003-expected.txt
@@ -60,7 +60,7 @@ layer at (0,0) size 800x600
         RenderText {TEXT} at (0,0) size 0x0
         RenderInline {SPAN} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,0) size 784x430
+      RenderBlock {DIV} at (0,0) size 784x446
         RenderBlock {P} at (0,0) size 784x208
           RenderInline {B} at (0,0) size 104x16
             RenderText {TEXT} at (0,0) size 104x16
@@ -102,7 +102,7 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (0,192) size 8x16
             text run at (0,192) width 8: "D"
           RenderBR {BR} at (0,0) size 0x0
-        RenderBlock {P} at (0,222) size 784x208
+        RenderBlock {P} at (0,222) size 784x224
           RenderInline {B} at (0,0) size 104x16
             RenderText {TEXT} at (0,0) size 104x16
               text run at (0,0) width 104: "Tree Walker: "

diff --git a/LayoutTests/traversal/tree-walker-004-expected.txt b/LayoutTests/traversal/tree-walker-004-expected.txt
index 46dec47ffccf26271fb5fcdae747a37f5013196e..2dd7ee8bf50d81f4ab47177ee135a61ce540cee5 100644 (file)
--- a/LayoutTests/traversal/tree-walker-004-expected.txt
+++ b/LayoutTests/traversal/tree-walker-004-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x676
+layer at (0,0) size 800x692
   RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x676
-  RenderBlock {HTML} at (0,0) size 800x676
-    RenderBody {BODY} at (8,8) size 784x654
+layer at (0,0) size 800x692
+  RenderBlock {HTML} at (0,0) size 800x692
+    RenderBody {BODY} at (8,8) size 784x670
       RenderBlock {DIV} at (0,0) size 784x0
         RenderInline {SPAN} at (0,0) size 0x0
           RenderText {TEXT} at (0,0) size 0x0
@@ -60,7 +60,7 @@ layer at (0,0) size 800x676
         RenderText {TEXT} at (0,0) size 0x0
         RenderInline {SPAN} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,0) size 784x654
+      RenderBlock {DIV} at (0,0) size 784x670
         RenderBlock {P} at (0,0) size 784x320
           RenderInline {B} at (0,0) size 104x16
             RenderText {TEXT} at (0,0) size 104x16
@@ -123,7 +123,7 @@ layer at (0,0) size 800x676
           RenderText {TEXT} at (0,304) size 8x16
             text run at (0,304) width 8: "D"
           RenderBR {BR} at (0,0) size 0x0
-        RenderBlock {P} at (0,334) size 784x320
+        RenderBlock {P} at (0,334) size 784x336
           RenderInline {B} at (0,0) size 104x16
             RenderText {TEXT} at (0,0) size 104x16
               text run at (0,0) width 104: "Tree Walker: "