[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:12:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 674a75bdd1d50e5e6f71688b199f5c7d7126b9a4
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 17 22:20:03 2003 +0000
Revise layout tests now that we break on hyphens and question marks.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5540 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/css1/box_properties/border_top_inline-expected.txt b/LayoutTests/css1/box_properties/border_top_inline-expected.txt
index ed25934..f643bf2 100644
--- a/LayoutTests/css1/box_properties/border_top_inline-expected.txt
+++ b/LayoutTests/css1/box_properties/border_top_inline-expected.txt
@@ -25,10 +25,10 @@ layer at (0,0) size 800x286
RenderInline {SPAN} at (0,0) size 58x19 [bgcolor=#000000] [border: (1px solid #800080) none]
RenderText {TEXT} at (338,18) size 58x18
text run at (338,18) width 58: "class two"
- RenderText {TEXT} at (396,18) size 742x36
+ RenderText {TEXT} at (396,18) size 774x36
text run at (396,18) width 321: ", which should have a thin solid purple top border. "
- text run at (717,18) width 25: "The"
- text run at (0,36) width 400: "line-height of the parent element should not change on any line."
+ text run at (717,18) width 57: "The line-"
+ text run at (0,36) width 372: "height of the parent element should not change on any line."
RenderTable {TABLE} at (0,180) size 784x90 [bgcolor=#000000] [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 0x88
RenderTableRow {TR} at (0,0) size 0x0
diff --git a/LayoutTests/css1/box_properties/margin_left-expected.txt b/LayoutTests/css1/box_properties/margin_left-expected.txt
index 957c7ca..df35d3d 100644
--- a/LayoutTests/css1/box_properties/margin_left-expected.txt
+++ b/LayoutTests/css1/box_properties/margin_left-expected.txt
@@ -42,11 +42,11 @@ layer at (0,0) size 800x987
text run at (0,0) width 686: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to gray."
RenderListItem {LI} at (65,18) size 694x54 [bgcolor=#FFFFFF]
RenderListMarker at (0,0) size 0x14 [bgcolor=#000000]
- RenderText {TEXT} at (0,0) size 668x54
- text run at (0,0) width 604: "Another list item might not be such a bad idea, either, considering that such things do need to be"
- text run at (0,18) width 108: "double-checked. "
- text run at (108,18) width 560: "This list item has its left margin also set to 25 pixels, which should combine with the list's"
- text run at (0,36) width 527: "margin to make 50 pixels of margin, and its background color has been set to white."
+ RenderText {TEXT} at (0,0) size 684x54
+ text run at (0,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-"
+ text run at (0,18) width 60: "checked. "
+ text run at (60,18) width 624: "This list item has its left margin also set to 25 pixels, which should combine with the list's margin to"
+ text run at (0,36) width 463: "make 50 pixels of margin, and its background color has been set to white."
RenderListItem {LI} at (40,72) size 719x18 [bgcolor=#000000]
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 179x18
@@ -98,10 +98,10 @@ layer at (0,0) size 800x987
RenderListItem {LI} at (65,18) size 672x54 [bgcolor=#FFFFFF]
RenderListMarker at (0,0) size 0x14 [bgcolor=#000000]
RenderText {TEXT} at (0,0) size 668x54
- text run at (0,0) width 604: "Another list item might not be such a bad idea, either, considering that such things do need to be"
- text run at (0,18) width 108: "double-checked. "
- text run at (108,18) width 560: "This list item has its left margin also set to 25 pixels, which should combine with the list's"
- text run at (0,36) width 527: "margin to make 50 pixels of margin, and its background color has been set to white."
+ text run at (0,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-"
+ text run at (0,18) width 60: "checked. "
+ text run at (60,18) width 608: "This list item has its left margin also set to 25 pixels, which should combine with the list's margin"
+ text run at (0,36) width 479: "to make 50 pixels of margin, and its background color has been set to white."
RenderListItem {LI} at (40,72) size 697x18 [bgcolor=#000000]
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 179x18
diff --git a/LayoutTests/css1/box_properties/margin_right-expected.txt b/LayoutTests/css1/box_properties/margin_right-expected.txt
index 7440c6b..51d6815 100644
--- a/LayoutTests/css1/box_properties/margin_right-expected.txt
+++ b/LayoutTests/css1/box_properties/margin_right-expected.txt
@@ -41,12 +41,12 @@ layer at (0,0) size 802x1005
RenderText {TEXT} at (19,0) size 700x18
text run at (19,0) width 700: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to gray."
RenderListItem {LI} at (40,18) size 694x54 [bgcolor=#FFFFFF]
- RenderListMarker at (90,0) size 0x14 [bgcolor=#000000]
- RenderText {TEXT} at (90,0) size 677x54
- text run at (90,0) width 604: "Another list item might not be such a bad idea, either, considering that such things do need to be"
- text run at (17,18) width 108: "double-checked. "
- text run at (125,18) width 569: "This list item has its right margin also set to 25 pixels, which should combine with the list's"
- text run at (166,36) width 528: "margin to make 50 pixels of margin, and its background-color has been set to white."
+ RenderListMarker at (38,0) size 0x14 [bgcolor=#000000]
+ RenderText {TEXT} at (38,0) size 693x54
+ text run at (38,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-"
+ text run at (1,18) width 60: "checked. "
+ text run at (61,18) width 633: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin to"
+ text run at (230,36) width 464: "make 50 pixels of margin, and its background-color has been set to white."
RenderListItem {LI} at (40,72) size 719x18 [bgcolor=#000000]
RenderListMarker at (540,0) size 0x14
RenderText {TEXT} at (540,0) size 179x18
@@ -97,12 +97,12 @@ layer at (0,0) size 802x1005
text run at (33,0) width 664: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to"
text run at (665,18) width 32: "gray."
RenderListItem {LI} at (40,36) size 672x54 [bgcolor=#FFFFFF]
- RenderListMarker at (68,0) size 0x14 [bgcolor=#000000]
- RenderText {TEXT} at (68,0) size 646x54
- text run at (68,0) width 604: "Another list item might not be such a bad idea, either, considering that such things do need to be"
- text run at (26,18) width 108: "double-checked. "
- text run at (134,18) width 538: "This list item has its right margin also set to 25 pixels, which should combine with the"
- text run at (113,36) width 559: "list's margin to make 50 pixels of margin, and its background-color has been set to white."
+ RenderListMarker at (16,0) size 0x14 [bgcolor=#000000]
+ RenderText {TEXT} at (16,0) size 656x54
+ text run at (16,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-"
+ text run at (43,18) width 60: "checked. "
+ text run at (103,18) width 569: "This list item has its right margin also set to 25 pixels, which should combine with the list's"
+ text run at (144,36) width 528: "margin to make 50 pixels of margin, and its background-color has been set to white."
RenderListItem {LI} at (40,90) size 697x18 [bgcolor=#000000]
RenderListMarker at (518,0) size 0x14
RenderText {TEXT} at (518,0) size 179x18
diff --git a/LayoutTests/css1/box_properties/padding_inline-expected.txt b/LayoutTests/css1/box_properties/padding_inline-expected.txt
index ee7b643..a8f8ce5 100644
--- a/LayoutTests/css1/box_properties/padding_inline-expected.txt
+++ b/LayoutTests/css1/box_properties/padding_inline-expected.txt
@@ -58,10 +58,10 @@ layer at (0,0) size 800x753
RenderText {TEXT} at (644,0) size 757x36
text run at (644,0) width 113: ", giving it an aqua"
text run at (0,18) width 474: "background and no padding, since negative padding values are not allowed"
- RenderText {TEXT} at (474,18) size 748x36
+ RenderText {TEXT} at (474,18) size 780x36
text run at (474,18) width 8: ". "
- text run at (482,18) width 266: "Padding on inline elements does not affect"
- text run at (0,36) width 528: "line-height calculations, so all lines in this element should have the same line-height."
+ text run at (482,18) width 298: "Padding on inline elements does not affect line-"
+ text run at (0,36) width 500: "height calculations, so all lines in this element should have the same line-height."
RenderBlock {P} at (0,387) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
text run at (0,0) width 203: "This element has a class of zero."
diff --git a/LayoutTests/css1/font_properties/font-expected.txt b/LayoutTests/css1/font_properties/font-expected.txt
index 82a7263..de63d4c 100644
--- a/LayoutTests/css1/font_properties/font-expected.txt
+++ b/LayoutTests/css1/font_properties/font-expected.txt
@@ -69,23 +69,21 @@ layer at (0,0) size 800x4169
text run at (670,28) width 73: "Extra text is"
text run at (0,55) width 304: "included for the purposes of testing this more effectively."
RenderBlock {P} at (0,584) size 784x81 [bgcolor=#000000]
- RenderText {TEXT} at (0,3) size 779x81
+ RenderText {TEXT} at (0,3) size 778x81
text run at (0,3) width 711: "This element should be in a sans-serif font, italicized and small caps, with a weight of 900. "
- text run at (711,3) width 21: "Its"
- text run at (0,30) width 763: "font-size should be 150% the base font size, and its line-height should be 150% of that value (18"
- text run at (763,30) width 16: "px"
- text run at (0,57) width 52: "and 27"
- text run at (52,57) width 136: "px, respectively). "
- text run at (188,57) width 559: "Extra text is included for the purposes of testing this more effectively."
+ text run at (711,3) width 67: "Its font-"
+ text run at (0,30) width 722: "size should be 150% the base font size, and its line-height should be 150% of that value (18"
+ text run at (722,30) width 48: "px and"
+ text run at (0,57) width 156: "27px, respectively). "
+ text run at (156,57) width 559: "Extra text is included for the purposes of testing this more effectively."
RenderBlock {P} at (0,683) size 784x162 [bgcolor=#000000]
- RenderText {TEXT} at (0,16) size 768x162
+ RenderText {TEXT} at (0,16) size 765x162
text run at (0,16) width 698: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. "
- text run at (698,16) width 21: "Its"
- text run at (0,70) width 752: "font-size should be 150% the base font size, and its line-height should be 300% of that value (18"
- text run at (752,70) width 16: "px"
- text run at (0,124) width 51: "and 54"
- text run at (51,124) width 135: "px, respectively). "
- text run at (186,124) width 556: "Extra text is included for the purposes of testing this more effectively."
+ text run at (698,16) width 67: "Its font-"
+ text run at (0,70) width 711: "size should be 150% the base font size, and its line-height should be 300% of that value (18"
+ text run at (711,70) width 47: "px and"
+ text run at (0,124) width 155: "54px, respectively). "
+ text run at (155,124) width 556: "Extra text is included for the purposes of testing this more effectively."
RenderBlock {P} at (0,863) size 784x144 [bgcolor=#000000]
RenderText {TEXT} at (0,7) size 750x144
text run at (0,7) width 750: "This element should be in a monospace font, italicized and small caps, with a weight of"
@@ -97,13 +95,13 @@ layer at (0,0) size 800x4169
text run at (618,79) width 113: "Extra text is"
text run at (0,115) width 499: "included for the purposes of testing this more effectively."
RenderBlock {P} at (0,1025) size 784x288 [bgcolor=#000000]
- RenderText {TEXT} at (0,37) size 771x288
+ RenderText {TEXT} at (0,37) size 765x288
text run at (0,37) width 698: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500. "
- text run at (698,37) width 21: "Its"
- text run at (0,133) width 392: "font-size should be 150% the base font size, or 18"
- text run at (392,133) width 257: "px, and its line-height should be 1"
- text run at (649,133) width 23: "in. "
- text run at (672,133) width 99: "Extra text is"
+ text run at (698,37) width 67: "Its font-"
+ text run at (0,133) width 351: "size should be 150% the base font size, or 18"
+ text run at (351,133) width 257: "px, and its line-height should be 1"
+ text run at (608,133) width 23: "in. "
+ text run at (631,133) width 99: "Extra text is"
text run at (0,229) width 452: "included for the purposes of testing this more effectively."
RenderBlock {P} at (0,1331) size 784x108 [bgcolor=#000000]
RenderText {TEXT} at (0,7) size 774x108
@@ -123,15 +121,14 @@ layer at (0,0) size 800x4169
text run at (757,6) width 24: "Extra"
text run at (0,31) width 291: "text is included for the purposes of testing this more effectively."
RenderBlock {P} at (0,1525) size 784x216 [bgcolor=#000000]
- RenderInline {SPAN} at (0,0) size 781x183 [bgcolor=#C0C0C0]
- RenderText {TEXT} at (0,16) size 781x216
+ RenderInline {SPAN} at (0,0) size 774x183 [bgcolor=#C0C0C0]
+ RenderText {TEXT} at (0,16) size 774x216
text run at (0,16) width 698: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. "
- text run at (698,16) width 21: "Its"
- text run at (0,70) width 752: "font-size should be 150% the base font size, and its line-height should be 300% of that value (18"
- text run at (752,70) width 16: "px"
- text run at (0,124) width 51: "and 54"
- text run at (51,124) width 730: "px, respectively). The text should have a silver background. The background color has been set"
- text run at (0,178) width 679: "on an inline element and should therefore only cover the text, not the interline spacing."
+ text run at (698,16) width 67: "Its font-"
+ text run at (0,70) width 711: "size should be 150% the base font size, and its line-height should be 300% of that value (18"
+ text run at (711,70) width 47: "px and"
+ text run at (0,124) width 774: "54px, respectively). The text should have a silver background. The background color has been set on"
+ text run at (0,178) width 655: "an inline element and should therefore only cover the text, not the interline spacing."
RenderText {TEXT} at (0,0) size 0x0
RenderTable {TABLE} at (0,1759) size 784x2394 [bgcolor=#000000] [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 0x2392
@@ -176,20 +173,20 @@ layer at (0,0) size 800x4169
text run at (258,76) width 503: "Extra text is included for the purposes of testing"
text run at (0,112) width 218: "this more effectively."
RenderBlock {P} at (4,437) size 762x79
- RenderText {TEXT} at (0,2) size 731x52
+ RenderText {TEXT} at (0,2) size 762x52
text run at (0,2) width 628: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. "
- text run at (628,2) width 103: "For example, if the"
- text run at (0,28) width 82: "font-size value "
+ text run at (628,2) width 134: "For example, if the font-"
+ text run at (0,28) width 55: "size value "
RenderInline {CODE} at (0,0) size 35x13
- RenderText {TEXT} at (82,33) size 35x26
- text run at (82,33) width 35: "small"
- RenderText {TEXT} at (117,28) size 754x53
- text run at (117,28) width 104: " is calculated at 10"
- text run at (221,28) width 199: "px, then the line-height should be 20"
- text run at (420,28) width 20: "px. "
- text run at (440,28) width 280: "The actual value of the font-size is UA-dependent. "
- text run at (720,28) width 34: "Extra"
- text run at (0,55) width 343: "text is included for the purposes of testing this more effectively."
+ RenderText {TEXT} at (55,33) size 35x26
+ text run at (55,33) width 35: "small"
+ RenderText {TEXT} at (90,28) size 753x53
+ text run at (90,28) width 104: " is calculated at 10"
+ text run at (194,28) width 199: "px, then the line-height should be 20"
+ text run at (393,28) width 20: "px. "
+ text run at (413,28) width 280: "The actual value of the font-size is UA-dependent. "
+ text run at (693,28) width 60: "Extra text"
+ text run at (0,55) width 317: "is included for the purposes of testing this more effectively."
RenderBlock {P} at (4,540) size 762x180
RenderText {TEXT} at (0,4) size 721x180
text run at (0,4) width 714: "This element should be in a sans-serif font, italicized and small caps,"
diff --git a/LayoutTests/css1/formatting_model/floating_elements-expected.txt b/LayoutTests/css1/formatting_model/floating_elements-expected.txt
index fcd2267..de03c24 100644
--- a/LayoutTests/css1/formatting_model/floating_elements-expected.txt
+++ b/LayoutTests/css1/formatting_model/floating_elements-expected.txt
@@ -61,19 +61,19 @@ layer at (0,0) size 800x6376
RenderBlock {HR} at (24,482) size 590x2 [bgcolor=#000000] [border: (1px inset #000000)]
RenderBlock {DIV} at (2,508) size 442x226 [bgcolor=#000000] [border: (5px solid #800080)]
RenderBlock (floating) {P} at (5,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
- RenderText {TEXT} at (17,17) size 144x36
- text run at (17,17) width 93: "This is the first"
- text run at (17,35) width 144: "left-floating paragraph."
+ RenderText {TEXT} at (17,17) size 122x36
+ text run at (17,17) width 122: "This is the first left-"
+ text run at (17,35) width 119: "floating paragraph."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (floating) {P} at (199,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
- RenderText {TEXT} at (17,17) size 144x36
- text run at (17,17) width 113: "This is the second"
- text run at (17,35) width 144: "left-floating paragraph."
+ RenderText {TEXT} at (17,17) size 142x36
+ text run at (17,17) width 142: "This is the second left-"
+ text run at (17,35) width 119: "floating paragraph."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (floating) {P} at (5,75) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
- RenderText {TEXT} at (17,17) size 144x36
- text run at (17,17) width 98: "This is the third"
- text run at (17,35) width 144: "left-floating paragraph."
+ RenderText {TEXT} at (17,17) size 127x36
+ text run at (17,17) width 127: "This is the third left-"
+ text run at (17,35) width 119: "floating paragraph."
RenderText {TEXT} at (393,5) size 430x216
text run at (393,5) width 42: "This is"
text run at (393,23) width 23: "text"
@@ -422,19 +422,19 @@ layer at (0,0) size 800x6376
RenderBlock {HR} at (28,304) size 573x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (6,330) size 442x226 [border: (5px solid #800080)]
RenderBlock (floating) {P} at (5,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
- RenderText {TEXT} at (17,17) size 144x36
- text run at (17,17) width 93: "This is the first"
- text run at (17,35) width 144: "left-floating paragraph."
+ RenderText {TEXT} at (17,17) size 122x36
+ text run at (17,17) width 122: "This is the first left-"
+ text run at (17,35) width 119: "floating paragraph."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (floating) {P} at (199,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
- RenderText {TEXT} at (17,17) size 144x36
- text run at (17,17) width 113: "This is the second"
- text run at (17,35) width 144: "left-floating paragraph."
+ RenderText {TEXT} at (17,17) size 142x36
+ text run at (17,17) width 142: "This is the second left-"
+ text run at (17,35) width 119: "floating paragraph."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (floating) {P} at (5,75) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
- RenderText {TEXT} at (17,17) size 144x36
- text run at (17,17) width 98: "This is the third"
- text run at (17,35) width 144: "left-floating paragraph."
+ RenderText {TEXT} at (17,17) size 127x36
+ text run at (17,17) width 127: "This is the third left-"
+ text run at (17,35) width 119: "floating paragraph."
RenderText {TEXT} at (393,5) size 430x216
text run at (393,5) width 42: "This is"
text run at (393,23) width 23: "text"
diff --git a/LayoutTests/css1/formatting_model/height_of_lines-expected.txt b/LayoutTests/css1/formatting_model/height_of_lines-expected.txt
index a3a7a6d..1d515b5 100644
--- a/LayoutTests/css1/formatting_model/height_of_lines-expected.txt
+++ b/LayoutTests/css1/formatting_model/height_of_lines-expected.txt
@@ -48,21 +48,21 @@ layer at (0,0) size 800x2295
text run at (288,240) width 32: "px;}"
RenderBlock {HR} at (0,317) size 784x2 [bgcolor=#000000] [border: (1px inset #000000)]
RenderBlock {P} at (0,333) size 784x442 [bgcolor=#000000]
- RenderText {TEXT} at (0,1) size 767x242
+ RenderText {TEXT} at (0,1) size 779x242
text run at (0,1) width 252: "This paragraph should have a font size of 14"
text run at (252,1) width 146: "px and a line height of 20"
text run at (398,1) width 22: "px. "
text run at (420,1) width 347: "This means that the lines of text within it should be separated"
text run at (0,21) width 374: "by six pixels, three of which are part of the line-box of each line. "
- text run at (374,21) width 375: "Any images within the paragraph should increase the height of the"
- text run at (0,223) width 296: "line-box so that they fit within the line box, such as "
- RenderImage {IMG} at (296,40) size 200x200
- RenderText {TEXT} at (496,223) size 28x20
- text run at (496,223) width 28: " and "
- RenderImage {IMG} at (524,222) size 200x200
- RenderText {TEXT} at (724,223) size 780x220
- text run at (724,223) width 8: ". "
- text run at (732,223) width 38: "This is"
+ text run at (374,21) width 405: "Any images within the paragraph should increase the height of the line-"
+ text run at (0,223) width 270: "box so that they fit within the line box, such as "
+ RenderImage {IMG} at (270,40) size 200x200
+ RenderText {TEXT} at (470,223) size 28x20
+ text run at (470,223) width 28: " and "
+ RenderImage {IMG} at (498,222) size 200x200
+ RenderText {TEXT} at (698,223) size 780x220
+ text run at (698,223) width 8: ". "
+ text run at (706,223) width 38: "This is"
text run at (0,423) width 780: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top aligned."
RenderBlock {P} at (0,789) size 784x482 [bgcolor=#000000]
RenderText {TEXT} at (0,1) size 770x202
diff --git a/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt b/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt
index b05cf57..dee7113 100644
--- a/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt
+++ b/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt
@@ -42,14 +42,14 @@ layer at (0,0) size 800x1012
RenderInline (anonymous) at (0,0) size 76x64 [color=#800000]
RenderText {TEXT} at (0,0) size 76x64
text run at (0,0) width 76: "\"W"
- RenderText {TEXT} at (76,36) size 762x82
+ RenderText {TEXT} at (76,36) size 782x82
text run at (76,36) width 337: "e should check for quotation support,\" it was said. "
- text run at (413,36) width 302: "The first two characters in this paragraph-- a"
- text run at (0,64) width 731: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). "
- text run at (731,64) width 31: "Note"
- text run at (0,82) width 718: "that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is"
- text run at (0,100) width 97: "recommended. "
- text run at (97,100) width 450: "In addition, the entire first line should be in a small-caps font and green."
+ text run at (413,36) width 356: "The first two characters in this paragraph-- a double-"
+ text run at (0,64) width 683: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). "
+ text run at (683,64) width 81: "Note that the"
+ text run at (0,82) width 769: "inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is recommended. "
+ text run at (769,82) width 13: "In"
+ text run at (0,100) width 433: "addition, the entire first line should be in a small-caps font and green."
RenderTable {TABLE} at (0,573) size 784x423 [bgcolor=#000000] [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 0x421
RenderTableRow {TR} at (0,0) size 0x0
diff --git a/LayoutTests/css1/text_properties/text_transform-expected.txt b/LayoutTests/css1/text_properties/text_transform-expected.txt
index a7aa592..30c650a 100644
--- a/LayoutTests/css1/text_properties/text_transform-expected.txt
+++ b/LayoutTests/css1/text_properties/text_transform-expected.txt
@@ -19,8 +19,8 @@ layer at (0,0) size 800x714
RenderBlock {P} at (0,174) size 784x54 [bgcolor=#000000]
RenderText {TEXT} at (0,0) size 778x54
text run at (0,0) width 778: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words That Are"
- text run at (0,18) width 657: "In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A"
- text run at (0,36) width 571: "Non-Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence."
+ text run at (0,18) width 694: "In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A Non-"
+ text run at (0,36) width 538: "Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence."
RenderBlock {P} at (0,244) size 784x36 [bgcolor=#000000]
RenderText {TEXT} at (0,0) size 753x36
text run at (0,0) width 753: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in this"
@@ -68,8 +68,8 @@ layer at (0,0) size 800x714
RenderBlock {P} at (4,56) size 762x54
RenderText {TEXT} at (0,0) size 750x54
text run at (0,0) width 750: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words That"
- text run at (0,18) width 685: "Are In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A"
- text run at (0,36) width 571: "Non-Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence."
+ text run at (0,18) width 722: "Are In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A Non-"
+ text run at (0,36) width 538: "Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence."
RenderBlock {P} at (4,126) size 762x36
RenderText {TEXT} at (0,0) size 753x36
text run at (0,0) width 753: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in this"
diff --git a/LayoutTests/css1/text_properties/vertical_align-expected.txt b/LayoutTests/css1/text_properties/vertical_align-expected.txt
index 9e5b325..d5331f7 100644
--- a/LayoutTests/css1/text_properties/vertical_align-expected.txt
+++ b/LayoutTests/css1/text_properties/vertical_align-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x4445
+layer at (0,0) size 800x4403
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x4445
- RenderBlock {HTML} at (0,0) size 800x4445
- RenderBody {BODY} at (8,8) size 784x4429 [bgcolor=#CCCCCC]
+layer at (0,0) size 800x4403
+ RenderBlock {HTML} at (0,0) size 800x4403
+ RenderBody {BODY} at (8,8) size 784x4387 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 784x18 [bgcolor=#000000]
RenderText {TEXT} at (0,0) size 355x18
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
@@ -141,7 +141,7 @@ layer at (0,0) size 800x4445
text run at (0,0) width 498: "In the following paragraph, all images should be aligned with the top of the 14-"
text run at (498,0) width 244: "point text, which is identical to the first"
text run at (0,18) width 661: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)."
- RenderBlock {P} at (0,1442) size 784x344 [bgcolor=#000000]
+ RenderBlock {P} at (0,1442) size 784x324 [bgcolor=#000000]
RenderText {TEXT} at (0,25) size 120x22
text run at (0,25) width 120: "This paragraph "
RenderImage {IMG} at (120,25) size 9x30
@@ -163,62 +163,63 @@ layer at (0,0) size 800x4445
RenderImage {IMG} at (742,25) size 3x10
RenderText {TEXT} at (745,25) size 5x22
text run at (745,25) width 5: " "
- RenderInline {SMALL} at (0,0) size 773x85
- RenderText {TEXT} at (750,28) size 773x85
+ RenderInline {SMALL} at (0,0) size 773x115
+ RenderText {TEXT} at (750,28) size 773x115
text run at (750,28) width 23: "and"
- text run at (0,95) width 42: "widths"
- RenderText {TEXT} at (42,92) size 5x22
- text run at (42,92) width 5: " "
- RenderImage {IMG} at (47,92) size 6x20
- RenderText {TEXT} at (53,92) size 101x22
- text run at (53,92) width 101: " all of which "
- RenderImage {IMG} at (154,92) size 19x65
- RenderText {TEXT} at (173,92) size 5x22
- text run at (173,92) width 5: " "
+ text run at (0,125) width 42: "widths"
+ RenderText {TEXT} at (42,122) size 5x22
+ text run at (42,122) width 5: " "
+ RenderImage {IMG} at (47,122) size 6x20
+ RenderText {TEXT} at (53,122) size 101x22
+ text run at (53,122) width 101: " all of which "
+ RenderImage {IMG} at (154,122) size 19x65
+ RenderText {TEXT} at (173,122) size 5x22
+ text run at (173,122) width 5: " "
RenderInline {SPAN} at (0,0) size 262x43
- RenderText {TEXT} at (178,75) size 262x43
- text run at (178,75) width 262: "should be aligned"
- RenderText {TEXT} at (440,92) size 5x22
- text run at (440,92) width 5: " "
- RenderImage {IMG} at (445,92) size 10x35
- RenderText {TEXT} at (455,92) size 123x22
- text run at (455,92) width 123: " with the top of "
- RenderImage {IMG} at (578,92) size 9x30
- RenderText {TEXT} at (587,92) size 5x22
- text run at (587,92) width 5: " "
- RenderInline {SPAN} at (0,0) size 604x144
- RenderText {TEXT} at (592,84) size 12x32
- text run at (592,84) width 12: "a"
- RenderInline {SPAN} at (0,0) size 236x82
- RenderText {TEXT} at (0,157) size 236x82
- text run at (0,157) width 236: "14-point"
- RenderText {TEXT} at (236,196) size 144x32
- text run at (236,196) width 144: " text element"
- RenderText {TEXT} at (380,204) size 5x22
- text run at (380,204) width 5: " "
- RenderImage {IMG} at (385,204) size 15x50
- RenderText {TEXT} at (400,204) size 5x22
- text run at (400,204) width 5: " "
+ RenderText {TEXT} at (178,105) size 262x43
+ text run at (178,105) width 262: "should be aligned"
+ RenderText {TEXT} at (440,122) size 5x22
+ text run at (440,122) width 5: " "
+ RenderImage {IMG} at (445,122) size 10x35
+ RenderText {TEXT} at (455,122) size 123x22
+ text run at (455,122) width 123: " with the top of "
+ RenderImage {IMG} at (578,122) size 9x30
+ RenderText {TEXT} at (587,122) size 5x22
+ text run at (587,122) width 5: " "
+ RenderInline {SPAN} at (0,0) size 704x144
+ RenderText {TEXT} at (592,114) size 19x32
+ text run at (592,114) width 19: "a "
+ RenderInline {SPAN} at (0,0) size 704x194
+ RenderText {TEXT} at (611,75) size 704x194
+ text run at (611,75) width 93: "14-"
+ text run at (0,187) width 143: "point"
+ RenderText {TEXT} at (143,226) size 144x32
+ text run at (143,226) width 144: " text element"
+ RenderText {TEXT} at (287,234) size 5x22
+ text run at (287,234) width 5: " "
+ RenderImage {IMG} at (292,234) size 15x50
+ RenderText {TEXT} at (307,234) size 5x22
+ text run at (307,234) width 5: " "
RenderInline {SMALL} at (0,0) size 189x18
- RenderText {TEXT} at (405,207) size 189x18
- text run at (405,207) width 189: "regardless of the line in which"
- RenderText {TEXT} at (594,204) size 5x22
- text run at (594,204) width 5: " "
- RenderImage {IMG} at (599,204) size 4x15
- RenderText {TEXT} at (603,204) size 5x22
- text run at (603,204) width 5: " "
+ RenderText {TEXT} at (312,237) size 189x18
+ text run at (312,237) width 189: "regardless of the line in which"
+ RenderText {TEXT} at (501,234) size 5x22
+ text run at (501,234) width 5: " "
+ RenderImage {IMG} at (506,234) size 4x15
+ RenderText {TEXT} at (510,234) size 5x22
+ text run at (510,234) width 5: " "
RenderInline {BIG} at (0,0) size 156x24
- RenderText {TEXT} at (608,202) size 156x24
- text run at (608,202) width 156: "the images appear."
- RenderText {TEXT} at (764,204) size 5x22
- text run at (764,204) width 5: " "
- RenderImage {IMG} at (0,254) size 27x90
+ RenderText {TEXT} at (515,232) size 156x24
+ text run at (515,232) width 156: "the images appear."
+ RenderText {TEXT} at (671,234) size 5x22
+ text run at (671,234) width 5: " "
+ RenderImage {IMG} at (676,234) size 27x90
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock {P} at (0,1804) size 784x36 [bgcolor=#000000]
+ RenderBlock {P} at (0,1784) size 784x36 [bgcolor=#000000]
RenderText {TEXT} at (0,0) size 749x36
text run at (0,0) width 749: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be"
text run at (0,18) width 362: "aligned with the text baseline (which is the default value)."
- RenderBlock {P} at (0,1856) size 784x230 [bgcolor=#000000]
+ RenderBlock {P} at (0,1836) size 784x230 [bgcolor=#000000]
RenderText {TEXT} at (0,22) size 99x18
text run at (0,22) width 99: "This paragraph "
RenderImage {IMG} at (99,17) size 9x30
@@ -285,12 +286,12 @@ layer at (0,0) size 800x4445
text run at (357,175) width 4: " "
RenderImage {IMG} at (361,140) size 27x90
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock {P} at (0,2102) size 784x36 [bgcolor=#000000]
+ RenderBlock {P} at (0,2082) size 784x36 [bgcolor=#000000]
RenderText {TEXT} at (0,0) size 733x36
text run at (0,0) width 733: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that"
text run at (0,18) width 173: "element is an image or not. "
text run at (173,18) width 555: "Each fragment of text has been SPANned appropriately in order to cause this to happen."
- RenderBlock {P} at (0,2154) size 784x201 [bgcolor=#000000]
+ RenderBlock {P} at (0,2134) size 784x201 [bgcolor=#000000]
RenderInline {SPAN} at (0,0) size 95x18
RenderText {TEXT} at (0,0) size 95x18
text run at (0,0) width 95: "This paragraph"
@@ -372,18 +373,18 @@ layer at (0,0) size 800x4445
text run at (171,111) width 4: " "
RenderImage {IMG} at (175,111) size 27x90
RenderText {TEXT} at (0,0) size 0x0
- RenderTable {TABLE} at (0,2371) size 784x2058 [bgcolor=#000000] [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 0x2056
+ RenderTable {TABLE} at (0,2351) size 784x2036 [bgcolor=#000000] [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 0x2034
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderInline {STRONG} at (0,0) size 163x18 [bgcolor=#000000]
RenderText {TEXT} at (4,4) size 163x18
text run at (4,4) width 163: "TABLE Testing Section"
RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (0,1028) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (0,1017) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderText {TEXT} at (4,4) size 4x18
text run at (4,4) width 4: " "
- RenderTableCell {TD} at (12,26) size 770x2030 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (12,26) size 770x2008 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderBlock {P} at (4,4) size 762x76
RenderImage {IMG} at (0,0) size 15x50
RenderInline {SPAN} at (0,0) size 126x18
@@ -488,7 +489,7 @@ layer at (0,0) size 800x4445
text run at (0,0) width 498: "In the following paragraph, all images should be aligned with the top of the 14-"
text run at (498,0) width 244: "point text, which is identical to the first"
text run at (0,18) width 661: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)."
- RenderBlock {P} at (4,1111) size 762x346
+ RenderBlock {P} at (4,1111) size 762x324
RenderText {TEXT} at (0,25) size 120x22
text run at (0,25) width 120: "This paragraph "
RenderImage {IMG} at (120,25) size 9x30
@@ -510,61 +511,61 @@ layer at (0,0) size 800x4445
RenderImage {IMG} at (742,25) size 3x10
RenderText {TEXT} at (0,0) size 0x0
RenderInline {SMALL} at (0,0) size 69x18
- RenderText {TEXT} at (0,95) size 69x18
- text run at (0,95) width 69: "and widths"
- RenderText {TEXT} at (69,92) size 5x22
- text run at (69,92) width 5: " "
- RenderImage {IMG} at (74,92) size 6x20
- RenderText {TEXT} at (80,92) size 101x22
- text run at (80,92) width 101: " all of which "
- RenderImage {IMG} at (181,92) size 19x65
- RenderText {TEXT} at (200,92) size 5x22
- text run at (200,92) width 5: " "
+ RenderText {TEXT} at (0,125) size 69x18
+ text run at (0,125) width 69: "and widths"
+ RenderText {TEXT} at (69,122) size 5x22
+ text run at (69,122) width 5: " "
+ RenderImage {IMG} at (74,122) size 6x20
+ RenderText {TEXT} at (80,122) size 101x22
+ text run at (80,122) width 101: " all of which "
+ RenderImage {IMG} at (181,122) size 19x65
+ RenderText {TEXT} at (200,122) size 5x22
+ text run at (200,122) width 5: " "
RenderInline {SPAN} at (0,0) size 262x43
- RenderText {TEXT} at (205,75) size 262x43
- text run at (205,75) width 262: "should be aligned"
- RenderText {TEXT} at (467,92) size 5x22
- text run at (467,92) width 5: " "
- RenderImage {IMG} at (472,92) size 10x35
- RenderText {TEXT} at (482,92) size 123x22
- text run at (482,92) width 123: " with the top of "
- RenderImage {IMG} at (605,92) size 9x30
- RenderText {TEXT} at (614,92) size 5x22
- text run at (614,92) width 5: " "
- RenderInline {SPAN} at (0,0) size 631x144
- RenderText {TEXT} at (619,84) size 12x32
- text run at (619,84) width 12: "a"
- RenderInline {SPAN} at (0,0) size 236x82
- RenderText {TEXT} at (0,157) size 236x82
- text run at (0,157) width 236: "14-point"
- RenderText {TEXT} at (236,196) size 144x32
- text run at (236,196) width 144: " text element"
- RenderText {TEXT} at (380,204) size 5x22
- text run at (380,204) width 5: " "
- RenderImage {IMG} at (385,204) size 15x50
- RenderText {TEXT} at (400,204) size 5x22
- text run at (400,204) width 5: " "
+ RenderText {TEXT} at (205,105) size 262x43
+ text run at (205,105) width 262: "should be aligned"
+ RenderText {TEXT} at (467,122) size 5x22
+ text run at (467,122) width 5: " "
+ RenderImage {IMG} at (472,122) size 10x35
+ RenderText {TEXT} at (482,122) size 123x22
+ text run at (482,122) width 123: " with the top of "
+ RenderImage {IMG} at (605,122) size 9x30
+ RenderText {TEXT} at (614,122) size 5x22
+ text run at (614,122) width 5: " "
+ RenderInline {SPAN} at (0,0) size 731x144
+ RenderText {TEXT} at (619,114) size 19x32
+ text run at (619,114) width 19: "a "
+ RenderInline {SPAN} at (0,0) size 731x194
+ RenderText {TEXT} at (638,75) size 731x194
+ text run at (638,75) width 93: "14-"
+ text run at (0,187) width 143: "point"
+ RenderText {TEXT} at (143,226) size 144x32
+ text run at (143,226) width 144: " text element"
+ RenderText {TEXT} at (287,234) size 5x22
+ text run at (287,234) width 5: " "
+ RenderImage {IMG} at (292,234) size 15x50
+ RenderText {TEXT} at (307,234) size 5x22
+ text run at (307,234) width 5: " "
RenderInline {SMALL} at (0,0) size 189x18
- RenderText {TEXT} at (405,207) size 189x18
- text run at (405,207) width 189: "regardless of the line in which"
- RenderText {TEXT} at (594,204) size 5x22
- text run at (594,204) width 5: " "
- RenderImage {IMG} at (599,204) size 4x15
- RenderText {TEXT} at (603,204) size 5x22
- text run at (603,204) width 5: " "
- RenderInline {BIG} at (0,0) size 698x76
- RenderText {TEXT} at (608,202) size 698x76
- text run at (608,202) width 90: "the images"
- text run at (0,254) width 61: "appear."
- RenderText {TEXT} at (61,256) size 5x22
- text run at (61,256) width 5: " "
- RenderImage {IMG} at (66,256) size 27x90
+ RenderText {TEXT} at (312,237) size 189x18
+ text run at (312,237) width 189: "regardless of the line in which"
+ RenderText {TEXT} at (501,234) size 5x22
+ text run at (501,234) width 5: " "
+ RenderImage {IMG} at (506,234) size 4x15
+ RenderText {TEXT} at (510,234) size 5x22
+ text run at (510,234) width 5: " "
+ RenderInline {BIG} at (0,0) size 156x24
+ RenderText {TEXT} at (515,232) size 156x24
+ text run at (515,232) width 156: "the images appear."
+ RenderText {TEXT} at (671,234) size 5x22
+ text run at (671,234) width 5: " "
+ RenderImage {IMG} at (676,234) size 27x90
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock {P} at (4,1475) size 762x36
+ RenderBlock {P} at (4,1453) size 762x36
RenderText {TEXT} at (0,0) size 749x36
text run at (0,0) width 749: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be"
text run at (0,18) width 362: "aligned with the text baseline (which is the default value)."
- RenderBlock {P} at (4,1527) size 762x230
+ RenderBlock {P} at (4,1505) size 762x230
RenderText {TEXT} at (0,22) size 99x18
text run at (0,22) width 99: "This paragraph "
RenderImage {IMG} at (99,17) size 9x30
@@ -634,12 +635,12 @@ layer at (0,0) size 800x4445
text run at (458,175) width 4: " "
RenderImage {IMG} at (462,140) size 27x90
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock {P} at (4,1773) size 762x36
+ RenderBlock {P} at (4,1751) size 762x36
RenderText {TEXT} at (0,0) size 733x36
text run at (0,0) width 733: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that"
text run at (0,18) width 173: "element is an image or not. "
text run at (173,18) width 555: "Each fragment of text has been SPANned appropriately in order to cause this to happen."
- RenderBlock {P} at (4,1825) size 762x201
+ RenderBlock {P} at (4,1803) size 762x201
RenderInline {SPAN} at (0,0) size 95x18
RenderText {TEXT} at (0,0) size 95x18
text run at (0,0) width 95: "This paragraph"
diff --git a/LayoutTests/fast/flexbox/020-expected.txt b/LayoutTests/fast/flexbox/020-expected.txt
index 4701406..58e1b86 100644
--- a/LayoutTests/fast/flexbox/020-expected.txt
+++ b/LayoutTests/fast/flexbox/020-expected.txt
@@ -4,12 +4,12 @@ layer at (0,0) size 800x168
RenderBlock {HTML} at (0,0) size 800x168
RenderBody {BODY} at (8,8) size 784x152
RenderBlock {P} at (0,0) size 784x36
- RenderText {TEXT} at (0,0) size 691x36
+ RenderText {TEXT} at (0,0) size 753x36
text run at (0,0) width 137: "You should see a 100"
text run at (137,0) width 167: "x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
- text run at (541,0) width 150: "This test is checking for"
- text run at (0,18) width 150: "box-flex-group support."
+ text run at (541,0) width 212: "This test is checking for box-flex-"
+ text run at (0,18) width 92: "group support."
RenderFlexibleBox {DIV} at (0,52) size 100x100 [bgcolor=#FF0000]
RenderFlexibleBox {DIV} at (0,0) size 100x100 [bgcolor=#008000]
RenderFlexibleBox {DIV} at (100,0) size 0x100
diff --git a/LayoutTests/fast/lists/003-expected.txt b/LayoutTests/fast/lists/003-expected.txt
index 366e78a..6992330 100644
--- a/LayoutTests/fast/lists/003-expected.txt
+++ b/LayoutTests/fast/lists/003-expected.txt
@@ -5,21 +5,22 @@ layer 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 411x18
- text run at (0,0) width 411: "This test case illustrates incorrect positioning of list items within a"
- RenderInline {CODE} at (0,0) size 136x15
- RenderText {TEXT} at (0,20) size 136x15
- text run at (0,20) width 136: "text-align: right"
- RenderText {TEXT} at (136,18) size 71x18
- text run at (136,18) width 71: " div after a "
+ 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 (207,20) size 88x15
- text run at (207,20) width 88: "float: left"
- RenderText {TEXT} at (295,18) size 32x18
- text run at (295,18) width 32: " div. "
- RenderInline {A} at (0,0) size 460x36 [color=#0000EE]
- RenderText {TEXT} at (327,18) size 460x36
- text run at (327,18) width 133: "Screenshot of correct"
+ 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: "; "
diff --git a/LayoutTests/fast/lists/007-expected.txt b/LayoutTests/fast/lists/007-expected.txt
index 6502398..d1432e6 100644
--- a/LayoutTests/fast/lists/007-expected.txt
+++ b/LayoutTests/fast/lists/007-expected.txt
@@ -10,8 +10,8 @@ layer at (0,0) size 800x96
text run at (0,0) width 715: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test."
RenderListItem {LI} at (50,18) size 734x54 [bgcolor=#FFFFFF] [border: (25px solid #008000)]
RenderListMarker at (50,0) size 0x14 [bgcolor=#000000]
- RenderText {TEXT} at (50,0) size 675x54
- text run at (50,0) width 604: "Another list item might not be such a bad idea, either, considering that such things do need to be"
- text run at (50,18) width 108: "double-checked. "
- text run at (158,18) width 567: "This list item has its left padding also set to 25 pixels, which should combine with the list's"
- text run at (50,36) width 235: "padding to make 50 pixels of margin."
+ RenderText {TEXT} at (50,0) size 682x54
+ text run at (50,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-"
+ text run at (50,18) width 60: "checked. "
+ text run at (110,18) width 622: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding"
+ text run at (50,36) width 180: "to make 50 pixels of margin."
diff --git a/LayoutTests/fast/table/021-expected.txt b/LayoutTests/fast/table/021-expected.txt
index c5abf0d..5ca7c38 100644
--- a/LayoutTests/fast/table/021-expected.txt
+++ b/LayoutTests/fast/table/021-expected.txt
@@ -1,14 +1,15 @@
layer at (0,0) size 800x600
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x40
- RenderBlock {HTML} at (0,0) size 800x40
- RenderBody {BODY} at (8,8) size 784x24
- RenderTable {TABLE} at (0,0) size 182x24
- RenderTableSection {TBODY} at (0,0) size 0x24
+layer at (0,0) size 800x58
+ RenderBlock {HTML} at (0,0) size 800x58
+ RenderBody {BODY} at (8,8) size 784x42
+ RenderTable {TABLE} at (0,0) size 153x42
+ RenderTableSection {TBODY} at (0,0) size 0x42
RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (2,2) size 78x20 [r=0 c=0 rs=1 cs=1]
- RenderText {TEXT} at (1,1) size 76x18
- text run at (1,1) width 76: "first-column"
- RenderTableCell {TD} at (82,2) size 98x20 [bgcolor=#BBBBBB] [r=0 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (2,2) size 49x38 [r=0 c=0 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 47x36
+ text run at (1,1) width 29: "first-"
+ text run at (1,19) width 47: "column"
+ RenderTableCell {TD} at (53,11) size 98x20 [bgcolor=#BBBBBB] [r=0 c=1 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 96x18
text run at (1,1) width 96: "second-column"
diff --git a/LayoutTests/fast/table/border-collapsing/004-expected.txt b/LayoutTests/fast/table/border-collapsing/004-expected.txt
index 3e297d9..e1fefbf 100644
--- a/LayoutTests/fast/table/border-collapsing/004-expected.txt
+++ b/LayoutTests/fast/table/border-collapsing/004-expected.txt
@@ -106,11 +106,11 @@ layer at (0,0) size 800x1438
text run at (6,24) width 110: "separated borders"
text run at (6,42) width 43: "model."
RenderTableCell {TD} at (198,66) size 196x66 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
- RenderText {TEXT} at (6,6) size 158x54
+ RenderText {TEXT} at (6,6) size 173x54
text run at (6,6) width 158: "This means that elements"
- text run at (6,24) width 123: "within the cell have"
- text run at (6,42) width 123: "border-spacing of 1"
- text run at (129,42) width 23: "em."
+ text run at (6,24) width 173: "within the cell have border-"
+ text run at (6,42) width 77: "spacing of 1"
+ text run at (83,42) width 23: "em."
RenderTableCell {TD} at (410,75) size 320x48 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
RenderText {TEXT} at (6,6) size 279x36
text run at (6,6) width 205: "The borders on the header cells, "
@@ -225,8 +225,9 @@ layer at (0,0) size 800x1438
text run at (6,6) width 185: "Elements within the cell have"
text run at (6,24) width 178: "horizontal border-spacing of"
text run at (6,42) width 20: "0.5"
- text run at (26,42) width 96: "em and vertical"
- text run at (6,60) width 127: "border-spacing of 0."
+ text run at (26,42) width 100: "em and vertical "
+ text run at (126,42) width 46: "border-"
+ text run at (6,60) width 81: "spacing of 0."
RenderTableCell {TD} at (438,52) size 300x48 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
RenderText {TEXT} at (6,6) size 279x36
text run at (6,6) width 205: "The borders on the header cells, "
diff --git a/LayoutTests/fast/text/whitespace/027-expected.txt b/LayoutTests/fast/text/whitespace/027-expected.txt
index e3d84f6..2e37ac0 100644
--- a/LayoutTests/fast/text/whitespace/027-expected.txt
+++ b/LayoutTests/fast/text/whitespace/027-expected.txt
@@ -1,18 +1,28 @@
layer at (0,0) size 800x600
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x318
- RenderBlock {HTML} at (0,0) size 800x318
- RenderBody {BODY} at (8,8) size 784x302
- RenderTable {TABLE} at (0,0) size 784x28
- RenderTableSection {TBODY} at (0,0) size 0x28
+layer at (0,0) size 800x498
+ RenderBlock {HTML} at (0,0) size 800x498
+ RenderBody {BODY} at (8,8) size 784x482
+ RenderTable {TABLE} at (0,0) size 784x208
+ RenderTableSection {TBODY} at (0,0) size 0x208
RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (2,2) size 729x24 [r=0 c=0 rs=1 cs=1]
- RenderBlock (floating) {DIV} at (1,1) size 727x22 [border: (2px solid #FF0000)]
- RenderText {TEXT} at (2,2) size 723x18
- text run at (2,2) width 723: "Here-is-some-info-from-the-complaints-department-some-info-from-the-complaints-department-some-info-from-the"
+ RenderTableCell {TD} at (2,2) size 81x204 [r=0 c=0 rs=1 cs=1]
+ RenderBlock (floating) {DIV} at (1,1) size 79x202 [border: (2px solid #FF0000)]
+ RenderText {TEXT} at (2,2) size 75x198
+ text run at (2,2) width 51: "Here-is-"
+ text run at (2,20) width 68: "some-info-"
+ text run at (2,38) width 59: "from-the-"
+ text run at (2,56) width 73: "complaints-"
+ text run at (2,74) width 75: "department-"
+ text run at (2,92) width 68: "some-info-"
+ text run at (2,110) width 59: "from-the-"
+ text run at (2,128) width 73: "complaints-"
+ text run at (2,146) width 75: "department-"
+ text run at (2,164) width 68: "some-info-"
+ text run at (2,182) width 54: "from-the"
RenderText {TEXT} at (0,0) size 0x0
- RenderTableCell {TD} at (733,13) size 49x2 [r=0 c=1 rs=1 cs=1]
- RenderTable {TABLE} at (0,28) size 784x208
+ RenderTableCell {TD} at (85,103) size 697x2 [r=0 c=1 rs=1 cs=1]
+ RenderTable {TABLE} at (0,208) size 784x208
RenderTableSection {TBODY} at (0,0) size 0x208
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (2,2) size 76x204 [r=0 c=0 rs=1 cs=1]
@@ -31,7 +41,7 @@ layer at (0,0) size 800x318
text run at (2,182) width 53: "from the"
RenderText {TEXT} at (0,0) size 0x0
RenderTableCell {TD} at (80,103) size 702x2 [r=0 c=1 rs=1 cs=1]
- RenderTable {TABLE} at (0,236) size 784x66 [border: (2px outset #808080)]
+ RenderTable {TABLE} at (0,416) size 784x66 [border: (2px outset #808080)]
RenderTableSection {TBODY} at (2,2) size 0x62
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (2,2) size 573x58 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list