[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:04:19 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e8ccb76852071a6b0ae8e96f4dc81fa63905a4ab
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 23 00:27:15 2003 +0000
Updated to account for change in metrics
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5243 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/css1/box_properties/acid_test-expected.txt b/LayoutTests/css1/box_properties/acid_test-expected.txt
index 71e6b82..c8c9c8c 100644
--- a/LayoutTests/css1/box_properties/acid_test-expected.txt
+++ b/LayoutTests/css1/box_properties/acid_test-expected.txt
@@ -21,18 +21,18 @@ layer at (0,0) size 800x420
RenderBlock (anonymous) at (10,20) size 139x0 [bgcolor=#000000]
RenderInline {FORM} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (anonymous) at (10,20) size 139x40 [bgcolor=#000000]
- RenderBlock {P} at (0,0) size 139x20
+ RenderBlock (anonymous) at (10,20) size 139x38 [bgcolor=#000000]
+ RenderBlock {P} at (0,0) size 139x19
RenderText {TEXT} at (0,4) size 28x18
text run at (0,4) width 28: "bang "
RenderRadioButton {INPUT} at (31,3) size 12x13 [color=#000000]
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock {P} at (0,20) size 139x20
+ RenderBlock {P} at (0,19) size 139x19
RenderText {TEXT} at (0,4) size 47x18
text run at (0,4) width 47: "whimper "
RenderRadioButton {INPUT} at (50,3) size 12x13 [color=#000000]
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (anonymous) at (10,60) size 139x0 [bgcolor=#000000]
+ RenderBlock (anonymous) at (10,58) size 139x0 [bgcolor=#000000]
RenderInline {FORM} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0 [bgcolor=#000000]
RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css1/font_properties/font-expected.txt b/LayoutTests/css1/font_properties/font-expected.txt
index 71fc46d..ca2acf4 100644
--- a/LayoutTests/css1/font_properties/font-expected.txt
+++ b/LayoutTests/css1/font_properties/font-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x3822
+layer at (0,0) size 800x3824
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x3822
- RenderBlock {HTML} at (0,0) size 800x3822
- RenderBody {BODY} at (8,8) size 784x3806 [bgcolor=#CCCCCC]
+layer at (0,0) size 800x3824
+ RenderBlock {HTML} at (0,0) size 800x3824
+ RenderBody {BODY} at (8,8) size 784x3808 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 784x15 [bgcolor=#000000]
RenderText {TEXT} at (0,0) size 336x15
text run at (0,0) width 336: "The style declarations which apply to the text below are:"
@@ -33,9 +33,9 @@ layer at (0,0) size 800x3822
text run at (531,0) width 240: "This is the \"base font size\" referred to in"
text run at (0,15) width 113: "the following tests."
RenderBlock {P} at (0,268) size 784x20 [bgcolor=#000000]
- RenderText {TEXT} at (0,0) size 487x20
- text run at (0,0) width 188: "This element should be 13"
- text run at (188,0) width 299: "pt. Helvetica which is in small-cap italics."
+ RenderText {TEXT} at (0,0) size 497x20
+ text run at (0,0) width 192: "This element should be 13"
+ text run at (192,0) width 305: "pt. Helvetica which is in small-cap italics."
RenderBlock {P} at (0,306) size 784x81 [bgcolor=#000000]
RenderText {TEXT} at (0,3) size 773x81
text run at (0,3) width 282: "This element should be in a serif font. "
@@ -46,66 +46,66 @@ layer at (0,0) size 800x3822
text run at (423,30) width 350: "Extra text is included for the purposes of testing"
text run at (0,57) width 155: "this more effectively."
RenderBlock {P} at (0,405) size 784x81 [bgcolor=#000000]
- RenderText {TEXT} at (0,2) size 775x81
- text run at (0,2) width 395: "This element should be in a sans-serif font. "
- text run at (395,2) width 379: "Its font-size should be 150% the base font"
- text run at (0,29) width 483: "size, and its line-height should 150% of that value (18"
- text run at (483,29) width 91: "px and 27"
- text run at (574,29) width 156: "px, respectively). "
- text run at (730,29) width 45: "Extra"
- text run at (0,56) width 573: "text is included for the purposes of testing this more effectively."
- RenderBlock {P} at (0,504) size 784x48 [bgcolor=#000000]
- RenderText {TEXT} at (0,4) size 604x24
- text run at (0,4) width 462: "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 (462,4) width 142: "For example, if the font-size value "
+ RenderText {TEXT} at (0,3) size 775x81
+ text run at (0,3) width 395: "This element should be in a sans-serif font. "
+ text run at (395,3) width 379: "Its font-size should be 150% the base font"
+ text run at (0,30) width 483: "size, and its line-height should 150% of that value (18"
+ text run at (483,30) width 91: "px and 27"
+ text run at (574,30) width 156: "px, respectively). "
+ text run at (730,30) width 45: "Extra"
+ text run at (0,57) width 573: "text is included for the purposes of testing this more effectively."
+ RenderBlock {P} at (0,504) size 784x49 [bgcolor=#000000]
+ RenderText {TEXT} at (0,5) size 604x24
+ text run at (0,5) width 462: "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 (462,5) width 142: "For example, if the font-size value "
RenderInline {CODE} at (0,0) size 35x14
- RenderText {TEXT} at (604,4) size 35x24
- text run at (604,4) width 35: "small"
- RenderText {TEXT} at (639,4) size 760x48
- text run at (639,4) width 76: " is calculated at 10"
- text run at (715,4) width 45: "px, then the"
- text run at (0,28) width 95: "line-height should be 20"
- text run at (95,28) width 16: "px. "
- text run at (111,28) width 209: "The actual value of the font-size is UA-dependent. "
- text run at (320,28) width 277: "Extra text is included for the purposes of testing this more effectively."
- RenderBlock {P} at (0,570) size 784x81 [bgcolor=#000000]
- RenderText {TEXT} at (0,2) size 770x81
- text run at (0,2) width 697: "This element should be in a sans-serif font, italicized and small caps, with a weight of 900. "
- text run at (697,2) width 21: "Its"
- text run at (0,29) width 722: "font-size should be 150% the base font size, and its line-height should be 150% of that value (18"
- text run at (722,29) width 48: "px and"
- text run at (0,56) width 146: "27px, respectively). "
- text run at (146,56) width 558: "Extra text is included for the purposes of testing this more effectively."
- RenderBlock {P} at (0,669) size 784x162 [bgcolor=#000000]
- RenderText {TEXT} at (0,16) size 777x162
- text run at (0,16) width 684: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. "
- text run at (684,16) width 93: "Its font-size"
- text run at (0,70) width 639: "should be 150% the base font size, and its line-height should be 300% of that value (18"
- text run at (639,70) width 66: "px and 54"
- text run at (705,70) width 20: "px,"
- text run at (0,124) width 106: "respectively). "
- text run at (106,124) width 555: "Extra text is included for the purposes of testing this more effectively."
- RenderBlock {P} at (0,849) size 784x144 [bgcolor=#000000]
- RenderText {TEXT} at (0,7) size 779x144
- text run at (0,7) width 744: "This element should be in a monospace font, italicized and small caps, with a weight of"
- text run at (0,43) width 43: "900. "
- text run at (43,43) width 685: "Its font-size should be 150% the base font size, and its line-height should be 2"
- text run at (728,43) width 51: "em, or"
- text run at (0,79) width 279: "twice the element's font size (18"
- text run at (279,79) width 78: "px and 36"
- text run at (357,79) width 158: "px, respectively). "
- text run at (515,79) width 258: "Extra text is included for the"
- text run at (0,115) width 351: "purposes of testing this more effectively."
- RenderBlock {P} at (0,1011) size 784x288 [bgcolor=#000000]
- RenderText {TEXT} at (0,37) size 777x288
- text run at (0,37) width 684: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500. "
- text run at (684,37) width 93: "Its font-size"
- text run at (0,133) width 297: "should be 150% the base font size, or 18"
- text run at (297,133) width 251: "px, and its line-height should be 1"
- text run at (548,133) width 22: "in. "
- text run at (570,133) width 200: "Extra text is included for"
- text run at (0,229) width 350: "the purposes of testing this more effectively."
- RenderBlock {P} at (0,1317) size 784x108 [bgcolor=#000000]
+ RenderText {TEXT} at (604,5) size 35x24
+ text run at (604,5) width 35: "small"
+ RenderText {TEXT} at (639,5) size 760x48
+ text run at (639,5) width 76: " is calculated at 10"
+ text run at (715,5) width 45: "px, then the"
+ text run at (0,29) width 95: "line-height should be 20"
+ text run at (95,29) width 16: "px. "
+ text run at (111,29) width 209: "The actual value of the font-size is UA-dependent. "
+ text run at (320,29) width 277: "Extra text is included for the purposes of testing this more effectively."
+ RenderBlock {P} at (0,571) size 784x81 [bgcolor=#000000]
+ RenderText {TEXT} at (0,3) size 779x81
+ 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."
+ RenderBlock {P} at (0,670) size 784x162 [bgcolor=#000000]
+ RenderText {TEXT} at (0,16) size 768x162
+ 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."
+ RenderBlock {P} at (0,850) 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"
+ text run at (0,43) width 55: "900. "
+ text run at (55,43) width 687: "Its font-size should be 150% the base font size, and its line-height should be"
+ text run at (0,79) width 367: "2em, or twice the element's font size (18"
+ text run at (367,79) width 84: "px and 36"
+ text run at (451,79) width 167: "px, respectively). "
+ 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,1012) size 784x288 [bgcolor=#000000]
+ RenderText {TEXT} at (0,37) size 771x288
+ 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 (0,229) width 452: "included for the purposes of testing this more effectively."
+ RenderBlock {P} at (0,1318) size 784x108 [bgcolor=#000000]
RenderText {TEXT} at (0,7) size 774x108
text run at (0,7) width 752: "This element should be in a sans-serif font, oblique and not small-caps, with a weight of"
text run at (0,43) width 40: "700. "
@@ -113,7 +113,7 @@ layer at (0,0) size 800x3822
text run at (590,43) width 115: "px (200% this"
text run at (0,79) width 176: "element's font size). "
text run at (176,79) width 598: "Extra text is included for the purposes of testing this more effectively."
- RenderBlock {P} at (0,1443) size 784x50 [bgcolor=#000000]
+ RenderBlock {P} at (0,1444) size 784x50 [bgcolor=#000000]
RenderText {TEXT} at (0,6) size 778x50
text run at (0,6) width 327: "This element should be in a sans-serif font, with a weight of 400. "
text run at (327,6) width 163: "Its font-size should be 80% of 12"
@@ -122,29 +122,29 @@ layer at (0,0) size 800x3822
text run at (0,31) width 27: "or 24"
text run at (27,31) width 20: "px. "
text run at (47,31) width 345: "Extra text is included for the purposes of testing this more effectively."
- RenderBlock {P} at (0,1511) size 784x216 [bgcolor=#000000]
- RenderInline {SPAN} at (0,0) size 777x183 [bgcolor=#C0C0C0]
- RenderText {TEXT} at (0,16) size 777x216
- text run at (0,16) width 684: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. "
- text run at (684,16) width 93: "Its font-size"
- text run at (0,70) width 639: "should be 150% the base font size, and its line-height should be 300% of that value (18"
- text run at (639,70) width 66: "px and 54"
- text run at (705,70) width 20: "px,"
- text run at (0,124) width 746: "respectively). The text should have a silver background. The background color has been set on an"
- text run at (0,178) width 631: "inline element and should therefore only cover the text, not the interline spacing."
+ RenderBlock {P} at (0,1512) size 784x216 [bgcolor=#000000]
+ RenderInline {SPAN} at (0,0) size 781x183 [bgcolor=#C0C0C0]
+ RenderText {TEXT} at (0,16) size 781x216
+ 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."
RenderText {TEXT} at (0,0) size 0x0
- RenderTable {TABLE} at (0,1745) size 784x2061 [bgcolor=#000000]
- RenderTableSection {TBODY} at (1,1) size 0x2059
+ RenderTable {TABLE} at (0,1746) size 784x2062 [bgcolor=#000000]
+ RenderTableSection {TBODY} at (1,1) size 0x2060
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [r=0 c=0 rs=1 cs=2]
RenderInline {STRONG} at (0,0) size 164x17 [bgcolor=#000000]
RenderText {TEXT} at (4,4) size 164x17
text run at (4,4) width 164: "TABLE Testing Section"
RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (0,1029) size 12x25 [bgcolor=#C0C0C0] [r=1 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (0,1030) size 12x25 [bgcolor=#C0C0C0] [r=1 c=0 rs=1 cs=1]
RenderText {TEXT} at (4,4) size 4x17
text run at (4,4) width 4: " "
- RenderTableCell {TD} at (12,25) size 770x2034 [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (12,25) size 770x2035 [r=1 c=1 rs=1 cs=1]
RenderBlock {P} at (4,4) size 762x34
RenderText {TEXT} at (0,0) size 755x34
text run at (0,0) width 419: "This element is unstyled, and should inherit a font-size of 12"
@@ -152,9 +152,9 @@ layer at (0,0) size 800x3822
text run at (611,0) width 144: "This is the \"base font"
text run at (0,17) width 262: "size\" referred to in the following tests."
RenderBlock {P} at (4,55) size 762x20
- RenderText {TEXT} at (0,0) size 487x20
- text run at (0,0) width 188: "This element should be 13"
- text run at (188,0) width 299: "pt. Helvetica which is in small-cap italics."
+ RenderText {TEXT} at (0,0) size 497x20
+ text run at (0,0) width 192: "This element should be 13"
+ text run at (192,0) width 305: "pt. Helvetica which is in small-cap italics."
RenderBlock {P} at (4,96) size 762x93
RenderText {TEXT} at (0,3) size 759x93
text run at (0,3) width 325: "This element should be in a serif font. "
@@ -174,63 +174,62 @@ layer at (0,0) size 800x3822
text run at (72,65) width 183: "px, respectively). "
text run at (255,65) width 505: "Extra text is included for the purposes of testing"
text run at (0,96) width 216: "this more effectively."
- RenderBlock {P} at (4,355) size 762x48
- RenderText {TEXT} at (0,4) size 604x24
- text run at (0,4) width 462: "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 (462,4) width 142: "For example, if the font-size value "
+ RenderBlock {P} at (4,355) size 762x49
+ RenderText {TEXT} at (0,5) size 604x24
+ text run at (0,5) width 462: "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 (462,5) width 142: "For example, if the font-size value "
RenderInline {CODE} at (0,0) size 35x14
- RenderText {TEXT} at (604,4) size 35x24
- text run at (604,4) width 35: "small"
- RenderText {TEXT} at (639,4) size 760x48
- text run at (639,4) width 76: " is calculated at 10"
- text run at (715,4) width 45: "px, then the"
- text run at (0,28) width 95: "line-height should be 20"
- text run at (95,28) width 16: "px. "
- text run at (111,28) width 209: "The actual value of the font-size is UA-dependent. "
- text run at (320,28) width 277: "Extra text is included for the purposes of testing this more effectively."
- RenderBlock {P} at (4,424) size 762x124
- RenderText {TEXT} at (0,3) size 758x124
- text run at (0,3) width 758: "This element should be in a sans-serif font, italicized and small caps, with a weight"
- text run at (0,34) width 60: "of 900. "
- text run at (60,34) width 686: "Its font-size should be 150% the base font size, and its line-height should be"
- text run at (0,65) width 193: "150% of that value (18"
- text run at (193,65) width 81: "px and 27"
- text run at (274,65) width 159: "px, respectively). "
- text run at (433,65) width 276: "Extra text is included for the"
- text run at (0,96) width 380: "purposes of testing this more effectively."
- RenderBlock {P} at (4,569) size 762x252
- RenderText {TEXT} at (0,19) size 745x252
- text run at (0,19) width 745: "This element should be in a sans-serif font, italicized and small caps, with a weight"
- text run at (0,82) width 60: "of 100. "
- text run at (60,82) width 678: "Its font-size should be 150% the base font size, and its line-height should be"
- text run at (0,145) width 190: "300% of that value (18"
- text run at (190,145) width 80: "px and 54"
- text run at (270,145) width 158: "px, respectively). "
- text run at (428,145) width 274: "Extra text is included for the"
- text run at (0,208) width 379: "purposes of testing this more effectively."
- RenderBlock {P} at (4,842) size 762x210
- RenderText {TEXT} at (0,8) size 749x210
- text run at (0,8) width 749: "This element should be in a monospace font, italicized and small caps, with a"
- text run at (0,50) width 147: "weight of 900. "
- text run at (147,50) width 548: "Its font-size should be 150% the base font size, and its"
- text run at (0,92) width 219: "line-height should be 2"
- text run at (219,92) width 388: "em, or twice the element's font size (18"
- text run at (607,92) width 89: "px and 36"
- text run at (696,92) width 27: "px,"
- text run at (0,134) width 139: "respectively). "
- text run at (139,134) width 584: "Extra text is included for the purposes of testing this more"
- text run at (0,176) width 108: "effectively."
- RenderBlock {P} at (4,1073) size 762x384
- RenderText {TEXT} at (0,35) size 745x384
- text run at (0,35) width 745: "This element should be in a sans-serif font, italicized and small caps, with a weight"
- text run at (0,131) width 60: "of 500. "
- text run at (60,131) width 467: "Its font-size should be 150% the base font size, or 18"
- text run at (527,131) width 191: "px, and its line-height"
- text run at (0,227) width 102: "should be 1"
- text run at (102,227) width 25: "in. "
- text run at (127,227) width 549: "Extra text is included for the purposes of testing this more"
- text run at (0,323) width 104: "effectively."
- RenderBlock {P} at (4,1478) size 762x144
+ RenderText {TEXT} at (604,5) size 35x24
+ text run at (604,5) width 35: "small"
+ RenderText {TEXT} at (639,5) size 760x48
+ text run at (639,5) width 76: " is calculated at 10"
+ text run at (715,5) width 45: "px, then the"
+ text run at (0,29) width 95: "line-height should be 20"
+ text run at (95,29) width 16: "px. "
+ text run at (111,29) width 209: "The actual value of the font-size is UA-dependent. "
+ text run at (320,29) width 277: "Extra text is included for the purposes of testing this more effectively."
+ RenderBlock {P} at (4,425) size 762x124
+ RenderText {TEXT} at (0,3) size 753x124
+ text run at (0,3) width 699: "This element should be in a sans-serif font, italicized and small caps, with a"
+ text run at (0,34) width 139: "weight of 900. "
+ text run at (139,34) width 614: "Its font-size should be 150% the base font size, and its line-height"
+ text run at (0,65) width 317: "should be 150% of that value (18"
+ text run at (317,65) width 89: "px and 27"
+ text run at (406,65) width 165: "px, respectively). "
+ text run at (571,65) width 119: "Extra text is"
+ text run at (0,96) width 539: "included for the purposes of testing this more effectively."
+ RenderBlock {P} at (4,570) size 762x252
+ RenderText {TEXT} at (0,19) size 751x252
+ text run at (0,19) width 751: "This element should be in a sans-serif font, italicized and small caps, with a weight"
+ text run at (0,82) width 74: "of 100. "
+ text run at (74,82) width 676: "Its font-size should be 150% the base font size, and its line-height should"
+ text run at (0,145) width 244: "be 300% of that value (18"
+ text run at (244,145) width 88: "px and 54"
+ text run at (332,145) width 164: "px, respectively). "
+ text run at (496,145) width 238: "Extra text is included for"
+ text run at (0,208) width 417: "the purposes of testing this more effectively."
+ RenderBlock {P} at (4,843) size 762x210
+ RenderText {TEXT} at (0,9) size 757x210
+ text run at (0,9) width 757: "This element should be in a monospace font, italicized and small caps, with a"
+ text run at (0,51) width 163: "weight of 900. "
+ text run at (163,51) width 572: "Its font-size should be 150% the base font size, and its"
+ text run at (0,93) width 227: "line-height should be 2"
+ text run at (227,93) width 408: "em, or twice the element's font size (18"
+ text run at (635,93) width 58: "px and"
+ text run at (0,135) width 217: "36px, respectively). "
+ text run at (217,135) width 535: "Extra text is included for the purposes of testing this"
+ text run at (0,177) width 161: "more effectively."
+ RenderBlock {P} at (4,1074) size 762x384
+ RenderText {TEXT} at (0,36) size 751x384
+ text run at (0,36) width 751: "This element should be in a sans-serif font, italicized and small caps, with a weight"
+ text run at (0,132) width 74: "of 500. "
+ text run at (74,132) width 497: "Its font-size should be 150% the base font size, or 18"
+ text run at (571,132) width 93: "px, and its"
+ text run at (0,228) width 208: "line-height should be 1"
+ text run at (208,228) width 27: "in. "
+ text run at (235,228) width 499: "Extra text is included for the purposes of testing this"
+ text run at (0,324) width 156: "more effectively."
+ RenderBlock {P} at (4,1479) size 762x144
RenderText {TEXT} at (0,7) size 752x144
text run at (0,7) width 752: "This element should be in a sans-serif font, oblique and not small-caps, with a weight of"
text run at (0,43) width 40: "700. "
@@ -239,24 +238,24 @@ layer at (0,0) size 800x3822
text run at (0,79) width 176: "element's font size). "
text run at (176,79) width 500: "Extra text is included for the purposes of testing this more"
text run at (0,115) width 93: "effectively."
- RenderBlock {P} at (4,1640) size 762x54
- RenderText {TEXT} at (0,6) size 762x54
- text run at (0,6) width 356: "This element should be in a sans-serif font, with a weight of 400. "
- text run at (356,6) width 179: "Its font-size should be 80% of 12"
- text run at (535,6) width 54: "px, or 9.6"
- text run at (589,6) width 173: "px, and its line-height shoud be"
- text run at (0,33) width 112: "2.5 times that, or 24"
- text run at (112,33) width 21: "px. "
- text run at (133,33) width 377: "Extra text is included for the purposes of testing this more effectively."
- RenderBlock {P} at (4,1715) size 762x315
- RenderInline {SPAN} at (0,0) size 745x276 [bgcolor=#C0C0C0]
- RenderText {TEXT} at (0,19) size 745x315
- text run at (0,19) width 745: "This element should be in a sans-serif font, italicized and small caps, with a weight"
- text run at (0,82) width 60: "of 100. "
- text run at (60,82) width 678: "Its font-size should be 150% the base font size, and its line-height should be"
- text run at (0,145) width 190: "300% of that value (18"
- text run at (190,145) width 80: "px and 54"
- text run at (270,145) width 426: "px, respectively). The text should have a silver"
- text run at (0,208) width 732: "background. The background color has been set on an inline element and should"
- text run at (0,271) width 515: "therefore only cover the text, not the interline spacing."
+ RenderBlock {P} at (4,1641) size 762x54
+ RenderText {TEXT} at (0,7) size 762x54
+ text run at (0,7) width 356: "This element should be in a sans-serif font, with a weight of 400. "
+ text run at (356,7) width 179: "Its font-size should be 80% of 12"
+ text run at (535,7) width 54: "px, or 9.6"
+ text run at (589,7) width 173: "px, and its line-height shoud be"
+ text run at (0,34) width 112: "2.5 times that, or 24"
+ text run at (112,34) width 21: "px. "
+ text run at (133,34) width 377: "Extra text is included for the purposes of testing this more effectively."
+ RenderBlock {P} at (4,1716) size 762x315
+ RenderInline {SPAN} at (0,0) size 751x276 [bgcolor=#C0C0C0]
+ RenderText {TEXT} at (0,19) size 751x315
+ text run at (0,19) width 751: "This element should be in a sans-serif font, italicized and small caps, with a weight"
+ text run at (0,82) width 74: "of 100. "
+ text run at (74,82) width 676: "Its font-size should be 150% the base font size, and its line-height should"
+ text run at (0,145) width 244: "be 300% of that value (18"
+ text run at (244,145) width 88: "px and 54"
+ text run at (332,145) width 373: "px, respectively). The text should have a"
+ text run at (0,208) width 725: "silver background. The background color has been set on an inline element and"
+ text run at (0,271) width 587: "should therefore only cover the text, not the interline spacing."
RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css1/font_properties/font_variant-expected.txt b/LayoutTests/css1/font_properties/font_variant-expected.txt
index bd75ce4..d169528 100644
--- a/LayoutTests/css1/font_properties/font_variant-expected.txt
+++ b/LayoutTests/css1/font_properties/font_variant-expected.txt
@@ -12,20 +12,20 @@ layer at (0,0) size 800x270
text run at (0,16) width 224: ".two {font-variant: normal;}"
RenderBlock {HR} at (1,93) size 782x2 [bgcolor=#000000]
RenderBlock {P} at (0,109) size 784x17 [bgcolor=#000000]
- RenderText {TEXT} at (0,0) size 237x17
- text run at (0,0) width 237: "This Paragraph should be in Small Caps."
+ RenderText {TEXT} at (0,0) size 239x17
+ text run at (0,0) width 239: "This Paragraph should be in Small Caps."
RenderBlock {P} at (0,140) size 784x17 [bgcolor=#000000]
- RenderText {TEXT} at (0,0) size 507x17
- text run at (0,0) width 507: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be "
+ RenderText {TEXT} at (0,0) size 509x17
+ text run at (0,0) width 509: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be "
RenderInline {SPAN} at (0,0) size 50x17
- RenderText {TEXT} at (507,0) size 50x17
- text run at (507,0) width 50: "Normal"
- RenderText {TEXT} at (557,0) size 4x17
- text run at (557,0) width 4: "."
- RenderTable {TABLE} at (0,171) size 583x83 [bgcolor=#000000]
+ RenderText {TEXT} at (509,0) size 50x17
+ text run at (509,0) width 50: "Normal"
+ RenderText {TEXT} at (559,0) size 5x17
+ text run at (559,0) width 5: "."
+ RenderTable {TABLE} at (0,171) size 586x83 [bgcolor=#000000]
RenderTableSection {TBODY} at (1,1) size 0x81
RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (0,0) size 581x25 [bgcolor=#C0C0C0] [r=0 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (0,0) size 584x25 [bgcolor=#C0C0C0] [r=0 c=0 rs=1 cs=2]
RenderInline {STRONG} at (0,0) size 164x17 [bgcolor=#000000]
RenderText {TEXT} at (4,4) size 164x17
text run at (4,4) width 164: "TABLE Testing Section"
@@ -33,15 +33,15 @@ layer at (0,0) size 800x270
RenderTableCell {TD} at (0,40) size 12x25 [bgcolor=#C0C0C0] [r=1 c=0 rs=1 cs=1]
RenderText {TEXT} at (4,4) size 4x17
text run at (4,4) width 4: " "
- RenderTableCell {TD} at (12,25) size 569x56 [r=1 c=1 rs=1 cs=1]
- RenderBlock {P} at (4,4) size 561x17
- RenderText {TEXT} at (0,0) size 237x17
- text run at (0,0) width 237: "This Paragraph should be in Small Caps."
- RenderBlock {P} at (4,35) size 561x17
- RenderText {TEXT} at (0,0) size 507x17
- text run at (0,0) width 507: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be "
+ RenderTableCell {TD} at (12,25) size 572x56 [r=1 c=1 rs=1 cs=1]
+ RenderBlock {P} at (4,4) size 564x17
+ RenderText {TEXT} at (0,0) size 239x17
+ text run at (0,0) width 239: "This Paragraph should be in Small Caps."
+ RenderBlock {P} at (4,35) size 564x17
+ RenderText {TEXT} at (0,0) size 509x17
+ text run at (0,0) width 509: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be "
RenderInline {SPAN} at (0,0) size 50x17
- RenderText {TEXT} at (507,0) size 50x17
- text run at (507,0) width 50: "Normal"
- RenderText {TEXT} at (557,0) size 4x17
- text run at (557,0) width 4: "."
+ RenderText {TEXT} at (509,0) size 50x17
+ text run at (509,0) width 50: "Normal"
+ RenderText {TEXT} at (559,0) size 5x17
+ text run at (559,0) width 5: "."
diff --git a/LayoutTests/css1/pseudo/firstline-expected.txt b/LayoutTests/css1/pseudo/firstline-expected.txt
index c6d3461..221311d 100644
--- a/LayoutTests/css1/pseudo/firstline-expected.txt
+++ b/LayoutTests/css1/pseudo/firstline-expected.txt
@@ -28,18 +28,18 @@ layer at (0,0) size 800x652
text run at (107,50) width 670: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than"
text run at (0,67) width 60: "one line."
RenderBlock {P} at (0,288) size 784x68 [bgcolor=#000000]
- RenderText {TEXT} at (0,0) size 778x51
- text run at (0,0) width 536: "The first line of this paragraph, and only that one, should be displayed in small-caps style. "
- text run at (536,0) width 242: "Thus, if the first line is not in small-caps"
- text run at (0,17) width 750: "style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test (although the"
- text run at (0,34) width 157: "problem might be that "
+ RenderText {TEXT} at (0,0) size 734x51
+ text run at (0,0) width 545: "The first line of this paragraph, and only that one, should be displayed in small-caps style. "
+ text run at (545,0) width 179: "Thus, if the first line is not in"
+ text run at (0,17) width 734: "small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test"
+ text run at (0,34) width 252: "(although the problem might be that "
RenderInline {CODE} at (0,0) size 80x16
- RenderText {TEXT} at (157,35) size 80x16
- text run at (157,35) width 80: "small-caps"
- RenderText {TEXT} at (237,34) size 779x34
- text run at (237,34) width 246: " is not supported by your browser). "
- text run at (483,34) width 296: "This is extra text included for the purposes"
- text run at (0,51) width 453: "of making the paragraph long enough to have more than one line."
+ RenderText {TEXT} at (252,35) size 80x16
+ text run at (252,35) width 80: "small-caps"
+ RenderText {TEXT} at (332,34) size 781x34
+ text run at (332,34) width 246: " is not supported by your browser). "
+ text run at (578,34) width 203: "This is extra text included for"
+ text run at (0,51) width 546: "the purposes of making the paragraph long enough to have more than one line."
RenderTable {TABLE} at (0,370) size 784x266 [bgcolor=#000000]
RenderTableSection {TBODY} at (1,1) size 0x264
RenderTableRow {TR} at (0,0) size 0x0
@@ -69,8 +69,8 @@ layer at (0,0) size 800x652
text run at (0,67) width 135: "more than one line."
RenderBlock {P} at (4,167) size 762x68
RenderText {TEXT} at (0,0) size 734x51
- text run at (0,0) width 536: "The first line of this paragraph, and only that one, should be displayed in small-caps style. "
- text run at (536,0) width 177: "Thus, if the first line is not in"
+ text run at (0,0) width 545: "The first line of this paragraph, and only that one, should be displayed in small-caps style. "
+ text run at (545,0) width 179: "Thus, if the first line is not in"
text run at (0,17) width 734: "small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test"
text run at (0,34) width 252: "(although the problem might be that "
RenderInline {CODE} at (0,0) size 80x16
diff --git a/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt b/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt
index 4d385ed..a3943f1 100644
--- a/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt
+++ b/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x862
+layer at (0,0) size 800x980
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x862
- RenderBlock {HTML} at (0,0) size 800x862
- RenderBody {BODY} at (8,8) size 784x846 [bgcolor=#CCCCCC]
+layer at (0,0) size 800x980
+ RenderBlock {HTML} at (0,0) size 800x980
+ RenderBody {BODY} at (8,8) size 784x964 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 784x17 [bgcolor=#000000]
RenderInline (anonymous) at (0,0) size 9x17 [color=#800000]
RenderText {TEXT} at (0,0) size 9x17
@@ -28,42 +28,42 @@ layer at (0,0) size 800x862
text run at (69,17) width 570: "If this precise combination does not occur, then the user agent has failed this test. "
text run at (639,17) width 121: "Remember that in"
text run at (0,34) width 609: "order to ensure a complete test, the paragraph must be displayed on more than one line."
- RenderBlock {P} at (0,238) size 784x125 [bgcolor=#000000]
- RenderInline (anonymous) at (0,0) size 31x57 [color=#800000]
- RenderText {TEXT} at (0,0) size 31x57
- text run at (0,0) width 31: "T"
- RenderText {TEXT} at (31,20) size 784x105
- text run at (31,20) width 692: "he first letter of this paragraph, and only that one,"
- text run at (0,57) width 778: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first"
- text run at (0,74) width 353: "line should be 200% bigger than normal and green. "
- text run at (353,74) width 431: "If this precise combination does not occur, then the user agent"
- text run at (0,91) width 135: "has failed this test. "
- text run at (135,91) width 635: "Remember that in order to ensure a complete test, the paragraph must be displayed on more"
- text run at (0,108) width 95: "than one line."
- RenderBlock {P} at (0,377) size 784x108 [bgcolor=#000000]
+ RenderBlock {P} at (0,238) size 784x184 [bgcolor=#000000]
+ RenderInline (anonymous) at (0,0) size 62x116 [color=#800000]
+ RenderText {TEXT} at (0,0) size 62x116
+ text run at (0,0) width 62: "T"
+ RenderText {TEXT} at (62,68) size 784x116
+ text run at (62,68) width 692: "he first letter of this paragraph, and only that one,"
+ text run at (0,116) width 778: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first"
+ text run at (0,133) width 353: "line should be 200% bigger than normal and green. "
+ text run at (353,133) width 431: "If this precise combination does not occur, then the user agent"
+ text run at (0,150) width 135: "has failed this test. "
+ text run at (135,150) width 635: "Remember that in order to ensure a complete test, the paragraph must be displayed on more"
+ text run at (0,167) width 95: "than one line."
+ RenderBlock {P} at (0,436) size 784x108 [bgcolor=#000000]
RenderInline (anonymous) at (0,0) size 61x57 [color=#800000]
RenderText {TEXT} at (0,0) size 61x57
text run at (0,0) width 61: "\"W"
- RenderText {TEXT} at (61,33) size 775x75
- text run at (61,33) width 301: "e should check for quotation support,\" it was said. "
- text run at (362,33) width 413: "The first two characters in this paragraph-- a double-quote mark and"
- text run at (0,57) width 636: "a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). "
- text run at (636,57) width 89: "Note that the"
+ RenderText {TEXT} at (61,33) size 761x75
+ text run at (61,33) width 307: "e should check for quotation support,\" it was said. "
+ text run at (368,33) width 393: "The first two characters in this paragraph-- a double-quote mark"
+ text run at (0,57) width 666: "and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). "
+ text run at (666,57) width 89: "Note that the"
text run at (0,74) width 734: "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,91) width 107: "recommended. "
text run at (107,91) width 498: "In addition, the entire first line should be in a small-caps font and green."
- RenderTable {TABLE} at (0,499) size 784x347 [bgcolor=#000000]
- RenderTableSection {TBODY} at (1,1) size 0x345
+ RenderTable {TABLE} at (0,558) size 784x406 [bgcolor=#000000]
+ RenderTableSection {TBODY} at (1,1) size 0x404
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [r=0 c=0 rs=1 cs=2]
RenderInline {STRONG} at (0,0) size 164x17 [bgcolor=#000000]
RenderText {TEXT} at (4,4) size 164x17
text run at (4,4) width 164: "TABLE Testing Section"
RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (0,172) size 12x25 [bgcolor=#C0C0C0] [r=1 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (0,202) size 12x25 [bgcolor=#C0C0C0] [r=1 c=0 rs=1 cs=1]
RenderText {TEXT} at (4,4) size 4x17
text run at (4,4) width 4: " "
- RenderTableCell {TD} at (12,25) size 770x320 [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (12,25) size 770x379 [r=1 c=1 rs=1 cs=1]
RenderBlock {P} at (4,4) size 762x51
RenderInline (anonymous) at (0,0) size 9x17 [color=#800000]
RenderText {TEXT} at (0,0) size 9x17
@@ -74,25 +74,25 @@ layer at (0,0) size 800x862
text run at (119,17) width 570: "If this precise combination does not occur, then the user agent has failed this test. "
text run at (689,17) width 73: "Remember"
text run at (0,34) width 657: "that in order to ensure a complete test, the paragraph must be displayed on more than one line."
- RenderBlock {P} at (4,69) size 762x125
- RenderInline (anonymous) at (0,0) size 31x57 [color=#800000]
- RenderText {TEXT} at (0,0) size 31x57
- text run at (0,0) width 31: "T"
- RenderText {TEXT} at (31,20) size 746x105
- text run at (31,20) width 692: "he first letter of this paragraph, and only that one,"
- text run at (0,57) width 746: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire"
- text run at (0,74) width 385: "first line should be 200% bigger than normal and green. "
- text run at (385,74) width 354: "If this precise combination does not occur, then the"
- text run at (0,91) width 212: "user agent has failed this test. "
- text run at (212,91) width 504: "Remember that in order to ensure a complete test, the paragraph must be"
- text run at (0,108) width 226: "displayed on more than one line."
- RenderBlock {P} at (4,208) size 762x108
+ RenderBlock {P} at (4,69) size 762x184
+ RenderInline (anonymous) at (0,0) size 62x116 [color=#800000]
+ RenderText {TEXT} at (0,0) size 62x116
+ text run at (0,0) width 62: "T"
+ RenderText {TEXT} at (62,68) size 754x116
+ text run at (62,68) width 692: "he first letter of this paragraph, and only that one,"
+ text run at (0,116) width 746: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire"
+ text run at (0,133) width 385: "first line should be 200% bigger than normal and green. "
+ text run at (385,133) width 354: "If this precise combination does not occur, then the"
+ text run at (0,150) width 212: "user agent has failed this test. "
+ text run at (212,150) width 504: "Remember that in order to ensure a complete test, the paragraph must be"
+ text run at (0,167) width 226: "displayed on more than one line."
+ RenderBlock {P} at (4,267) size 762x108
RenderInline (anonymous) at (0,0) size 61x57 [color=#800000]
RenderText {TEXT} at (0,0) size 61x57
text run at (0,0) width 61: "\"W"
- RenderText {TEXT} at (61,33) size 755x75
- text run at (61,33) width 301: "e should check for quotation support,\" it was said. "
- text run at (362,33) width 387: "The first two characters in this paragraph-- a double-quote mark"
+ RenderText {TEXT} at (61,33) size 761x75
+ text run at (61,33) width 307: "e should check for quotation support,\" it was said. "
+ text run at (368,33) width 393: "The first two characters in this paragraph-- a double-quote mark"
text run at (0,57) width 666: "and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). "
text run at (666,57) width 89: "Note that the"
text run at (0,74) width 734: "inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is"
diff --git a/LayoutTests/css1/text_properties/line_height-expected.txt b/LayoutTests/css1/text_properties/line_height-expected.txt
index 52d9272..31bb5ad 100644
--- a/LayoutTests/css1/text_properties/line_height-expected.txt
+++ b/LayoutTests/css1/text_properties/line_height-expected.txt
@@ -48,11 +48,11 @@ layer at (0,0) size 800x2988
RenderText {TEXT} at (0,16) size 647x48
text run at (0,16) width 647: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines."
RenderBlock {P} at (0,343) size 784x75 [bgcolor=#000000]
- RenderText {TEXT} at (0,29) size 672x75
- text run at (0,29) width 672: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines."
+ RenderText {TEXT} at (0,30) size 672x75
+ text run at (0,30) width 672: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines."
RenderBlock {P} at (0,430) size 784x75 [bgcolor=#000000]
- RenderText {TEXT} at (0,29) size 686x75
- text run at (0,29) width 686: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines."
+ RenderText {TEXT} at (0,30) size 686x75
+ text run at (0,30) width 686: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines."
RenderBlock {P} at (0,517) size 784x32 [bgcolor=#000000]
RenderText {TEXT} at (0,8) size 688x32
text run at (0,8) width 688: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines."
@@ -90,13 +90,13 @@ layer at (0,0) size 800x2988
RenderText {TEXT} at (0,4) size 751x24 [bgcolor=#C0C0C0]
text run at (0,4) width 751: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines."
RenderBlock {P} at (0,48) size 784x192 [bgcolor=#000000]
- RenderText {TEXT} at (0,9) size 784x192
- text run at (0,9) width 738: "This sentence should have a line-height of twice the font size,"
- text run at (0,57) width 770: "which is 200% normal thanks to an inline style; this should cause"
- text run at (0,105) width 702: "extra spacing between the lines, as the font-size will be 28"
- text run at (702,105) width 82: "px and"
- text run at (0,153) width 301: "the line-height will be 56"
- text run at (301,153) width 38: "px."
+ RenderText {TEXT} at (0,10) size 784x192
+ text run at (0,10) width 738: "This sentence should have a line-height of twice the font size,"
+ text run at (0,58) width 770: "which is 200% normal thanks to an inline style; this should cause"
+ text run at (0,106) width 702: "extra spacing between the lines, as the font-size will be 28"
+ text run at (702,106) width 82: "px and"
+ text run at (0,154) width 301: "the line-height will be 56"
+ text run at (301,154) width 38: "px."
RenderBlock (anonymous) at (0,264) size 784x24 [bgcolor=#000000]
RenderText {TEXT} at (0,4) size 769x24 [bgcolor=#C0C0C0]
text run at (0,4) width 769: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines."
@@ -110,10 +110,10 @@ layer at (0,0) size 800x2988
text run at (0,0) width 648: "This sentence should have a normal line-height, because negative values are not permitted for this property."
RenderBlock {P} at (0,1390) size 784x225 [bgcolor=#000000]
RenderInline {SPAN} at (0,0) size 762x165 [bgcolor=#C0C0C0]
- RenderText {TEXT} at (0,29) size 762x225
- text run at (0,29) width 762: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a"
- text run at (0,104) width 727: "background color of silver, but no padding or border. The background color has been set on an inline element and should"
- text run at (0,179) width 327: "therefore only cover the text, not the interline spacing."
+ RenderText {TEXT} at (0,30) size 762x225
+ text run at (0,30) width 762: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a"
+ text run at (0,105) width 727: "background color of silver, but no padding or border. The background color has been set on an inline element and should"
+ text run at (0,180) width 327: "therefore only cover the text, not the interline spacing."
RenderText {TEXT} at (0,0) size 0x0
RenderTable {TABLE} at (0,1627) size 784x1345 [bgcolor=#000000]
RenderTableSection {TBODY} at (1,1) size 0x1343
@@ -131,11 +131,11 @@ layer at (0,0) size 800x2988
RenderText {TEXT} at (0,16) size 647x48
text run at (0,16) width 647: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines."
RenderBlock {P} at (4,64) size 762x75
- RenderText {TEXT} at (0,29) size 672x75
- text run at (0,29) width 672: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines."
+ RenderText {TEXT} at (0,30) size 672x75
+ text run at (0,30) width 672: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines."
RenderBlock {P} at (4,151) size 762x75
- RenderText {TEXT} at (0,29) size 686x75
- text run at (0,29) width 686: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines."
+ RenderText {TEXT} at (0,30) size 686x75
+ text run at (0,30) width 686: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines."
RenderBlock {P} at (4,238) size 762x32
RenderText {TEXT} at (0,8) size 688x32
text run at (0,8) width 688: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines."
@@ -174,12 +174,12 @@ layer at (0,0) size 800x2988
RenderText {TEXT} at (0,4) size 751x24 [bgcolor=#C0C0C0]
text run at (0,4) width 751: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines."
RenderBlock {P} at (0,48) size 762x192 [bgcolor=#000000]
- RenderText {TEXT} at (0,9) size 738x192
- text run at (0,9) width 738: "This sentence should have a line-height of twice the font size,"
- text run at (0,57) width 695: "which is 200% normal thanks to an inline style; this should"
- text run at (0,105) width 738: "cause extra spacing between the lines, as the font-size will be"
- text run at (0,153) width 422: "28px and the line-height will be 56"
- text run at (422,153) width 38: "px."
+ RenderText {TEXT} at (0,10) size 738x192
+ text run at (0,10) width 738: "This sentence should have a line-height of twice the font size,"
+ text run at (0,58) width 695: "which is 200% normal thanks to an inline style; this should"
+ text run at (0,106) width 738: "cause extra spacing between the lines, as the font-size will be"
+ text run at (0,154) width 422: "28px and the line-height will be 56"
+ text run at (422,154) width 38: "px."
RenderBlock (anonymous) at (0,264) size 762x48 [bgcolor=#000000]
RenderText {TEXT} at (0,4) size 733x48 [bgcolor=#C0C0C0]
text run at (0,4) width 733: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the"
@@ -193,8 +193,8 @@ layer at (0,0) size 800x2988
text run at (0,0) width 648: "This sentence should have a normal line-height, because negative values are not permitted for this property."
RenderBlock {P} at (4,1089) size 762x225
RenderInline {SPAN} at (0,0) size 762x165 [bgcolor=#C0C0C0]
- RenderText {TEXT} at (0,29) size 762x225
- text run at (0,29) width 762: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a"
- text run at (0,104) width 727: "background color of silver, but no padding or border. The background color has been set on an inline element and should"
- text run at (0,179) width 327: "therefore only cover the text, not the interline spacing."
+ RenderText {TEXT} at (0,30) size 762x225
+ text run at (0,30) width 762: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a"
+ text run at (0,105) width 727: "background color of silver, but no padding or border. The background color has been set on an inline element and should"
+ text run at (0,180) width 327: "therefore only cover the text, not the interline spacing."
RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/block/basic/011-expected.txt b/LayoutTests/fast/block/basic/011-expected.txt
index 71e6b82..c8c9c8c 100644
--- a/LayoutTests/fast/block/basic/011-expected.txt
+++ b/LayoutTests/fast/block/basic/011-expected.txt
@@ -21,18 +21,18 @@ layer at (0,0) size 800x420
RenderBlock (anonymous) at (10,20) size 139x0 [bgcolor=#000000]
RenderInline {FORM} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (anonymous) at (10,20) size 139x40 [bgcolor=#000000]
- RenderBlock {P} at (0,0) size 139x20
+ RenderBlock (anonymous) at (10,20) size 139x38 [bgcolor=#000000]
+ RenderBlock {P} at (0,0) size 139x19
RenderText {TEXT} at (0,4) size 28x18
text run at (0,4) width 28: "bang "
RenderRadioButton {INPUT} at (31,3) size 12x13 [color=#000000]
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock {P} at (0,20) size 139x20
+ RenderBlock {P} at (0,19) size 139x19
RenderText {TEXT} at (0,4) size 47x18
text run at (0,4) width 47: "whimper "
RenderRadioButton {INPUT} at (50,3) size 12x13 [color=#000000]
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock (anonymous) at (10,60) size 139x0 [bgcolor=#000000]
+ RenderBlock (anonymous) at (10,58) size 139x0 [bgcolor=#000000]
RenderInline {FORM} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0 [bgcolor=#000000]
RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/block/positioning/047-expected.txt b/LayoutTests/fast/block/positioning/047-expected.txt
index 6a566c8..3b0f8ed 100644
--- a/LayoutTests/fast/block/positioning/047-expected.txt
+++ b/LayoutTests/fast/block/positioning/047-expected.txt
@@ -6,8 +6,8 @@ layer at (0,0) size 800x868
layer at (8,8) size 512x839
RenderBlock (relative positioned) {DIV} at (0,0) size 512x839
RenderBlock {H2} at (0,0) size 512x29
- RenderText {TEXT} at (0,-4) size 88x29
- text run at (0,-4) width 88: "Bug 1"
+ RenderText {TEXT} at (0,-3) size 88x29
+ text run at (0,-3) width 88: "Bug 1"
RenderBlock {P} at (0,55) size 512x232
RenderText {TEXT} at (0,2) size 492x145
text run at (0,2) width 448: "Safari public beta does not support CSS absolute"
@@ -26,20 +26,20 @@ layer at (8,8) size 512x839
text run at (0,31) width 473: "the marginal note shifted down by one line; this has"
text run at (0,60) width 296: "been fixed in subsequent builds."
RenderBlock {H2} at (0,421) size 512x29
- RenderText {TEXT} at (0,-4) size 92x29
- text run at (0,-4) width 92: "Bug 2"
+ RenderText {TEXT} at (0,-3) size 92x29
+ text run at (0,-3) width 92: "Bug 2"
RenderBlock {P} at (0,476) size 512x58
- RenderText {TEXT} at (0,6) size 494x58
- text run at (0,6) width 494: "Fonts also render substantially smaller than other browsers, which is not a good thing"
- text run at (0,35) width 469: "when you consider that most sites specify fonts that are too small in the first place."
+ RenderText {TEXT} at (0,7) size 494x58
+ text run at (0,7) width 494: "Fonts also render substantially smaller than other browsers, which is not a good thing"
+ text run at (0,36) width 469: "when you consider that most sites specify fonts that are too small in the first place."
RenderBlock {P} at (0,555) size 512x87
RenderText {TEXT} at (0,2) size 500x87
text run at (0,2) width 500: "At the very least, the preferences panel needs a default"
text run at (0,31) width 474: "text-zoom setting to enable compatibility with other"
text run at (0,60) width 90: "browsers."
RenderBlock {H2} at (0,668) size 512x29
- RenderText {TEXT} at (0,-4) size 92x29
- text run at (0,-4) width 92: "Bug 3"
+ RenderText {TEXT} at (0,-3) size 92x29
+ text run at (0,-3) width 92: "Bug 3"
RenderBlock {P} at (0,723) size 512x116
RenderText {TEXT} at (0,2) size 70x29
text run at (0,2) width 70: "Worse, "
diff --git a/LayoutTests/fast/block/positioning/051-expected.txt b/LayoutTests/fast/block/positioning/051-expected.txt
index 5dc67f4..8f5712f 100644
--- a/LayoutTests/fast/block/positioning/051-expected.txt
+++ b/LayoutTests/fast/block/positioning/051-expected.txt
@@ -3,84 +3,84 @@ layer at (0,0) size 800x5251
layer at (0,0) size 800x5251 layerType: background only
layer at (82,1476) size 200x200
RenderBlock (positioned) zI: -3000000 {P} at (60,60) size 200x200 [color=#FFFFFF] [bgcolor=#990066]
- RenderText zI: -3000000 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "8"
+ RenderText zI: -3000000 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "8"
layer at (32,1626) size 200x200
RenderBlock (positioned) zI: -2000000 {P} at (10,210) size 200x200 [color=#FFFFFF] [bgcolor=#660099]
- RenderText zI: -2000000 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "7"
+ RenderText zI: -2000000 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "7"
layer at (82,1776) size 200x200
RenderBlock (positioned) zI: -1000000 {P} at (60,360) size 200x200 [color=#FFFFFF] [bgcolor=#0000FF]
- RenderText zI: -1000000 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "6"
+ RenderText zI: -1000000 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "6"
layer at (82,2110) size 200x200
RenderBlock (positioned) zI: -40 {P} at (60,60) size 200x200 [color=#FFFFFF] [bgcolor=#990066]
- RenderText zI: -40 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "8"
+ RenderText zI: -40 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "8"
layer at (32,2260) size 200x200
RenderBlock (positioned) zI: -30 {P} at (10,210) size 200x200 [color=#FFFFFF] [bgcolor=#660099]
- RenderText zI: -30 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "7"
+ RenderText zI: -30 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "7"
layer at (82,842) size 519x200
RenderBlock (positioned) zI: -3 {P} at (60,60) size 200x200 [color=#FFFFFF] [bgcolor=#990066]
- RenderText zI: -3 {TEXT} at (50,41) size 469x80
- text run at (50,41) width 469: " 8 hide me"
+ RenderText zI: -3 {TEXT} at (50,42) size 469x80
+ text run at (50,42) width 469: " 8 hide me"
layer at (82,2744) size 200x200
RenderBlock (positioned) zI: -3 {P} at (60,60) size 200x200 [color=#FFFFFF] [bgcolor=#990066]
- RenderText zI: -3 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "8"
+ RenderText zI: -3 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "8"
layer at (32,2894) size 200x200
RenderBlock (positioned) zI: -3 {P} at (10,210) size 200x200 [color=#FFFFFF] [bgcolor=#660099]
- RenderText zI: -3 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "7"
+ RenderText zI: -3 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "7"
layer at (82,3378) size 200x200
RenderBlock (positioned) zI: -3 {P} at (60,60) size 200x200 [color=#FFFFFF] [bgcolor=#990066]
- RenderText zI: -3 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "8"
+ RenderText zI: -3 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "8"
layer at (82,4012) size 200x200
RenderBlock (positioned) zI: -3 {P} at (60,60) size 200x200 [color=#FFFFFF] [bgcolor=#990066]
- RenderText zI: -3 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "8"
+ RenderText zI: -3 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "8"
layer at (82,4677) size 200x200
RenderBlock (positioned) zI: -3 {P} at (60,60) size 200x200 [color=#FFFFFF] [bgcolor=#990066]
- RenderText zI: -3 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "8"
+ RenderText zI: -3 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "8"
layer at (32,992) size 200x200
RenderBlock (positioned) zI: -2 {P} at (10,210) size 200x200 [color=#FFFFFF] [bgcolor=#660099]
- RenderText zI: -2 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "7"
+ RenderText zI: -2 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "7"
layer at (82,2410) size 200x200
RenderBlock (positioned) zI: -2 {P} at (60,360) size 200x200 [color=#FFFFFF] [bgcolor=#0000FF]
- RenderText zI: -2 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "6"
+ RenderText zI: -2 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "6"
layer at (232,2460) size 200x200
RenderBlock (positioned) zI: -2 {P} at (210,410) size 200x200 [color=#FFFFFF] [bgcolor=#009999]
- RenderText zI: -2 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "5"
+ RenderText zI: -2 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "5"
layer at (32,3528) size 200x200
RenderBlock (positioned) zI: -2 {P} at (10,210) size 200x200 [color=#FFFFFF] [bgcolor=#660099]
- RenderText zI: -2 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "7"
+ RenderText zI: -2 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "7"
layer at (32,4162) size 200x200
RenderBlock (positioned) zI: -2 {P} at (0,200) size 200x200 [color=#FFFFFF] [bgcolor=#660099]
- RenderText zI: -2 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "7"
+ RenderText zI: -2 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "7"
layer at (32,4827) size 200x200
RenderBlock (positioned) zI: -2 {P} at (0,200) size 200x200 [color=#FFFFFF] [bgcolor=#660099]
- RenderText zI: -2 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "7"
+ RenderText zI: -2 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "7"
layer at (82,1142) size 200x200
RenderBlock (positioned) zI: -1 {P} at (60,360) size 200x200 [color=#FFFFFF] [bgcolor=#0000FF]
- RenderText zI: -1 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "6"
+ RenderText zI: -1 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "6"
layer at (82,4312) size 200x200
RenderBlock (positioned) zI: -1 {P} at (60,360) size 200x200 [color=#FFFFFF] [bgcolor=#0000FF]
- RenderText zI: -1 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "6"
+ RenderText zI: -1 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "6"
layer at (82,4977) size 200x200
RenderBlock (positioned) zI: -1 {P} at (60,360) size 200x200 [color=#FFFFFF] [bgcolor=#0000FF]
- RenderText zI: -1 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "6"
+ RenderText zI: -1 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "6"
layer at (0,0) size 800x5251 layerType: foreground only
RenderBlock {HTML} at (0,0) size 800x5251
RenderBody {BODY} at (8,18) size 784x5219
@@ -110,36 +110,36 @@ layer at (22,148) size 620x620
RenderText {TEXT} at (0,0) size 0x0
layer at (82,208) size 519x200
RenderBlock (positioned) {P} at (60,60) size 200x200 [color=#FFFFFF] [bgcolor=#990066]
- RenderText {TEXT} at (50,41) size 469x80
- text run at (50,41) width 469: " 8 hide me"
+ RenderText {TEXT} at (50,42) size 469x80
+ text run at (50,42) width 469: " 8 hide me"
layer at (32,358) size 200x200
RenderBlock (positioned) {P} at (10,210) size 200x200 [color=#FFFFFF] [bgcolor=#660099]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "7"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "7"
layer at (82,508) size 200x200
RenderBlock (positioned) {P} at (60,360) size 200x200 [color=#FFFFFF] [bgcolor=#0000FF]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "6"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "6"
layer at (232,558) size 200x200
RenderBlock (positioned) {P} at (210,410) size 200x200 [color=#FFFFFF] [bgcolor=#009999]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "5"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "5"
layer at (382,508) size 200x200
RenderBlock (positioned) {P} at (360,360) size 200x200 [color=#FFFFFF] [bgcolor=#00CC00]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "4"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "4"
layer at (432,358) size 200x200
RenderBlock (positioned) {P} at (410,210) size 200x200 [color=#FFFFFF] [bgcolor=#CCCC00]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "3"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "3"
layer at (382,208) size 200x200
RenderBlock (positioned) {P} at (360,60) size 200x200 [color=#FFFFFF] [bgcolor=#FF9900]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "2"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "2"
layer at (232,158) size 200x200
RenderBlock (positioned) {P} at (210,10) size 200x200 [color=#FFFFFF] [bgcolor=#FF0000]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "1"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "1"
layer at (22,782) size 620x620
RenderBlock (relative positioned) {DIV} at (14,764) size 620x620
RenderText {TEXT} at (0,0) size 0x0
@@ -152,8 +152,8 @@ layer at (22,782) size 620x620
RenderText {TEXT} at (0,0) size 0x0
layer at (232,1192) size 200x200
RenderBlock (positioned) {P} at (210,410) size 200x200 [color=#FFFFFF] [bgcolor=#009999]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "5"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "5"
layer at (22,1416) size 620x620
RenderBlock (relative positioned) {DIV} at (14,1398) size 620x620
RenderText {TEXT} at (0,0) size 0x0
@@ -166,8 +166,8 @@ layer at (22,1416) size 620x620
RenderText {TEXT} at (0,0) size 0x0
layer at (232,1826) size 200x200
RenderBlock (positioned) {P} at (210,410) size 200x200 [color=#FFFFFF] [bgcolor=#009999]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "5"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "5"
layer at (22,2050) size 620x620
RenderBlock (relative positioned) {DIV} at (14,2032) size 620x620
RenderText {TEXT} at (0,0) size 0x0
@@ -181,12 +181,12 @@ layer at (22,2050) size 620x620
RenderText {TEXT} at (0,0) size 0x0
layer at (382,2410) size 200x200
RenderBlock (positioned) {P} at (360,360) size 200x200 [color=#FFFFFF] [bgcolor=#00CC00]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "4"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "4"
layer at (432,2260) size 200x200
RenderBlock (positioned) {P} at (410,210) size 200x200 [color=#FFFFFF] [bgcolor=#CCCC00]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "3"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "3"
layer at (22,2684) size 620x620
RenderBlock (relative positioned) {DIV} at (14,2666) size 620x620
RenderText {TEXT} at (0,0) size 0x0
@@ -199,16 +199,16 @@ layer at (22,2684) size 620x620
RenderText {TEXT} at (0,0) size 0x0
layer at (82,3044) size 200x200
RenderBlock (positioned) {P} at (60,360) size 200x200 [color=#FFFFFF] [bgcolor=#0000FF]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "6"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "6"
layer at (232,3094) size 200x200
RenderBlock (positioned) {P} at (210,410) size 200x200 [color=#FFFFFF] [bgcolor=#009999]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "5"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "5"
layer at (382,3044) size 200x200
RenderBlock (positioned) {P} at (360,360) size 200x200 [color=#FFFFFF] [bgcolor=#00CC00]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "4"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "4"
layer at (22,3318) size 620x620
RenderBlock (relative positioned) {DIV} at (14,3300) size 620x620
RenderText {TEXT} at (0,0) size 0x0
@@ -220,8 +220,8 @@ layer at (22,3318) size 620x620
layer at (32,3328) size 600x600 layerType: background only
layer at (82,3678) size 200x200
RenderBlock (positioned) zI: -9 {P} at (50,350) size 200x200 [color=#FFFFFF] [bgcolor=#0000FF]
- RenderText zI: -9 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "6"
+ RenderText zI: -9 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "6"
layer at (32,3328) size 600x600 layerType: foreground only
RenderBlock (positioned) {DIV} at (10,10) size 600x600
RenderText {TEXT} at (0,0) size 0x0
@@ -229,12 +229,12 @@ layer at (32,3328) size 600x600 layerType: foreground only
RenderText {TEXT} at (0,0) size 0x0
layer at (232,3728) size 200x200
RenderBlock (positioned) {P} at (200,400) size 200x200 [color=#FFFFFF] [bgcolor=#009999]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "5"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "5"
layer at (382,3678) size 200x200
RenderBlock (positioned) zI: 9 {P} at (350,350) size 200x200 [color=#FFFFFF] [bgcolor=#00CC00]
- RenderText zI: 9 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "4"
+ RenderText zI: 9 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "4"
layer at (22,3952) size 620x620
RenderBlock (relative positioned) {DIV} at (14,3934) size 620x620
RenderText {TEXT} at (0,0) size 0x0
@@ -250,8 +250,8 @@ layer at (32,3962) size 600x600
RenderText {TEXT} at (0,0) size 0x0
layer at (232,4362) size 200x200
RenderBlock (positioned) {P} at (210,410) size 200x200 [color=#FFFFFF] [bgcolor=#009999]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "5"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "5"
layer at (22,4617) size 620x620
RenderBlock (relative positioned) {DIV} at (14,4599) size 620x620
RenderText {TEXT} at (0,0) size 0x0
@@ -267,101 +267,101 @@ layer at (32,4627) size 600x600
RenderText {TEXT} at (0,0) size 0x0
layer at (232,5027) size 200x200
RenderBlock (positioned) {P} at (210,410) size 200x200 [color=#FFFFFF] [bgcolor=#009999]
- RenderText {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "5"
+ RenderText {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "5"
layer at (382,1142) size 200x200
RenderBlock (positioned) zI: 1 {P} at (360,360) size 200x200 [color=#FFFFFF] [bgcolor=#00CC00]
- RenderText zI: 1 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "4"
+ RenderText zI: 1 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "4"
layer at (382,4312) size 200x200
RenderBlock (positioned) zI: 1 {P} at (350,350) size 200x200 [color=#FFFFFF] [bgcolor=#00CC00]
- RenderText zI: 1 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "4"
+ RenderText zI: 1 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "4"
layer at (382,4977) size 200x200
RenderBlock (positioned) zI: 1 {P} at (350,350) size 200x200 [color=#FFFFFF] [bgcolor=#00CC00]
- RenderText zI: 1 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "4"
+ RenderText zI: 1 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "4"
layer at (432,992) size 200x200
RenderBlock (positioned) zI: 2 {P} at (410,210) size 200x200 [color=#FFFFFF] [bgcolor=#CCCC00]
- RenderText zI: 2 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "3"
+ RenderText zI: 2 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "3"
layer at (382,2110) size 200x200
RenderBlock (positioned) zI: 2 {P} at (360,60) size 200x200 [color=#FFFFFF] [bgcolor=#FF9900]
- RenderText zI: 2 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "2"
+ RenderText zI: 2 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "2"
layer at (432,3528) size 200x200
RenderBlock (positioned) zI: 2 {P} at (410,210) size 200x200 [color=#FFFFFF] [bgcolor=#CCCC00]
- RenderText zI: 2 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "3"
+ RenderText zI: 2 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "3"
layer at (432,4162) size 200x200
RenderBlock (positioned) zI: 2 {P} at (410,210) size 200x200 [color=#FFFFFF] [bgcolor=#CCCC00]
- RenderText zI: 2 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "3"
+ RenderText zI: 2 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "3"
layer at (432,4827) size 200x200
RenderBlock (positioned) zI: 2 {P} at (410,210) size 200x200 [color=#FFFFFF] [bgcolor=#CCCC00]
- RenderText zI: 2 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "3"
+ RenderText zI: 2 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "3"
layer at (382,842) size 200x200
RenderBlock (positioned) zI: 3 {P} at (360,60) size 200x200 [color=#FFFFFF] [bgcolor=#FF9900]
- RenderText zI: 3 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "2"
+ RenderText zI: 3 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "2"
layer at (232,2060) size 200x200
RenderBlock (positioned) zI: 3 {P} at (210,10) size 200x200 [color=#FFFFFF] [bgcolor=#FF0000]
- RenderText zI: 3 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "1"
+ RenderText zI: 3 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "1"
layer at (382,3378) size 200x200
RenderBlock (positioned) zI: 3 {P} at (360,60) size 200x200 [color=#FFFFFF] [bgcolor=#FF9900]
- RenderText zI: 3 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "2"
+ RenderText zI: 3 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "2"
layer at (382,4012) size 200x200
RenderBlock (positioned) zI: 3 {P} at (350,50) size 200x200 [color=#FFFFFF] [bgcolor=#FF9900]
- RenderText zI: 3 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "2"
+ RenderText zI: 3 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "2"
layer at (382,4677) size 200x200
RenderBlock (positioned) zI: 3 {P} at (350,50) size 200x200 [color=#FFFFFF] [bgcolor=#FF9900]
- RenderText zI: 3 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "2"
+ RenderText zI: 3 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "2"
layer at (232,792) size 200x200
RenderBlock (positioned) zI: 4 {P} at (210,10) size 200x200 [color=#FFFFFF] [bgcolor=#FF0000]
- RenderText zI: 4 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "1"
+ RenderText zI: 4 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "1"
layer at (432,2894) size 200x200
RenderBlock (positioned) zI: 4 {P} at (410,210) size 200x200 [color=#FFFFFF] [bgcolor=#CCCC00]
- RenderText zI: 4 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "3"
+ RenderText zI: 4 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "3"
layer at (382,2744) size 200x200
RenderBlock (positioned) zI: 4 {P} at (360,60) size 200x200 [color=#FFFFFF] [bgcolor=#FF9900]
- RenderText zI: 4 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "2"
+ RenderText zI: 4 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "2"
layer at (232,2694) size 200x200
RenderBlock (positioned) zI: 4 {P} at (210,10) size 200x200 [color=#FFFFFF] [bgcolor=#FF0000]
- RenderText zI: 4 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "1"
+ RenderText zI: 4 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "1"
layer at (232,3328) size 200x200
RenderBlock (positioned) zI: 4 {P} at (210,10) size 200x200 [color=#FFFFFF] [bgcolor=#FF0000]
- RenderText zI: 4 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "1"
+ RenderText zI: 4 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "1"
layer at (232,3962) size 200x200
RenderBlock (positioned) zI: 4 {P} at (210,10) size 200x200 [color=#FFFFFF] [bgcolor=#FF0000]
- RenderText zI: 4 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "1"
+ RenderText zI: 4 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "1"
layer at (232,4627) size 200x200
RenderBlock (positioned) zI: 4 {P} at (210,10) size 200x200 [color=#FFFFFF] [bgcolor=#FF0000]
- RenderText zI: 4 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "1"
+ RenderText zI: 4 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "1"
layer at (382,1776) size 200x200
RenderBlock (positioned) zI: 1000000 {P} at (360,360) size 200x200 [color=#FFFFFF] [bgcolor=#00CC00]
- RenderText zI: 1000000 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "4"
+ RenderText zI: 1000000 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "4"
layer at (432,1626) size 200x200
RenderBlock (positioned) zI: 2000000 {P} at (410,210) size 200x200 [color=#FFFFFF] [bgcolor=#CCCC00]
- RenderText zI: 2000000 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "3"
+ RenderText zI: 2000000 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "3"
layer at (382,1476) size 200x200
RenderBlock (positioned) zI: 3000000 {P} at (360,60) size 200x200 [color=#FFFFFF] [bgcolor=#FF9900]
- RenderText zI: 3000000 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "2"
+ RenderText zI: 3000000 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "2"
layer at (232,1426) size 200x200
RenderBlock (positioned) zI: 4000000 {P} at (210,10) size 200x200 [color=#FFFFFF] [bgcolor=#FF0000]
- RenderText zI: 4000000 {TEXT} at (71,41) size 57x80
- text run at (71,41) width 57: "1"
+ RenderText zI: 4000000 {TEXT} at (71,42) size 57x80
+ text run at (71,42) width 57: "1"
diff --git a/LayoutTests/fast/inline-block/002-expected.txt b/LayoutTests/fast/inline-block/002-expected.txt
index 319f801..d361f3b 100644
--- a/LayoutTests/fast/inline-block/002-expected.txt
+++ b/LayoutTests/fast/inline-block/002-expected.txt
@@ -9,8 +9,8 @@ layer at (0,0) size 800x49
text run at (0,3) width 462: "Ahem_font_required_for_this_test."
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (0,17) size 784x16
- RenderText {TEXT} at (0,-1) size 289x16
- text run at (0,-1) width 289: "The following two blocks should be identical."
+ RenderText {TEXT} at (0,0) size 289x16
+ text run at (0,0) width 289: "The following two blocks should be identical."
layer at (8,75) size 204x64
RenderBlock (positioned) {DIV} at (8,75) size 204x64 [bgcolor=#FFFF00]
RenderText {TEXT} at (0,0) size 0x0
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list