[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:31:24 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 851957b460566c8600368ebb4b3bb43c43c08911
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 30 22:09:25 2004 +0000
Fix for 3603326, spurious line breaks in encyclopedia articles. Make sure makeChildrenNonInline knows to
skip over floating/positioned elements so that they remain part of contiguous inline runs for static positioning
purposes.
Reviewed by darin
* khtml/rendering/render_block.cpp:
(khtml::getInlineRun):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6278 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/css1/box_properties/clear-expected.txt b/LayoutTests/css1/box_properties/clear-expected.txt
index 8b63f44..7995808 100644
--- a/LayoutTests/css1/box_properties/clear-expected.txt
+++ b/LayoutTests/css1/box_properties/clear-expected.txt
@@ -59,8 +59,8 @@ layer at (0,0) size 800x961
RenderText {TEXT} at (4,4) size 4x18
text run at (4,4) width 4: " "
RenderTableCell {TD} at (12,26) size 666x400 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
- RenderImage {IMG} at (4,4) size 15x50
RenderBlock (anonymous) at (4,4) size 658x0
+ RenderImage {IMG} at (0,0) size 15x50
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (4,4) size 658x18
RenderText {TEXT} at (18,0) size 595x18
diff --git a/LayoutTests/css1/box_properties/clear_float-expected.txt b/LayoutTests/css1/box_properties/clear_float-expected.txt
index 607cf78..9456290 100644
--- a/LayoutTests/css1/box_properties/clear_float-expected.txt
+++ b/LayoutTests/css1/box_properties/clear_float-expected.txt
@@ -103,55 +103,54 @@ layer at (0,0) size 800x773
RenderText {TEXT} at (4,4) size 4x18
text run at (4,4) width 4: " "
RenderTableCell {TD} at (12,26) size 578x319 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
- RenderBlock (floating) {DIV} at (4,4) size 192x116 [color=#FFFFFF] [bgcolor=#008000]
- RenderBlock {H1} at (8,8) size 176x22
- RenderText {TEXT} at (0,0) size 85x22
- text run at (0,0) width 85: "Top menu"
- RenderBlock {UL} at (24,33) size 156x72
- RenderListItem {LI} at (0,0) size 156x18
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 35x18
- text run at (0,0) width 35: "green"
- RenderListItem {LI} at (0,18) size 156x18
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 62x18
- text run at (0,0) width 62: "white text"
- RenderListItem {LI} at (0,36) size 156x18
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 94x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 74: "em padding"
- RenderListItem {LI} at (0,54) size 156x18
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 87x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 67: "em margin"
RenderBlock (anonymous) at (4,4) size 570x0
+ RenderBlock (floating) {DIV} at (0,0) size 192x116 [color=#FFFFFF] [bgcolor=#008000]
+ RenderBlock {H1} at (8,8) size 176x22
+ RenderText {TEXT} at (0,0) size 85x22
+ text run at (0,0) width 85: "Top menu"
+ RenderBlock {UL} at (24,33) size 156x72
+ RenderListItem {LI} at (0,0) size 156x18
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 35x18
+ text run at (0,0) width 35: "green"
+ RenderListItem {LI} at (0,18) size 156x18
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 62x18
+ text run at (0,0) width 62: "white text"
+ RenderListItem {LI} at (0,36) size 156x18
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 94x18
+ text run at (0,0) width 20: "0.5"
+ text run at (20,0) width 74: "em padding"
+ RenderListItem {LI} at (0,54) size 156x18
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 87x18
+ text run at (0,0) width 20: "0.5"
+ text run at (20,0) width 67: "em margin"
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (floating) {DIV} at (4,130) size 192x116 [color=#FFFFFF] [bgcolor=#0000FF]
- RenderBlock {H1} at (8,8) size 176x22
- RenderText {TEXT} at (0,0) size 112x22
- text run at (0,0) width 112: "Bottom menu"
- RenderBlock {UL} at (24,33) size 156x72
- RenderListItem {LI} at (0,0) size 156x18
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 106x18
- text run at (0,0) width 106: "blue background"
- RenderListItem {LI} at (0,18) size 156x18
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 62x18
- text run at (0,0) width 62: "white text"
- RenderListItem {LI} at (0,36) size 156x18
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 94x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 74: "em padding"
- RenderListItem {LI} at (0,54) size 156x18
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 87x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 67: "em margin"
- RenderBlock (anonymous) at (4,4) size 570x0
+ RenderBlock (floating) {DIV} at (0,126) size 192x116 [color=#FFFFFF] [bgcolor=#0000FF]
+ RenderBlock {H1} at (8,8) size 176x22
+ RenderText {TEXT} at (0,0) size 112x22
+ text run at (0,0) width 112: "Bottom menu"
+ RenderBlock {UL} at (24,33) size 156x72
+ RenderListItem {LI} at (0,0) size 156x18
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 106x18
+ text run at (0,0) width 106: "blue background"
+ RenderListItem {LI} at (0,18) size 156x18
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 62x18
+ text run at (0,0) width 62: "white text"
+ RenderListItem {LI} at (0,36) size 156x18
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 94x18
+ text run at (0,0) width 20: "0.5"
+ text run at (20,0) width 74: "em padding"
+ RenderListItem {LI} at (0,54) size 156x18
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 87x18
+ text run at (0,0) width 20: "0.5"
+ text run at (20,0) width 67: "em margin"
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (228,4) size 314x311 [bgcolor=#FFFF00]
RenderBlock {H1} at (8,29) size 298x37
diff --git a/LayoutTests/css1/box_properties/float-expected.txt b/LayoutTests/css1/box_properties/float-expected.txt
index a1b1f8a..9d22b11 100644
--- a/LayoutTests/css1/box_properties/float-expected.txt
+++ b/LayoutTests/css1/box_properties/float-expected.txt
@@ -38,8 +38,8 @@ layer at (0,0) size 800x448
RenderText {TEXT} at (4,4) size 4x18
text run at (4,4) width 4: " "
RenderTableCell {TD} at (12,26) size 770x146 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
- RenderImage {IMG} at (4,4) size 15x50
RenderBlock (anonymous) at (4,4) size 762x0
+ RenderImage {IMG} at (0,0) size 15x50
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (4,4) size 762x36
RenderText {TEXT} at (15,0) size 722x36
diff --git a/LayoutTests/css1/box_properties/float_on_text_elements-expected.txt b/LayoutTests/css1/box_properties/float_on_text_elements-expected.txt
index 4d581fe..4adb590 100644
--- a/LayoutTests/css1/box_properties/float_on_text_elements-expected.txt
+++ b/LayoutTests/css1/box_properties/float_on_text_elements-expected.txt
@@ -3,11 +3,11 @@ layer at (0,0) size 800x2678
layer at (0,0) size 800x2678
RenderBlock {HTML} at (0,0) size 800x2678
RenderBody {BODY} at (8,8) size 784x2662 [bgcolor=#CCCCCC]
- RenderBlock (floating) {P} at (0,0) size 392x36 [bgcolor=#FFFF00]
- RenderText {TEXT} at (0,0) size 392x36
- text run at (0,0) width 392: "This paragraph is of class \"one\". It has a width of 50% and is"
- text run at (0,18) width 110: "floated to the left."
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {P} at (0,0) size 392x36 [bgcolor=#FFFF00]
+ RenderText {TEXT} at (0,0) size 392x36
+ text run at (0,0) width 392: "This paragraph is of class \"one\". It has a width of 50% and is"
+ text run at (0,18) width 110: "floated to the left."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (0,0) size 784x72
RenderText {TEXT} at (392,0) size 784x72
@@ -108,25 +108,25 @@ layer at (0,0) size 800x2678
RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (0,783) size 784x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,793) size 784x26 [bgcolor=#66CCFF] [border: (4px solid #FF0000)]
- RenderBlock (floating) {DIV} at (440,14) size 330x226 [bgcolor=#FFFF00]
- RenderBlock {P} at (5,5) size 320x216
- RenderText {TEXT} at (0,0) size 320x216
- text run at (0,0) width 320: "This paragraph is placed inside a DIV element"
- text run at (0,18) width 320: "which is floated to the right. The width of the DIV"
- text run at (0,36) width 88: "element is 20"
- text run at (88,36) width 232: "em. The background is yellow and"
- text run at (0,54) width 79: "there is a 5"
- text run at (79,54) width 118: "px padding, a 10"
- text run at (197,54) width 123: "px margin and no"
- text run at (0,72) width 320: "border. Since it is floated, the yellow box should"
- text run at (0,90) width 320: "be rendered on top of the background and borders"
- text run at (0,108) width 320: "of adjacent non-floated elements. To the left of this"
- text run at (0,126) width 320: "yellow box there should be a short paragraph with"
- text run at (0,144) width 320: "a blue background and a red border. The yellow"
- text run at (0,162) width 320: "box should be rendered on top of the bottom red"
- text run at (0,180) width 320: "border. I.e., the bottom red border will appear"
- text run at (0,198) width 318: "broken where it's overlaid by the yellow rectangle."
RenderBlock (anonymous) at (4,4) size 776x0
+ RenderBlock (floating) {DIV} at (436,10) size 330x226 [bgcolor=#FFFF00]
+ RenderBlock {P} at (5,5) size 320x216
+ RenderText {TEXT} at (0,0) size 320x216
+ text run at (0,0) width 320: "This paragraph is placed inside a DIV element"
+ text run at (0,18) width 320: "which is floated to the right. The width of the DIV"
+ text run at (0,36) width 88: "element is 20"
+ text run at (88,36) width 232: "em. The background is yellow and"
+ text run at (0,54) width 79: "there is a 5"
+ text run at (79,54) width 118: "px padding, a 10"
+ text run at (197,54) width 123: "px margin and no"
+ text run at (0,72) width 320: "border. Since it is floated, the yellow box should"
+ text run at (0,90) width 320: "be rendered on top of the background and borders"
+ text run at (0,108) width 320: "of adjacent non-floated elements. To the left of this"
+ text run at (0,126) width 320: "yellow box there should be a short paragraph with"
+ text run at (0,144) width 320: "a blue background and a red border. The yellow"
+ text run at (0,162) width 320: "box should be rendered on top of the bottom red"
+ text run at (0,180) width 320: "border. I.e., the bottom red border will appear"
+ text run at (0,198) width 318: "broken where it's overlaid by the yellow rectangle."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (4,4) size 776x18
RenderText {TEXT} at (0,0) size 268x18
@@ -156,12 +156,12 @@ layer at (0,0) size 800x2678
RenderBR {BR} at (196,0) size 0x18
RenderBlock {HR} at (0,1141) size 784x2 [border: (1px inset #000000)]
RenderBlock (floating) {DIV} at (0,1151) size 588x126 [bgcolor=#66CCFF]
- RenderBlock (floating) {DIV} at (431,0) size 147x36 [bgcolor=#FFFF00]
- RenderBlock {P} at (0,0) size 147x36
- RenderText {TEXT} at (0,0) size 147x36
- text run at (0,0) width 147: "See description in the"
- text run at (0,18) width 124: "box on the left side."
RenderBlock (anonymous) at (0,0) size 588x0
+ RenderBlock (floating) {DIV} at (431,0) size 147x36 [bgcolor=#FFFF00]
+ RenderBlock {P} at (0,0) size 147x36
+ RenderText {TEXT} at (0,0) size 147x36
+ text run at (0,0) width 147: "See description in the"
+ text run at (0,18) width 124: "box on the left side."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (0,0) size 588x126
RenderText {TEXT} at (0,0) size 588x126
@@ -194,11 +194,11 @@ layer at (0,0) size 800x2678
RenderText {TEXT} at (4,4) size 4x18
text run at (4,4) width 4: " "
RenderTableCell {TD} at (12,26) size 770x1339 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
- RenderBlock (floating) {P} at (4,4) size 381x36 [bgcolor=#FFFF00]
- RenderText {TEXT} at (0,0) size 381x36
- text run at (0,0) width 381: "This paragraph is of class \"one\". It has a width of 50% and"
- text run at (0,18) width 124: "is floated to the left."
RenderBlock (anonymous) at (4,4) size 762x0
+ RenderBlock (floating) {P} at (0,0) size 381x36 [bgcolor=#FFFF00]
+ RenderText {TEXT} at (0,0) size 381x36
+ text run at (0,0) width 381: "This paragraph is of class \"one\". It has a width of 50% and"
+ text run at (0,18) width 124: "is floated to the left."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (4,4) size 762x90
RenderText {TEXT} at (381,0) size 762x90
@@ -301,25 +301,25 @@ layer at (0,0) size 800x2678
RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (4,823) size 762x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (4,833) size 762x26 [bgcolor=#66CCFF] [border: (4px solid #FF0000)]
- RenderBlock (floating) {DIV} at (418,14) size 330x226 [bgcolor=#FFFF00]
- RenderBlock {P} at (5,5) size 320x216
- RenderText {TEXT} at (0,0) size 320x216
- text run at (0,0) width 320: "This paragraph is placed inside a DIV element"
- text run at (0,18) width 320: "which is floated to the right. The width of the DIV"
- text run at (0,36) width 88: "element is 20"
- text run at (88,36) width 232: "em. The background is yellow and"
- text run at (0,54) width 79: "there is a 5"
- text run at (79,54) width 118: "px padding, a 10"
- text run at (197,54) width 123: "px margin and no"
- text run at (0,72) width 320: "border. Since it is floated, the yellow box should"
- text run at (0,90) width 320: "be rendered on top of the background and borders"
- text run at (0,108) width 320: "of adjacent non-floated elements. To the left of this"
- text run at (0,126) width 320: "yellow box there should be a short paragraph with"
- text run at (0,144) width 320: "a blue background and a red border. The yellow"
- text run at (0,162) width 320: "box should be rendered on top of the bottom red"
- text run at (0,180) width 320: "border. I.e., the bottom red border will appear"
- text run at (0,198) width 318: "broken where it's overlaid by the yellow rectangle."
RenderBlock (anonymous) at (4,4) size 754x0
+ RenderBlock (floating) {DIV} at (414,10) size 330x226 [bgcolor=#FFFF00]
+ RenderBlock {P} at (5,5) size 320x216
+ RenderText {TEXT} at (0,0) size 320x216
+ text run at (0,0) width 320: "This paragraph is placed inside a DIV element"
+ text run at (0,18) width 320: "which is floated to the right. The width of the DIV"
+ text run at (0,36) width 88: "element is 20"
+ text run at (88,36) width 232: "em. The background is yellow and"
+ text run at (0,54) width 79: "there is a 5"
+ text run at (79,54) width 118: "px padding, a 10"
+ text run at (197,54) width 123: "px margin and no"
+ text run at (0,72) width 320: "border. Since it is floated, the yellow box should"
+ text run at (0,90) width 320: "be rendered on top of the background and borders"
+ text run at (0,108) width 320: "of adjacent non-floated elements. To the left of this"
+ text run at (0,126) width 320: "yellow box there should be a short paragraph with"
+ text run at (0,144) width 320: "a blue background and a red border. The yellow"
+ text run at (0,162) width 320: "box should be rendered on top of the bottom red"
+ text run at (0,180) width 320: "border. I.e., the bottom red border will appear"
+ text run at (0,198) width 318: "broken where it's overlaid by the yellow rectangle."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (4,4) size 754x18
RenderText {TEXT} at (0,0) size 268x18
@@ -350,12 +350,12 @@ layer at (0,0) size 800x2678
RenderBR {BR} at (190,0) size 0x18
RenderBlock {HR} at (4,1181) size 762x2 [border: (1px inset #000000)]
RenderBlock (floating) {DIV} at (4,1191) size 571x126 [bgcolor=#66CCFF]
- RenderBlock (floating) {DIV} at (419,0) size 142x36 [bgcolor=#FFFF00]
- RenderBlock {P} at (0,0) size 142x36
- RenderText {TEXT} at (0,0) size 142x36
- text run at (0,0) width 142: "See description in the"
- text run at (0,18) width 124: "box on the left side."
RenderBlock (anonymous) at (0,0) size 571x0
+ RenderBlock (floating) {DIV} at (419,0) size 142x36 [bgcolor=#FFFF00]
+ RenderBlock {P} at (0,0) size 142x36
+ RenderText {TEXT} at (0,0) size 142x36
+ text run at (0,0) width 142: "See description in the"
+ text run at (0,18) width 124: "box on the left side."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (0,0) size 571x126
RenderText {TEXT} at (0,0) size 571x126
diff --git a/LayoutTests/fast/block/basic/020-expected.txt b/LayoutTests/fast/block/basic/020-expected.txt
new file mode 100644
index 0000000..3d6f405
--- /dev/null
+++ b/LayoutTests/fast/block/basic/020-expected.txt
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x76
+ RenderBlock {HTML} at (0,0) size 800x76
+ RenderBody {BODY} at (8,8) size 784x52
+ RenderBlock {DIV} at (0,0) size 784x52
+ RenderBlock (anonymous) at (0,0) size 784x18
+ RenderText {TEXT} at (0,0) size 12x18
+ text run at (0,0) width 12: "A"
+ RenderText {TEXT} at (12,0) size 11x18
+ text run at (12,0) width 11: "C"
+ RenderBlock {P} at (0,34) size 784x0
+ RenderBlock {DIV} at (0,34) size 784x18
+ RenderBlock (anonymous) at (0,0) size 784x18
+ RenderText {TEXT} at (100,0) size 16x18
+ text run at (100,0) width 16: "A "
+ RenderBlock (floating) {SPAN} at (0,0) size 100x100 [bgcolor=#008000]
+ RenderText {TEXT} at (116,0) size 11x18
+ text run at (116,0) width 11: "B"
+ RenderBlock {P} at (0,34) size 784x0
diff --git a/LayoutTests/fast/block/basic/020.html b/LayoutTests/fast/block/basic/020.html
new file mode 100644
index 0000000..0d7404b
--- /dev/null
+++ b/LayoutTests/fast/block/basic/020.html
@@ -0,0 +1,4 @@
+<div>A<span style="visibility:hidden; position: absolute;">B</span>C<p>
+
+
+<div>A <span style="float:left;width:100px;height:100px;background-color:green"></span> B<p></div>
diff --git a/LayoutTests/fast/block/float/003-expected.txt b/LayoutTests/fast/block/float/003-expected.txt
index e567013..434038c 100644
--- a/LayoutTests/fast/block/float/003-expected.txt
+++ b/LayoutTests/fast/block/float/003-expected.txt
@@ -3,8 +3,8 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x132
RenderBlock {HTML} at (0,0) size 800x132
RenderBody {BODY} at (8,8) size 784x108
- RenderBlock (floating) {DIV} at (664,0) size 120x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (664,0) size 120x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {OL} at (0,0) size 784x0
RenderBlock {P} at (0,0) size 784x108
diff --git a/LayoutTests/fast/block/float/012-expected.txt b/LayoutTests/fast/block/float/012-expected.txt
index 66bee0c..e6ea888 100644
--- a/LayoutTests/fast/block/float/012-expected.txt
+++ b/LayoutTests/fast/block/float/012-expected.txt
@@ -3,11 +3,11 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x8
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0
- RenderBlock (floating) {DIV} at (0,0) size 314x22 [border: (2px solid #FF0000)]
- RenderInline {SPAN} at (0,0) size 310x18 [border: (50px solid #0000FF) none (50px solid #0000FF)]
- RenderText {TEXT} at (102,2) size 110x18
- text run at (102,2) width 110: "This is some text."
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 314x22 [border: (2px solid #FF0000)]
+ RenderInline {SPAN} at (0,0) size 310x18 [border: (50px solid #0000FF) none (50px solid #0000FF)]
+ RenderText {TEXT} at (102,2) size 110x18
+ text run at (102,2) width 110: "This is some text."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (0,0) size 784x0
RenderBlock (floating) {DIV} at (696,0) size 88x40 [border: (2px solid #FF0000)]
diff --git a/LayoutTests/fast/block/float/015-expected.txt b/LayoutTests/fast/block/float/015-expected.txt
index a37619d..814b4b2 100644
--- a/LayoutTests/fast/block/float/015-expected.txt
+++ b/LayoutTests/fast/block/float/015-expected.txt
@@ -10,8 +10,8 @@ layer at (0,0) size 800x164
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]
- RenderImage {IMG} at (4,4) size 102x50 [bgcolor=#FFA500]
RenderBlock (anonymous) at (4,4) size 649x0
+ RenderImage {IMG} at (0,0) size 102x50 [bgcolor=#FFA500]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (4,4) size 649x36
RenderText {TEXT} at (105,0) size 535x36
diff --git a/LayoutTests/fast/block/float/020-expected.txt b/LayoutTests/fast/block/float/020-expected.txt
index a85d185..f4c283d 100644
--- a/LayoutTests/fast/block/float/020-expected.txt
+++ b/LayoutTests/fast/block/float/020-expected.txt
@@ -11,11 +11,11 @@ layer at (0,0) size 800x502
text run at (0,54) width 766: "in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et"
text run at (0,72) width 651: "iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi."
RenderBlock {DIV} at (0,106) size 784x266
- RenderBlock (floating) {H2} at (0,0) size 112x36
- RenderText {TEXT} at (4,0) size 108x36
- text run at (4,0) width 108: "H2: This should"
- text run at (57,18) width 55: "float left"
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {H2} at (0,0) size 112x36
+ RenderText {TEXT} at (4,0) size 108x36
+ text run at (4,0) width 108: "H2: This should"
+ text run at (57,18) width 55: "float left"
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,0) size 784x266
RenderBlock {H3} at (128,0) size 656x18
diff --git a/LayoutTests/fast/block/float/024-expected.txt b/LayoutTests/fast/block/float/024-expected.txt
index 2a72df9..7271fdd 100644
--- a/LayoutTests/fast/block/float/024-expected.txt
+++ b/LayoutTests/fast/block/float/024-expected.txt
@@ -11,8 +11,8 @@ layer at (0,0) size 800x345
RenderText {TEXT} at (2,2) size 451x18
text run at (2,2) width 451: "There should be a gap between this float and the green rectangle above."
RenderBlock {DIV} at (0,221) size 800x54 [bgcolor=#DDDDDD] [border: (2px solid #000000)]
- RenderBlock (floating) {DIV} at (2,2) size 32x32 [bgcolor=#FFFFFF]
RenderBlock (anonymous) at (2,2) size 796x0
+ RenderBlock (floating) {DIV} at (0,0) size 32x32 [bgcolor=#FFFFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (2,34) size 796x0
RenderBlock (anonymous) at (2,34) size 796x18
@@ -20,8 +20,8 @@ layer at (0,0) size 800x345
text run at (0,0) width 376: "This text should be inside a black rectangle and below the 2"
text run at (376,0) width 107: "em white square."
RenderBlock {DIV} at (0,291) size 800x54 [bgcolor=#DDDDDD] [border: (2px solid #000000)]
- RenderBlock (floating) {DIV} at (2,2) size 32x32 [bgcolor=#FFFFFF]
RenderBlock (anonymous) at (2,2) size 796x0
+ RenderBlock (floating) {DIV} at (0,0) size 32x32 [bgcolor=#FFFFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (2,34) size 796x0
RenderBlock (anonymous) at (2,34) size 796x18
diff --git a/LayoutTests/fast/block/float/025-expected.txt b/LayoutTests/fast/block/float/025-expected.txt
index 4b05c45..6ab6c66 100644
--- a/LayoutTests/fast/block/float/025-expected.txt
+++ b/LayoutTests/fast/block/float/025-expected.txt
@@ -4,8 +4,8 @@ layer at (0,0) size 800x1432
RenderBlock {HTML} at (0,0) size 800x1432
RenderBody {BODY} at (8,8) size 784x1416
RenderBlock {DIV} at (0,0) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderTable {TABLE} at (200,0) size 584x46 [border: (2px solid #008000)]
RenderTableSection {TBODY} at (2,2) size 0x42
@@ -15,17 +15,17 @@ layer at (0,0) size 800x1432
text run at (1,1) width 552: "This is a table. It should sit on the same line as the float and wrap as needed to fit within"
text run at (1,19) width 157: "the remaining line width."
RenderBlock {DIV} at (0,200) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,408) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {HR} at (200,0) size 584x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,608) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderTable {TABLE} at (200,0) size 392x46 [border: (2px solid #008000)]
RenderTableSection {TBODY} at (2,2) size 0x42
@@ -35,17 +35,17 @@ layer at (0,0) size 800x1432
text run at (1,1) width 373: "This is a table. It should sit on the same line as the float and"
text run at (1,19) width 336: "wrap as needed to fit within the remaining line width."
RenderBlock {DIV} at (0,808) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,1016) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {HR} at (200,0) size 294x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,1216) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderImage {IMG} at (200,0) size 292x50 [bgcolor=#008000]
layer at (208,208) size 584x55 clip at (210,210) size 565x36
diff --git a/LayoutTests/fast/block/float/026-expected.txt b/LayoutTests/fast/block/float/026-expected.txt
index 71232c7..6767274 100644
--- a/LayoutTests/fast/block/float/026-expected.txt
+++ b/LayoutTests/fast/block/float/026-expected.txt
@@ -4,8 +4,8 @@ layer at (0,0) size 800x1432
RenderBlock {HTML} at (0,0) size 800x1432
RenderBody {BODY} at (8,8) size 784x1416
RenderBlock {DIV} at (0,0) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderTable {TABLE} at (0,0) size 584x46 [border: (2px solid #008000)]
RenderTableSection {TBODY} at (2,2) size 0x42
@@ -16,17 +16,17 @@ layer at (0,0) size 800x1432
text run at (418,19) width 4: "."
text run at (422,19) width 153: "the remaining line width"
RenderBlock {DIV} at (0,200) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,408) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {HR} at (0,0) size 584x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,608) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderTable {TABLE} at (192,0) size 392x46 [border: (2px solid #008000)]
RenderTableSection {TBODY} at (2,2) size 0x42
@@ -37,17 +37,17 @@ layer at (0,0) size 800x1432
text run at (47,19) width 4: "."
text run at (51,19) width 332: "wrap as needed to fit within the remaining line width"
RenderBlock {DIV} at (0,808) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,1016) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {HR} at (290,0) size 294x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,1216) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderImage {IMG} at (292,0) size 292x50 [bgcolor=#008000]
layer at (8,208) size 584x55 clip at (10,210) size 565x36
diff --git a/LayoutTests/fast/block/float/027-expected.txt b/LayoutTests/fast/block/float/027-expected.txt
index c5759ef..64b0eaa 100644
--- a/LayoutTests/fast/block/float/027-expected.txt
+++ b/LayoutTests/fast/block/float/027-expected.txt
@@ -4,8 +4,8 @@ layer at (0,0) size 800x1432
RenderBlock {HTML} at (0,0) size 800x1432
RenderBody {BODY} at (8,8) size 784x1416
RenderBlock {DIV} at (0,0) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderTable {TABLE} at (200,0) size 584x46 [border: (2px solid #008000)]
RenderTableSection {TBODY} at (2,2) size 0x42
@@ -15,17 +15,17 @@ layer at (0,0) size 800x1432
text run at (1,1) width 552: "This is a table. It should sit on the same line as the float and wrap as needed to fit within"
text run at (1,19) width 157: "the remaining line width."
RenderBlock {DIV} at (0,200) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,408) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {HR} at (200,0) size 584x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,608) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderTable {TABLE} at (200,0) size 392x46 [border: (2px solid #008000)]
RenderTableSection {TBODY} at (2,2) size 0x42
@@ -35,17 +35,17 @@ layer at (0,0) size 800x1432
text run at (1,1) width 373: "This is a table. It should sit on the same line as the float and"
text run at (1,19) width 336: "wrap as needed to fit within the remaining line width."
RenderBlock {DIV} at (0,808) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,1016) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {HR} at (200,0) size 294x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,1216) size 784x200
- RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderImage {IMG} at (200,0) size 392x50 [bgcolor=#008000]
layer at (208,208) size 584x55 clip at (210,210) size 565x36
diff --git a/LayoutTests/fast/block/float/028-expected.txt b/LayoutTests/fast/block/float/028-expected.txt
index ee98a15..0b61418 100644
--- a/LayoutTests/fast/block/float/028-expected.txt
+++ b/LayoutTests/fast/block/float/028-expected.txt
@@ -4,8 +4,8 @@ layer at (0,0) size 800x1432
RenderBlock {HTML} at (0,0) size 800x1432
RenderBody {BODY} at (8,8) size 784x1416
RenderBlock {DIV} at (0,0) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderTable {TABLE} at (0,0) size 584x46 [border: (2px solid #008000)]
RenderTableSection {TBODY} at (2,2) size 0x42
@@ -16,17 +16,17 @@ layer at (0,0) size 800x1432
text run at (418,19) width 4: "."
text run at (422,19) width 153: "the remaining line width"
RenderBlock {DIV} at (0,200) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,408) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {HR} at (0,0) size 584x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,608) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderTable {TABLE} at (192,0) size 392x46 [border: (2px solid #008000)]
RenderTableSection {TBODY} at (2,2) size 0x42
@@ -37,17 +37,17 @@ layer at (0,0) size 800x1432
text run at (47,19) width 4: "."
text run at (51,19) width 332: "wrap as needed to fit within the remaining line width"
RenderBlock {DIV} at (0,808) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,1016) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {HR} at (290,0) size 294x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,1216) size 784x200
- RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (584,0) size 200x200 [bgcolor=#FF0000]
RenderText {TEXT} at (0,0) size 0x0
RenderImage {IMG} at (192,0) size 392x50 [bgcolor=#008000]
layer at (8,208) size 584x55 clip at (10,210) size 565x36
diff --git a/LayoutTests/fast/block/float/029-expected.txt b/LayoutTests/fast/block/float/029-expected.txt
index b298b4d..0c1741c 100644
--- a/LayoutTests/fast/block/float/029-expected.txt
+++ b/LayoutTests/fast/block/float/029-expected.txt
@@ -3,21 +3,21 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x54
RenderBlock {HTML} at (0,0) size 800x54
RenderBody {BODY} at (8,8) size 784x38
- RenderBlock (floating) {DIV} at (532,0) size 252x102 [border: (1px solid #FF0000)]
- RenderText {TEXT} at (1,1) size 86x18
- text run at (1,1) width 86: "TOP-RIGHT"
- RenderBR {BR} at (87,1) size 0x18
- RenderText {TEXT} at (1,19) size 65x18
- text run at (1,19) width 65: "float:right;"
- RenderBR {BR} at (66,19) size 0x18
- RenderText {TEXT} at (1,37) size 88x18
- text run at (1,37) width 68: "width: 250"
- text run at (69,37) width 20: "px;"
- RenderBR {BR} at (89,37) size 0x18
- RenderText {TEXT} at (1,55) size 87x18
- text run at (1,55) width 67: "height:100"
- text run at (68,55) width 20: "px;"
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (532,0) size 252x102 [border: (1px solid #FF0000)]
+ RenderText {TEXT} at (1,1) size 86x18
+ text run at (1,1) width 86: "TOP-RIGHT"
+ RenderBR {BR} at (87,1) size 0x18
+ RenderText {TEXT} at (1,19) size 65x18
+ text run at (1,19) width 65: "float:right;"
+ RenderBR {BR} at (66,19) size 0x18
+ RenderText {TEXT} at (1,37) size 88x18
+ text run at (1,37) width 68: "width: 250"
+ text run at (69,37) width 20: "px;"
+ RenderBR {BR} at (89,37) size 0x18
+ RenderText {TEXT} at (1,55) size 87x18
+ text run at (1,55) width 67: "height:100"
+ text run at (68,55) width 20: "px;"
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,0) size 394x38 [border: (1px solid #FF0000)]
RenderText {TEXT} at (1,1) size 31x18
diff --git a/LayoutTests/fast/block/margin-collapse/021-expected.txt b/LayoutTests/fast/block/margin-collapse/021-expected.txt
index 1b88b88..299100e 100644
--- a/LayoutTests/fast/block/margin-collapse/021-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/021-expected.txt
@@ -11,8 +11,8 @@ layer at (0,0) size 800x224
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (16,16) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,64) size 128x64 [border: (32px solid #FFFF00)]
RenderTableCell {TD} at (166,16) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
diff --git a/LayoutTests/fast/block/margin-collapse/022-expected.txt b/LayoutTests/fast/block/margin-collapse/022-expected.txt
index 1b88b88..299100e 100644
--- a/LayoutTests/fast/block/margin-collapse/022-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/022-expected.txt
@@ -11,8 +11,8 @@ layer at (0,0) size 800x224
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (16,16) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,64) size 128x64 [border: (32px solid #FFFF00)]
RenderTableCell {TD} at (166,16) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
diff --git a/LayoutTests/fast/block/margin-collapse/024-expected.txt b/LayoutTests/fast/block/margin-collapse/024-expected.txt
index 8739b90..9560930 100644
--- a/LayoutTests/fast/block/margin-collapse/024-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/024-expected.txt
@@ -11,8 +11,8 @@ layer at (0,0) size 800x224
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (16,16) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,64) size 128x0 [bgcolor=#FF0000]
RenderBlock {DIV} at (0,64) size 128x64 [border: (32px solid #FFFF00)]
diff --git a/LayoutTests/fast/block/margin-collapse/025-expected.txt b/LayoutTests/fast/block/margin-collapse/025-expected.txt
index 8739b90..9560930 100644
--- a/LayoutTests/fast/block/margin-collapse/025-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/025-expected.txt
@@ -11,8 +11,8 @@ layer at (0,0) size 800x224
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (16,16) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,64) size 128x0 [bgcolor=#FF0000]
RenderBlock {DIV} at (0,64) size 128x64 [border: (32px solid #FFFF00)]
diff --git a/LayoutTests/fast/block/margin-collapse/032-expected.txt b/LayoutTests/fast/block/margin-collapse/032-expected.txt
index d55b23c..ccfd870 100644
--- a/LayoutTests/fast/block/margin-collapse/032-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/032-expected.txt
@@ -11,8 +11,8 @@ layer at (0,0) size 800x144
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (16,16) size 134x54 [bgcolor=#00FF00] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (3,35) size 128x16 [bgcolor=#FF0000]
- RenderBlock (floating) {DIV} at (0,0) size 128x16 [bgcolor=#FFFF00]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 128x16 [bgcolor=#FFFF00]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,0) size 128x16
RenderTableCell {TD} at (166,16) size 134x54 [bgcolor=#00FF00] [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
diff --git a/LayoutTests/fast/block/margin-collapse/033-expected.txt b/LayoutTests/fast/block/margin-collapse/033-expected.txt
index 040e0e1..6c4c24a 100644
--- a/LayoutTests/fast/block/margin-collapse/033-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/033-expected.txt
@@ -12,8 +12,8 @@ layer at (0,0) size 800x160
RenderTableCell {TD} at (16,16) size 134x70 [bgcolor=#00FF00] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (3,3) size 128x16 [bgcolor=#FFFF00]
RenderBlock {DIV} at (3,51) size 128x16 [bgcolor=#FF0000]
- RenderBlock (floating) {DIV} at (0,0) size 128x16 [bgcolor=#FFFF00]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 128x16 [bgcolor=#FFFF00]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,0) size 128x16
RenderTableCell {TD} at (166,16) size 134x70 [bgcolor=#00FF00] [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
diff --git a/LayoutTests/fast/block/margin-collapse/041-expected.txt b/LayoutTests/fast/block/margin-collapse/041-expected.txt
index 617a5dd..d3e3a8f 100644
--- a/LayoutTests/fast/block/margin-collapse/041-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/041-expected.txt
@@ -13,8 +13,8 @@ layer at (0,0) size 800x118
RenderBlock {DIV} at (1,1) size 102x54 [bgcolor=#00FFFF] [border: (3px solid #000000)]
RenderBlock {DIV} at (3,3) size 96x16 [bgcolor=#FF00FF]
RenderBlock {DIV} at (3,35) size 96x16 [bgcolor=#FF0000]
- RenderBlock (floating) {DIV} at (0,0) size 48x16 [bgcolor=#FFA500]
RenderBlock (anonymous) at (0,0) size 96x0
+ RenderBlock (floating) {DIV} at (0,0) size 48x16 [bgcolor=#FFA500]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,0) size 96x16 [bgcolor=#FFFF00]
RenderTableCell {TD} at (108,2) size 104x56 [r=0 c=1 rs=1 cs=1]
diff --git a/LayoutTests/fast/block/margin-collapse/042-expected.txt b/LayoutTests/fast/block/margin-collapse/042-expected.txt
index 3bf9e12..589bd2d 100644
--- a/LayoutTests/fast/block/margin-collapse/042-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/042-expected.txt
@@ -11,8 +11,8 @@ layer at (0,0) size 800x352
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (16,16) size 134x262 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (3,3) size 128x256 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FFFF00]
RenderBlock {DIV} at (0,192) size 128x64 [border: (32px solid #AAFFAA)]
diff --git a/LayoutTests/fast/block/margin-collapse/044-expected.txt b/LayoutTests/fast/block/margin-collapse/044-expected.txt
index 6bee99c..029785f 100644
--- a/LayoutTests/fast/block/margin-collapse/044-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/044-expected.txt
@@ -3,10 +3,10 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x68
RenderBlock {HTML} at (0,0) size 800x68 [border: (1px solid #C0C0C0)]
RenderBody {BODY} at (1,17) size 798x34
- RenderBlock (floating) {DIV} at (16,0) size 336x34 [bgcolor=#00FFFF]
- RenderText {TEXT} at (8,8) size 53x18
- text run at (8,8) width 53: "FLOAT"
RenderBlock (anonymous) at (0,0) size 798x0
+ RenderBlock (floating) {DIV} at (16,0) size 336x34 [bgcolor=#00FFFF]
+ RenderText {TEXT} at (8,8) size 53x18
+ text run at (8,8) width 53: "FLOAT"
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (16,0) size 766x34 [bgcolor=#FFFF00]
RenderText {TEXT} at (352,8) size 56x18
diff --git a/LayoutTests/fast/block/margin-collapse/045-expected.txt b/LayoutTests/fast/block/margin-collapse/045-expected.txt
index 3d037a2..66a4ddd 100644
--- a/LayoutTests/fast/block/margin-collapse/045-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/045-expected.txt
@@ -3,10 +3,10 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x86
RenderBlock {HTML} at (0,0) size 800x86 [border: (1px solid #C0C0C0)]
RenderBody {BODY} at (1,1) size 798x68
- RenderBlock (floating) {DIV} at (16,0) size 336x34 [bgcolor=#00FFFF]
- RenderText {TEXT} at (8,8) size 53x18
- text run at (8,8) width 53: "FLOAT"
RenderBlock (anonymous) at (0,0) size 798x0
+ RenderBlock (floating) {DIV} at (16,0) size 336x34 [bgcolor=#00FFFF]
+ RenderText {TEXT} at (8,8) size 53x18
+ text run at (8,8) width 53: "FLOAT"
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (16,34) size 766x34 [bgcolor=#FFFF00]
RenderText {TEXT} at (8,8) size 56x18
diff --git a/LayoutTests/fast/block/margin-collapse/057-expected.txt b/LayoutTests/fast/block/margin-collapse/057-expected.txt
index e47331c..18b6bc7 100644
--- a/LayoutTests/fast/block/margin-collapse/057-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/057-expected.txt
@@ -12,46 +12,46 @@ layer at (0,0) size 800x336
RenderTableCell {TD} at (2,2) size 136x136 [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
RenderTableCell {TD} at (140,2) size 136x136 [r=0 c=1 rs=1 cs=1]
RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
RenderTableCell {TD} at (278,2) size 136x136 [r=0 c=2 rs=1 cs=1]
RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (2,140) size 136x136 [r=1 c=0 rs=1 cs=1]
RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
RenderBlock {DIV} at (16,0) size 96x0
RenderTableCell {TD} at (140,140) size 136x136 [r=1 c=1 rs=1 cs=1]
RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
RenderBlock {DIV} at (16,0) size 96x0
RenderTableCell {TD} at (278,140) size 136x136 [r=1 c=2 rs=1 cs=1]
RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderBlock (anonymous) at (0,0) size 128x0
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
RenderBlock {DIV} at (16,0) size 96x0
diff --git a/LayoutTests/fast/block/positioning/048-expected.txt b/LayoutTests/fast/block/positioning/048-expected.txt
index 6c8f34a..bf39040 100644
--- a/LayoutTests/fast/block/positioning/048-expected.txt
+++ b/LayoutTests/fast/block/positioning/048-expected.txt
@@ -9,11 +9,8 @@ layer at (8,8) size 79x79
RenderBlock (positioned) {DIV} at (8,8) size 79x79 [border: (2px solid #0000FF)]
RenderBlock (anonymous) at (2,2) size 75x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (anonymous) at (2,2) size 75x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (anonymous) at (2,2) size 75x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (anonymous) at (2,2) size 75x0
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (2,2) size 75x75 [bgcolor=#808080]
layer at (10,10) size 33x33
@@ -28,11 +25,8 @@ layer at (100,0) size 99x99
RenderBlock (positioned) {DIV} at (100,0) size 99x99 [border: (2px solid #0000FF)]
RenderBlock (anonymous) at (12,12) size 75x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (anonymous) at (12,12) size 75x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (anonymous) at (12,12) size 75x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (anonymous) at (12,12) size 75x0
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (12,12) size 75x75 [bgcolor=#808080]
layer at (102,2) size 33x33
diff --git a/LayoutTests/fast/block/positioning/050-expected.txt b/LayoutTests/fast/block/positioning/050-expected.txt
index 2f293ae..a6738de 100644
--- a/LayoutTests/fast/block/positioning/050-expected.txt
+++ b/LayoutTests/fast/block/positioning/050-expected.txt
@@ -8,7 +8,6 @@ layer at (8,8) size 124x124
RenderBlock (positioned) {DIV} at (8,8) size 124x124 [border: (2px solid #0000FF)]
RenderBlock (anonymous) at (12,12) size 100x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (anonymous) at (12,12) size 100x0
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (12,12) size 100x100 [bgcolor=#808080]
layer at (10,10) size 120x108
diff --git a/LayoutTests/fast/css/006-expected.txt b/LayoutTests/fast/css/006-expected.txt
index 8d624f2..e2a6cac 100644
--- a/LayoutTests/fast/css/006-expected.txt
+++ b/LayoutTests/fast/css/006-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x116
RenderBlock {HTML} at (0,0) size 800x116
RenderBody {BODY} at (8,8) size 784x100
- RenderBlock (floating) {DIV} at (0,0) size 100x100
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 100x100
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
diff --git a/LayoutTests/fast/flexbox/008-expected.txt b/LayoutTests/fast/flexbox/008-expected.txt
index e734c54..b0e5637 100644
--- a/LayoutTests/fast/flexbox/008-expected.txt
+++ b/LayoutTests/fast/flexbox/008-expected.txt
@@ -11,7 +11,7 @@ layer at (0,0) size 800x268
text run at (541,0) width 239: "This test is checking to make sure that"
text run at (0,18) width 517: "boxes will shift to avoid floats that try to intrude into their space (just as tables do)."
RenderBlock {DIV} at (0,52) size 200x200 [bgcolor=#FF0000]
- RenderBlock (floating) {DIV} at (0,0) size 100x200 [bgcolor=#008000]
RenderBlock (anonymous) at (0,0) size 200x0
+ RenderBlock (floating) {DIV} at (0,0) size 100x200 [bgcolor=#008000]
RenderText {TEXT} at (0,0) size 0x0
RenderFlexibleBox {DIV} at (100,0) size 100x200 [bgcolor=#008000]
diff --git a/LayoutTests/fast/flexbox/016-expected.txt b/LayoutTests/fast/flexbox/016-expected.txt
index 823a649..2d680f4 100644
--- a/LayoutTests/fast/flexbox/016-expected.txt
+++ b/LayoutTests/fast/flexbox/016-expected.txt
@@ -13,8 +13,6 @@ layer at (0,0) size 812x585
text run at (254,18) width 499: "It should start beneath the header, end above the footer, and fill the width of the"
text run at (0,36) width 111: "browser window."
RenderPartObject {IFRAME} at (0,54) size 812x513 [bgcolor=#008000] [border: (10px solid #808000)]
- layer at (0,0) size 777x493
- RenderCanvas at (0,0) size 777x493
RenderBlock {DIV} at (0,567) size 800x18
RenderText {TEXT} at (0,0) size 664x18
text run at (0,0) width 407: "This footer should remain at the bottom of the browser window. "
diff --git a/LayoutTests/fast/frames/001-expected.txt b/LayoutTests/fast/frames/001-expected.txt
index d48eaba..6d7af0c 100644
--- a/LayoutTests/fast/frames/001-expected.txt
+++ b/LayoutTests/fast/frames/001-expected.txt
@@ -8,16 +8,10 @@ layer at (0,0) size 800x208
RenderBR {BR} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
RenderPartObject {IFRAME} at (0,18) size 170x170 [border: (10px solid #FF0000)]
- layer at (0,0) size 85x100
- RenderCanvas at (0,0) size 85x100
RenderText {TEXT} at (170,174) size 4x18
text run at (170,174) width 4: " "
RenderPartObject {OBJECT} at (174,18) size 170x170 [border: (10px solid #FF0000)]
- layer at (0,0) size 85x100
- RenderCanvas at (0,0) size 85x100
RenderText {TEXT} at (344,174) size 4x18
text run at (344,174) width 4: " "
RenderPartObject {OBJECT} at (348,18) size 170x170 [border: (10px solid #FF0000)]
- layer at (0,0) size 85x100
- RenderCanvas at (0,0) size 85x100
RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/frames/empty-frame-src-expected.txt b/LayoutTests/fast/frames/empty-frame-src-expected.txt
index 46ca280..09cadd5 100644
--- a/LayoutTests/fast/frames/empty-frame-src-expected.txt
+++ b/LayoutTests/fast/frames/empty-frame-src-expected.txt
@@ -16,5 +16,3 @@ layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 783x8
RenderBody {BODY} at (8,8) size 767x0 [bgcolor=#800080]
RenderFrame {FRAME} at (0,402) size 800x197
- layer at (0,0) size 783x193
- RenderCanvas at (0,0) size 783x193
diff --git a/LayoutTests/fast/invalid/014-expected.txt b/LayoutTests/fast/invalid/014-expected.txt
index 4fd1395..9621a49 100644
--- a/LayoutTests/fast/invalid/014-expected.txt
+++ b/LayoutTests/fast/invalid/014-expected.txt
@@ -4,11 +4,11 @@ layer at (0,0) size 800x64
RenderBlock {HTML} at (0,0) size 800x64
RenderBody {BODY} at (8,8) size 784x40
RenderBlock (anonymous) at (0,0) size 784x18
- RenderText {TEXT} at (0,0) size 599x18
+ RenderText {TEXT} at (0,0) size 603x18
text run at (0,0) width 282: "Random tests of some bizarre combinations. "
- text run at (282,0) width 317: "H2 should allow a form inside it, but p should not."
- RenderBlock (anonymous) at (0,18) size 784x0
- RenderText {TEXT} at (0,0) size 0x0
+ text run at (282,0) width 321: "H2 should allow a form inside it, but p should not. "
+ RenderText {TEXT} at (603,0) size 4x18
+ text run at (603,0) width 4: " "
RenderBlock {FORM} at (0,18) size 784x22
RenderSelect {SELECT} at (2,2) size 39x18
RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/lists/001-expected.txt b/LayoutTests/fast/lists/001-expected.txt
index a750da9..4d8dc1b 100644
--- a/LayoutTests/fast/lists/001-expected.txt
+++ b/LayoutTests/fast/lists/001-expected.txt
@@ -4,8 +4,8 @@ layer at (0,0) size 800x268
RenderBlock {HTML} at (0,0) size 800x268
RenderBody {BODY} at (8,8) size 784x244
RenderBlock {DIV} at (0,0) size 784x106 [border: (3px solid #FFA500)]
- RenderBlock (floating) {DIV} at (11,11) size 122x122 [bgcolor=#FFA500] [border: (3px solid #FFA500)]
RenderBlock (anonymous) at (11,11) size 762x0
+ RenderBlock (floating) {DIV} at (0,0) size 122x122 [bgcolor=#FFA500] [border: (3px solid #FFA500)]
RenderText {TEXT} at (0,0) size 0x0
RenderListItem {DIV} at (11,11) size 762x84 [border: (3px solid #FFA500)]
RenderListItem {DIV} at (11,11) size 740x62 [border: (3px solid #FFA500)]
diff --git a/LayoutTests/fast/lists/003-expected.txt b/LayoutTests/fast/lists/003-expected.txt
index 6992330..d419101 100644
--- a/LayoutTests/fast/lists/003-expected.txt
+++ b/LayoutTests/fast/lists/003-expected.txt
@@ -3,121 +3,121 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x334
RenderBlock {HTML} at (0,0) size 800x334
RenderBody {BODY} at (8,16) size 784x302
- RenderBlock (floating) {DIV} at (0,0) size 470x334
- RenderBlock {P} at (0,16) size 470x54
- RenderText {TEXT} at (0,0) size 415x18
- text run at (0,0) width 415: "This test case illustrates incorrect positioning of list items within a "
- RenderInline {CODE} at (0,0) size 455x33
- RenderText {TEXT} at (415,2) size 455x33
- text run at (415,2) width 40: "text-"
- text run at (0,20) width 96: "align: right"
- RenderText {TEXT} at (96,18) size 71x18
- text run at (96,18) width 71: " div after a "
- RenderInline {CODE} at (0,0) size 88x15
- RenderText {TEXT} at (167,20) size 88x15
- text run at (167,20) width 88: "float: left"
- RenderText {TEXT} at (255,18) size 32x18
- text run at (255,18) width 32: " div. "
- RenderInline {A} at (0,0) size 420x36 [color=#0000EE]
- RenderText {TEXT} at (287,18) size 420x36
- text run at (287,18) width 133: "Screenshot of correct"
- text run at (0,36) width 55: "behavior"
- RenderText {TEXT} at (55,36) size 8x18
- text run at (55,36) width 8: "; "
- RenderInline {A} at (0,0) size 124x18 [color=#0000EE]
- RenderText {TEXT} at (63,36) size 124x18
- text run at (63,36) width 124: "screenshot of Safari"
- RenderText {TEXT} at (187,36) size 4x18
- text run at (187,36) width 4: "."
- RenderBlock {P} at (0,86) size 470x36
- RenderText {TEXT} at (0,0) size 450x18
- text run at (0,0) width 450: "This bug only occurs on pages with a standards-compliant DOCTYPE."
- RenderInline {A} at (0,0) size 260x18 [color=#0000EE]
- RenderText {TEXT} at (0,18) size 260x18
- text run at (0,18) width 260: "View this test case without a DOCTYPE"
- RenderText {TEXT} at (260,18) size 4x18
- text run at (260,18) width 4: "."
- RenderBlock {OL} at (0,138) size 470x180
- RenderListItem {LI} at (40,0) size 430x36
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 402x36
- text run at (0,0) width 159: "New larger PowerBook. "
- text run at (159,0) width 168: "Still 1 GHz, but with a 17-"
- text run at (327,0) width 75: "inch screen."
- text run at (0,18) width 44: "$3299."
- RenderListItem {LI} at (40,36) size 430x18
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 355x18
- text run at (0,0) width 232: "New smaller PowerBook, with a 12-"
- text run at (232,0) width 79: "inch screen. "
- text run at (311,0) width 44: "$1799."
- RenderListItem {LI} at (40,54) size 430x54
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 94x18
- text run at (0,0) width 94: "New browser: "
- RenderInline {A} at (0,0) size 37x18 [color=#0000EE]
- RenderText {TEXT} at (94,0) size 37x18
- text run at (94,0) width 37: "Safari"
- RenderText {TEXT} at (131,0) size 71x18
- text run at (131,0) width 8: ". "
- text run at (139,0) width 63: "Engine is "
- RenderInline {A} at (0,0) size 76x18 [color=#0000EE]
- RenderText {TEXT} at (202,0) size 76x18
- text run at (202,0) width 76: "open source"
- RenderText {TEXT} at (278,0) size 20x18
- text run at (278,0) width 20: " (a "
- RenderInline {A} at (0,0) size 106x18 [color=#0000EE]
- RenderText {TEXT} at (298,0) size 106x18
- text run at (298,0) width 106: "modified version"
- RenderText {TEXT} at (404,0) size 17x18
- text run at (404,0) width 17: " of"
- RenderInline {A} at (0,0) size 58x18 [color=#0000EE]
- RenderText {TEXT} at (0,18) size 58x18
- text run at (0,18) width 58: "KHTML"
- RenderText {TEXT} at (58,18) size 407x36
- text run at (58,18) width 349: "), rest of the application is free but not open source (just"
- text run at (0,36) width 84: "like the OS). "
- text run at (84,36) width 123: "Only runs on 10.2. "
- text run at (207,36) width 153: "Currently in public beta."
- RenderListItem {LI} at (40,108) size 430x18
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 428x18
- text run at (0,0) width 239: "New presentation software: Keynote. "
- text run at (239,0) width 189: "The software Steve Jobs uses."
- RenderListItem {LI} at (40,126) size 430x36
- RenderListMarker at (0,0) size 0x14
- RenderText {TEXT} at (0,0) size 108x18
- text run at (0,0) width 108: "New versions of "
- RenderInline {A} at (0,0) size 45x18 [color=#0000EE]
- RenderText {TEXT} at (108,0) size 45x18
- text run at (108,0) width 45: "iMovie"
- RenderText {TEXT} at (153,0) size 8x18
- text run at (153,0) width 8: ", "
- RenderInline {A} at (0,0) size 41x18 [color=#0000EE]
- RenderText {TEXT} at (161,0) size 41x18
- text run at (161,0) width 41: "iPhoto"
- RenderText {TEXT} at (202,0) size 8x18
- text run at (202,0) width 8: ", "
- RenderInline {A} at (0,0) size 43x18 [color=#0000EE]
- RenderText {TEXT} at (210,0) size 43x18
- text run at (210,0) width 43: "iTunes"
- RenderText {TEXT} at (253,0) size 170x18
- text run at (253,0) width 8: ". "
- text run at (261,0) width 162: "Bundled into a box called"
- RenderInline {A} at (0,0) size 30x18 [color=#0000EE]
- RenderText {TEXT} at (0,18) size 30x18
- text run at (0,18) width 30: "iLife"
- RenderText {TEXT} at (30,18) size 58x18
- text run at (30,18) width 58: ", for $49."
- RenderListItem {LI} at (40,162) size 430x18
- RenderListMarker at (0,0) size 0x14
- RenderInline {A} at (0,0) size 113x18 [color=#0000EE]
- RenderText {TEXT} at (0,0) size 113x18
- text run at (0,0) width 113: "Final Cut Express"
- RenderText {TEXT} at (113,0) size 166x18
- text run at (113,0) width 130: " for creating DVDs. "
- text run at (243,0) width 36: "$299."
RenderBlock (anonymous) at (0,0) size 784x0
+ RenderBlock (floating) {DIV} at (0,0) size 470x334
+ RenderBlock {P} at (0,16) size 470x54
+ RenderText {TEXT} at (0,0) size 415x18
+ text run at (0,0) width 415: "This test case illustrates incorrect positioning of list items within a "
+ RenderInline {CODE} at (0,0) size 455x33
+ RenderText {TEXT} at (415,2) size 455x33
+ text run at (415,2) width 40: "text-"
+ text run at (0,20) width 96: "align: right"
+ RenderText {TEXT} at (96,18) size 71x18
+ text run at (96,18) width 71: " div after a "
+ RenderInline {CODE} at (0,0) size 88x15
+ RenderText {TEXT} at (167,20) size 88x15
+ text run at (167,20) width 88: "float: left"
+ RenderText {TEXT} at (255,18) size 32x18
+ text run at (255,18) width 32: " div. "
+ RenderInline {A} at (0,0) size 420x36 [color=#0000EE]
+ RenderText {TEXT} at (287,18) size 420x36
+ text run at (287,18) width 133: "Screenshot of correct"
+ text run at (0,36) width 55: "behavior"
+ RenderText {TEXT} at (55,36) size 8x18
+ text run at (55,36) width 8: "; "
+ RenderInline {A} at (0,0) size 124x18 [color=#0000EE]
+ RenderText {TEXT} at (63,36) size 124x18
+ text run at (63,36) width 124: "screenshot of Safari"
+ RenderText {TEXT} at (187,36) size 4x18
+ text run at (187,36) width 4: "."
+ RenderBlock {P} at (0,86) size 470x36
+ RenderText {TEXT} at (0,0) size 450x18
+ text run at (0,0) width 450: "This bug only occurs on pages with a standards-compliant DOCTYPE."
+ RenderInline {A} at (0,0) size 260x18 [color=#0000EE]
+ RenderText {TEXT} at (0,18) size 260x18
+ text run at (0,18) width 260: "View this test case without a DOCTYPE"
+ RenderText {TEXT} at (260,18) size 4x18
+ text run at (260,18) width 4: "."
+ RenderBlock {OL} at (0,138) size 470x180
+ RenderListItem {LI} at (40,0) size 430x36
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 402x36
+ text run at (0,0) width 159: "New larger PowerBook. "
+ text run at (159,0) width 168: "Still 1 GHz, but with a 17-"
+ text run at (327,0) width 75: "inch screen."
+ text run at (0,18) width 44: "$3299."
+ RenderListItem {LI} at (40,36) size 430x18
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 355x18
+ text run at (0,0) width 232: "New smaller PowerBook, with a 12-"
+ text run at (232,0) width 79: "inch screen. "
+ text run at (311,0) width 44: "$1799."
+ RenderListItem {LI} at (40,54) size 430x54
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 94x18
+ text run at (0,0) width 94: "New browser: "
+ RenderInline {A} at (0,0) size 37x18 [color=#0000EE]
+ RenderText {TEXT} at (94,0) size 37x18
+ text run at (94,0) width 37: "Safari"
+ RenderText {TEXT} at (131,0) size 71x18
+ text run at (131,0) width 8: ". "
+ text run at (139,0) width 63: "Engine is "
+ RenderInline {A} at (0,0) size 76x18 [color=#0000EE]
+ RenderText {TEXT} at (202,0) size 76x18
+ text run at (202,0) width 76: "open source"
+ RenderText {TEXT} at (278,0) size 20x18
+ text run at (278,0) width 20: " (a "
+ RenderInline {A} at (0,0) size 106x18 [color=#0000EE]
+ RenderText {TEXT} at (298,0) size 106x18
+ text run at (298,0) width 106: "modified version"
+ RenderText {TEXT} at (404,0) size 17x18
+ text run at (404,0) width 17: " of"
+ RenderInline {A} at (0,0) size 58x18 [color=#0000EE]
+ RenderText {TEXT} at (0,18) size 58x18
+ text run at (0,18) width 58: "KHTML"
+ RenderText {TEXT} at (58,18) size 407x36
+ text run at (58,18) width 349: "), rest of the application is free but not open source (just"
+ text run at (0,36) width 84: "like the OS). "
+ text run at (84,36) width 123: "Only runs on 10.2. "
+ text run at (207,36) width 153: "Currently in public beta."
+ RenderListItem {LI} at (40,108) size 430x18
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 428x18
+ text run at (0,0) width 239: "New presentation software: Keynote. "
+ text run at (239,0) width 189: "The software Steve Jobs uses."
+ RenderListItem {LI} at (40,126) size 430x36
+ RenderListMarker at (0,0) size 0x14
+ RenderText {TEXT} at (0,0) size 108x18
+ text run at (0,0) width 108: "New versions of "
+ RenderInline {A} at (0,0) size 45x18 [color=#0000EE]
+ RenderText {TEXT} at (108,0) size 45x18
+ text run at (108,0) width 45: "iMovie"
+ RenderText {TEXT} at (153,0) size 8x18
+ text run at (153,0) width 8: ", "
+ RenderInline {A} at (0,0) size 41x18 [color=#0000EE]
+ RenderText {TEXT} at (161,0) size 41x18
+ text run at (161,0) width 41: "iPhoto"
+ RenderText {TEXT} at (202,0) size 8x18
+ text run at (202,0) width 8: ", "
+ RenderInline {A} at (0,0) size 43x18 [color=#0000EE]
+ RenderText {TEXT} at (210,0) size 43x18
+ text run at (210,0) width 43: "iTunes"
+ RenderText {TEXT} at (253,0) size 170x18
+ text run at (253,0) width 8: ". "
+ text run at (261,0) width 162: "Bundled into a box called"
+ RenderInline {A} at (0,0) size 30x18 [color=#0000EE]
+ RenderText {TEXT} at (0,18) size 30x18
+ text run at (0,18) width 30: "iLife"
+ RenderText {TEXT} at (30,18) size 58x18
+ text run at (30,18) width 58: ", for $49."
+ RenderListItem {LI} at (40,162) size 430x18
+ RenderListMarker at (0,0) size 0x14
+ RenderInline {A} at (0,0) size 113x18 [color=#0000EE]
+ RenderText {TEXT} at (0,0) size 113x18
+ text run at (0,0) width 113: "Final Cut Express"
+ RenderText {TEXT} at (113,0) size 166x18
+ text run at (113,0) width 130: " for creating DVDs. "
+ text run at (243,0) width 36: "$299."
RenderText {TEXT} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,0) size 784x302
diff --git a/LayoutTests/fast/overflow/004-expected.txt b/LayoutTests/fast/overflow/004-expected.txt
index a7c155a..b3aa041 100644
--- a/LayoutTests/fast/overflow/004-expected.txt
+++ b/LayoutTests/fast/overflow/004-expected.txt
@@ -6,8 +6,7 @@ layer at (0,0) size 800x536
RenderBlock (anonymous) at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 704x18
text run at (0,0) width 704: "The two green blocks below should be identical and should each take up half the width of the browser window."
- RenderBlock (floating) {DIV} at (390,18) size 394x502 [bgcolor=#008000] [border: (1px solid #000000)]
- RenderBlock (anonymous) at (0,18) size 784x0
+ RenderBlock (floating) {DIV} at (390,18) size 394x502 [bgcolor=#008000] [border: (1px solid #000000)]
RenderText {TEXT} at (0,0) size 0x0
layer at (8,26) size 394x502 clip at (9,27) size 392x500
RenderBlock {DIV} at (0,18) size 394x502 [bgcolor=#008000] [border: (1px solid #000000)]
diff --git a/LayoutTests/fast/table/014-expected.txt b/LayoutTests/fast/table/014-expected.txt
index 1fe5ed0..34a275a 100644
--- a/LayoutTests/fast/table/014-expected.txt
+++ b/LayoutTests/fast/table/014-expected.txt
@@ -7,13 +7,14 @@ layer at (0,0) size 800x113
RenderImage {IMG} at (0,0) size 132x86
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {H2} at (0,105) size 784x0
- 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"
+ 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"
diff --git a/LayoutTests/fast/text/basic/004-expected.txt b/LayoutTests/fast/text/basic/004-expected.txt
index 8973918..8cfbeb1 100644
--- a/LayoutTests/fast/text/basic/004-expected.txt
+++ b/LayoutTests/fast/text/basic/004-expected.txt
@@ -3,10 +3,11 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x246
RenderBlock {HTML} at (0,0) size 800x246
RenderBody {BODY} at (8,8) size 784x230
- 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 (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 {DIV} at (0,0) size 784x100
RenderTable {TABLE} at (0,100) size 100x130
RenderTableSection {TBODY} at (0,0) size 0x130
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6ba4bd4..125a37c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-03-30 David Hyatt <hyatt at apple.com>
+
+ Fix for 3603326, spurious line breaks in encyclopedia articles. Make sure makeChildrenNonInline knows to
+ skip over floating/positioned elements so that they remain part of contiguous inline runs for static positioning
+ purposes.
+
+ Reviewed by darin
+
+ * khtml/rendering/render_block.cpp:
+ (khtml::getInlineRun):
+
2004-03-30 Darin Adler <darin at apple.com>
Reviewed by Ken.
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 37334bc..0ff858e 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -201,7 +201,7 @@ static void getInlineRun(RenderObject* start, RenderObject* stop,
// Start by skipping as many non-inlines as we can.
RenderObject * curr = start;
- while (curr && !curr->isInline())
+ while (curr && !(curr->isInline() || curr->isFloatingOrPositioned()))
curr = curr->nextSibling();
if (!curr)
@@ -210,7 +210,7 @@ static void getInlineRun(RenderObject* start, RenderObject* stop,
inlineRunStart = inlineRunEnd = curr;
curr = curr->nextSibling();
- while (curr && curr->isInline() && (curr != stop)) {
+ while (curr && (curr->isInline() || curr->isFloatingOrPositioned()) && (curr != stop)) {
inlineRunEnd = curr;
curr = curr->nextSibling();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list