[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:01:16 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 82be61459b492ab5e5ac1c90b9c6586514accba1
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 14 00:52:16 2003 +0000
Updated layout tests actuals to reflect implementation of small-caps style.
* layout-tests/css1/font_properties/font-expected.txt:
* layout-tests/css1/font_properties/font_variant-expected.txt:
* layout-tests/css1/pseudo/firstline-expected.txt:
* layout-tests/css1/pseudo/multiple_pseudo_elements-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5177 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/css1/font_properties/font-expected.txt b/LayoutTests/css1/font_properties/font-expected.txt
index d776fe2..71fc46d 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 800x4098
+layer at (0,0) size 800x3822
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x4098
- RenderBlock {HTML} at (0,0) size 800x4098
- RenderBody {BODY} at (8,8) size 784x4082 [bgcolor=#CCCCCC]
+layer at (0,0) size 800x3822
+ RenderBlock {HTML} at (0,0) size 800x3822
+ RenderBody {BODY} at (8,8) size 784x3806 [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 800x4098
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 506x20
- text run at (0,0) width 196: "This element should be 13"
- text run at (196,0) width 310: "pt. Helvetica which is in small-cap italics."
+ 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."
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. "
@@ -68,47 +68,44 @@ layer at (0,0) size 800x4098
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 784x108 [bgcolor=#000000]
- RenderText {TEXT} at (0,2) size 770x108
- text run at (0,2) width 770: "This element should be in a sans-serif font, italicized and small caps, with a weight of 900."
- text run at (0,29) width 762: "Its font-size should be 150% the base font size, and its line-height should be 150% of that"
- text run at (0,56) width 77: "value (18"
- text run at (77,56) width 83: "px and 27"
- text run at (160,56) width 151: "px, respectively). "
- text run at (311,56) width 451: "Extra text is included for the purposes of testing this"
- text run at (0,83) width 142: "more effectively."
- RenderBlock {P} at (0,696) size 784x216 [bgcolor=#000000]
- RenderText {TEXT} at (0,16) size 740x216
- text run at (0,16) width 721: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. "
- text run at (721,16) width 19: "Its"
- text run at (0,70) width 736: "font-size should be 150% the base font size, and its line-height should be 300% of that value"
- text run at (0,124) width 26: "(18"
- text run at (26,124) width 79: "px and 54"
- text run at (105,124) width 140: "px, respectively). "
- text run at (245,124) width 458: "Extra text is included for the purposes of testing this more"
- text run at (0,178) width 85: "effectively."
- RenderBlock {P} at (0,930) size 784x180 [bgcolor=#000000]
- RenderText {TEXT} at (0,7) size 770x180
- text run at (0,7) width 770: "This element should be in a monospace font, italicized and small caps,"
- text run at (0,43) width 242: "with a weight of 900. "
- text run at (242,43) width 528: "Its font-size should be 150% the base font size,"
- text run at (0,79) width 341: "and its line-height should be 2"
- text run at (341,79) width 396: "em, or twice the element's font size"
- text run at (0,115) width 33: "(18"
- text run at (33,115) width 99: "px and 36"
- text run at (132,115) width 209: "px, respectively). "
- text run at (341,115) width 429: "Extra text is included for the purposes"
- text run at (0,151) width 363: "of testing this more effectively."
- RenderBlock {P} at (0,1128) size 784x288 [bgcolor=#000000]
- RenderText {TEXT} at (0,37) size 767x288
- text run at (0,37) width 721: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500. "
- text run at (721,37) width 19: "Its"
- text run at (0,133) width 399: "font-size should be 150% the base font size, or 18"
- text run at (399,133) width 268: "px, and its line-height should be 1"
- text run at (667,133) width 24: "in. "
- text run at (691,133) width 76: "Extra text"
- text run at (0,229) width 467: "is included for the purposes of testing this more effectively."
- RenderBlock {P} at (0,1434) size 784x108 [bgcolor=#000000]
+ 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 (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. "
@@ -116,7 +113,7 @@ layer at (0,0) size 800x4098
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,1560) size 784x50 [bgcolor=#000000]
+ RenderBlock {P} at (0,1443) 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"
@@ -125,30 +122,29 @@ layer at (0,0) size 800x4098
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,1628) size 784x270 [bgcolor=#000000]
- RenderInline {SPAN} at (0,0) size 757x237 [bgcolor=#C0C0C0]
- RenderText {TEXT} at (0,16) size 757x270
- text run at (0,16) width 721: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. "
- text run at (721,16) width 19: "Its"
- text run at (0,70) width 736: "font-size should be 150% the base font size, and its line-height should be 300% of that value"
- text run at (0,124) width 26: "(18"
- text run at (26,124) width 79: "px and 54"
- text run at (105,124) width 652: "px, respectively). The text should have a silver background. The background color"
- text run at (0,178) width 723: "has been set on an inline element and should therefore only cover the text, not the interline"
- text run at (0,232) width 67: "spacing."
+ 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."
RenderText {TEXT} at (0,0) size 0x0
- RenderTable {TABLE} at (0,1916) size 784x2166 [bgcolor=#000000]
- RenderTableSection {TBODY} at (1,1) size 0x2164
+ RenderTable {TABLE} at (0,1745) size 784x2061 [bgcolor=#000000]
+ RenderTableSection {TBODY} at (1,1) size 0x2059
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,1082) size 12x25 [bgcolor=#C0C0C0] [r=1 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (0,1029) 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 770x2139 [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (12,25) size 770x2034 [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"
@@ -156,9 +152,9 @@ layer at (0,0) size 800x4098
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 506x20
- text run at (0,0) width 196: "This element should be 13"
- text run at (196,0) width 310: "pt. Helvetica which is in small-cap italics."
+ 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."
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. "
@@ -193,47 +189,48 @@ layer at (0,0) size 800x4098
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 751x124
- text run at (0,3) width 751: "This element should be in a sans-serif font, italicized and small caps, with"
- text run at (0,34) width 165: "a weight of 900. "
- text run at (165,34) width 554: "Its font-size should be 150% the base font size, and its"
- text run at (0,65) width 445: "line-height should be 150% of that value (18"
- text run at (445,65) width 99: "px and 27"
- text run at (544,65) width 174: "px, respectively)."
- text run at (0,96) width 710: "Extra text is included for the purposes of testing this more effectively."
+ 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 736x252
- text run at (0,19) width 720: "This element should be in a sans-serif font, italicized and small caps, with a"
- text run at (0,82) width 140: "weight of 100. "
- text run at (140,82) width 524: "Its font-size should be 150% the base font size, and its"
- text run at (0,145) width 422: "line-height should be 300% of that value (18"
- text run at (422,145) width 95: "px and 54"
- text run at (517,145) width 169: "px, respectively). "
- text run at (686,145) width 50: "Extra"
- text run at (0,208) width 603: "text is included for the purposes of testing this more effectively."
- RenderBlock {P} at (4,842) size 762x252
- RenderText {TEXT} at (0,8) size 754x252
- text run at (0,8) width 754: "This element should be in a monospace font, italicized and"
- text run at (0,50) width 442: "small caps, with a weight of 900. "
- text run at (442,50) width 299: "Its font-size should be"
- text run at (0,92) width 702: "150% the base font size, and its line-height should be"
- text run at (0,134) width 533: "2em, or twice the element's font size (18"
- text run at (533,134) width 117: "px and 36"
- text run at (650,134) width 39: "px,"
- text run at (0,176) width 195: "respectively). "
- text run at (195,176) width 546: "Extra text is included for the purposes of"
- text run at (0,218) width 390: "testing this more effectively."
- RenderBlock {P} at (4,1115) size 762x384
- RenderText {TEXT} at (0,35) size 748x384
- text run at (0,35) width 720: "This element should be in a sans-serif font, italicized and small caps, with a"
- text run at (0,131) width 140: "weight of 500. "
- text run at (140,131) width 509: "Its font-size should be 150% the base font size, or 18"
- text run at (649,131) width 99: "px, and its"
- text run at (0,227) width 218: "line-height should be 1"
- text run at (218,227) width 29: "in. "
- text run at (247,227) width 496: "Extra text is included for the purposes of testing this"
- text run at (0,323) width 157: "more effectively."
- RenderBlock {P} at (4,1520) size 762x144
+ 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 (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. "
@@ -242,7 +239,7 @@ layer at (0,0) size 800x4098
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,1682) size 762x54
+ 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"
@@ -251,16 +248,15 @@ layer at (0,0) size 800x4098
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,1757) size 762x378
- RenderInline {SPAN} at (0,0) size 733x339 [bgcolor=#C0C0C0]
- RenderText {TEXT} at (0,19) size 733x378
- text run at (0,19) width 720: "This element should be in a sans-serif font, italicized and small caps, with a"
- text run at (0,82) width 140: "weight of 100. "
- text run at (140,82) width 524: "Its font-size should be 150% the base font size, and its"
- text run at (0,145) width 422: "line-height should be 300% of that value (18"
- text run at (422,145) width 95: "px and 54"
- text run at (517,145) width 206: "px, respectively). The"
- text run at (0,208) width 733: "text should have a silver background. The background color has been set on"
- text run at (0,271) width 709: "an inline element and should therefore only cover the text, not the interline"
- text run at (0,334) width 81: "spacing."
+ 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."
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 350497e..bd75ce4 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 274x17
- text run at (0,0) width 274: "This Paragraph should be in Small Caps."
+ RenderText {TEXT} at (0,0) size 237x17
+ text run at (0,0) width 237: "This Paragraph should be in Small Caps."
RenderBlock {P} at (0,140) size 784x17 [bgcolor=#000000]
- RenderText {TEXT} at (0,0) size 582x17
- text run at (0,0) width 582: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be "
+ 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 "
RenderInline {SPAN} at (0,0) size 50x17
- RenderText {TEXT} at (582,0) size 50x17
- text run at (582,0) width 50: "Normal"
- RenderText {TEXT} at (632,0) size 5x17
- text run at (632,0) width 5: "."
- RenderTable {TABLE} at (0,171) size 659x83 [bgcolor=#000000]
+ 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]
RenderTableSection {TBODY} at (1,1) size 0x81
RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (0,0) size 657x25 [bgcolor=#C0C0C0] [r=0 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (0,0) size 581x25 [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 645x56 [r=1 c=1 rs=1 cs=1]
- RenderBlock {P} at (4,4) size 637x17
- RenderText {TEXT} at (0,0) size 274x17
- text run at (0,0) width 274: "This Paragraph should be in Small Caps."
- RenderBlock {P} at (4,35) size 637x17
- RenderText {TEXT} at (0,0) size 582x17
- text run at (0,0) width 582: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be "
+ 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 "
RenderInline {SPAN} at (0,0) size 50x17
- RenderText {TEXT} at (582,0) size 50x17
- text run at (582,0) width 50: "Normal"
- RenderText {TEXT} at (632,0) size 5x17
- text run at (632,0) width 5: "."
+ 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: "."
diff --git a/LayoutTests/css1/pseudo/firstline-expected.txt b/LayoutTests/css1/pseudo/firstline-expected.txt
index 897042a..c6d3461 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 780x51
- text run at (0,0) width 624: "The first line of this paragraph, and only that one, should be displayed in small-caps style. "
- text run at (624,0) width 156: "Thus, if the first line is"
- text run at (0,17) width 778: "not in 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 "
+ 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 "
RenderInline {CODE} at (0,0) size 80x16
- 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."
+ 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."
RenderTable {TABLE} at (0,370) size 784x266 [bgcolor=#000000]
RenderTableSection {TBODY} at (1,1) size 0x264
RenderTableRow {TR} at (0,0) size 0x0
@@ -68,15 +68,15 @@ layer at (0,0) size 800x652
text run at (135,50) width 595: "Remember that in order to ensure a complete test, the paragraph must be displayed on"
text run at (0,67) width 135: "more than one line."
RenderBlock {P} at (4,167) size 762x68
- RenderText {TEXT} at (0,0) size 735x51
- text run at (0,0) width 624: "The first line of this paragraph, and only that one, should be displayed in small-caps style. "
- text run at (624,0) width 111: "Thus, if the first"
- text run at (0,17) width 721: "line is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has"
- text run at (0,34) width 354: "failed this test (although the problem might be that "
+ 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,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 (354,35) size 80x16
- text run at (354,35) width 80: "small-caps"
- RenderText {TEXT} at (434,34) size 725x34
- text run at (434,34) width 246: " is not supported by your browser). "
- text run at (680,34) width 45: "This is"
- text run at (0,51) width 704: "extra text included for the purposes 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 757x34
+ text run at (332,34) width 246: " is not supported by your browser). "
+ text run at (578,34) width 179: "This is extra text included"
+ text run at (0,51) width 570: "for the purposes of making the paragraph long enough to have more than one line."
diff --git a/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt b/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt
index c39a621..4d385ed 100644
--- a/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt
+++ b/LayoutTests/css1/pseudo/multiple_pseudo_elements-expected.txt
@@ -44,14 +44,14 @@ layer at (0,0) size 800x862
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 763x75
- text run at (61,33) width 349: "e should check for quotation support,\" it was said. "
- text run at (410,33) width 311: "The first two characters in this paragraph-- a"
- text run at (0,57) width 763: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark"
- text run at (0,74) width 36: "red). "
- text run at (36,74) width 727: "Note that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under"
- text run at (0,91) width 207: "CSS1, but it is recommended. "
- text run at (207,91) width 498: "In addition, the entire first line should be in a small-caps font and green."
+ 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"
+ 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
RenderTableRow {TR} at (0,0) size 0x0
@@ -90,11 +90,11 @@ layer at (0,0) size 800x862
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 759x75
- text run at (61,33) width 349: "e should check for quotation support,\" it was said. "
- text run at (410,33) width 311: "The first two characters in this paragraph-- a"
- text run at (0,57) width 723: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon"
- text run at (0,74) width 76: "(dark red). "
- text run at (76,74) width 683: "Note that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required"
- text run at (0,91) width 251: "under CSS1, but it is recommended. "
- text run at (251,91) width 498: "In addition, the entire first line should be in a small-caps font and green."
+ 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"
+ 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."
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9e6c0a3..7a939f8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-10-13 Richard Williamson (Home0 <rjw at apple.com>
+
+ Updated layout tests actuals to reflect implementation of small-caps style.
+
+ * layout-tests/css1/font_properties/font-expected.txt:
+ * layout-tests/css1/font_properties/font_variant-expected.txt:
+ * layout-tests/css1/pseudo/firstline-expected.txt:
+ * layout-tests/css1/pseudo/multiple_pseudo_elements-expected.txt:
+
2003-10-13 Richard Williamson <rjw at apple.com>
Added support for small-caps.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9e6c0a3..7a939f8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-10-13 Richard Williamson (Home0 <rjw at apple.com>
+
+ Updated layout tests actuals to reflect implementation of small-caps style.
+
+ * layout-tests/css1/font_properties/font-expected.txt:
+ * layout-tests/css1/font_properties/font_variant-expected.txt:
+ * layout-tests/css1/pseudo/firstline-expected.txt:
+ * layout-tests/css1/pseudo/multiple_pseudo_elements-expected.txt:
+
2003-10-13 Richard Williamson <rjw at apple.com>
Added support for small-caps.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list