Index: LayoutTests/platform/mac/css1/font_properties/font-expected.txt |
diff --git a/LayoutTests/platform/mac/css1/font_properties/font-expected.txt b/LayoutTests/platform/mac/css1/font_properties/font-expected.txt |
index ec71922ba090540dc4d33726661d0db188ac3935..2f1a63ebffc84f8f2932dfe82cac6dfe8f7bd752 100644 |
--- a/LayoutTests/platform/mac/css1/font_properties/font-expected.txt |
+++ b/LayoutTests/platform/mac/css1/font_properties/font-expected.txt |
@@ -1,8 +1,8 @@ |
-layer at (0,0) size 785x4233 |
+layer at (0,0) size 785x4194 |
RenderView at (0,0) size 785x600 |
-layer at (0,0) size 785x4233 |
- RenderBlock {HTML} at (0,0) size 785x4233.33 |
- RenderBody {BODY} at (8,8) size 769x4217.33 [bgcolor=#CCCCCC] |
+layer at (0,0) size 785x4194 |
+ RenderBlock {HTML} at (0,0) size 785x4194.33 |
+ RenderBody {BODY} at (8,8) size 769x4178.33 [bgcolor=#CCCCCC] |
RenderBlock {P} at (0,0) size 769x14 |
RenderText {#text} at (0,0) size 264x14 |
text run at (0,0) width 264: "The style declarations which apply to the text below are:" |
@@ -38,8 +38,8 @@ layer at (0,0) size 785x4233 |
text run at (0,0) width 423: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " |
text run at (423,0) width 283: "This is the \"base font size\" referred to in the following tests." |
RenderBlock {P} at (0,251.33) size 769x20 |
- RenderText {#text} at (0,0) size 504x20 |
- text run at (0,0) width 504: "This element should be 13pt. Helvetica which is in small-cap italics." |
+ RenderText {#text} at (0,0) size 501x20 |
+ text run at (0,0) width 501: "This element should be 13pt. Helvetica which is in small-cap italics." |
RenderBlock {P} at (0,289.33) size 769x81 |
RenderText {#text} at (0,2) size 762x76 |
text run at (0,2) width 282: "This element should be in a serif font. " |
@@ -68,35 +68,35 @@ layer at (0,0) size 785x4233 |
text run at (688,28) width 73: "Extra text is" |
text run at (0,54) width 304: "included for the purposes of testing this more effectively." |
RenderBlock {P} at (0,583.33) size 769x108 |
- RenderText {#text} at (0,3) size 733x102 |
- text run at (0,3) width 712: "This element should be in a sans-serif font, italicized and small caps, with a weight of 900. " |
- text run at (711,3) width 22: "Its" |
- text run at (0,30) width 733: "font-size should be 150% the base font size, and its line-height should be 150% of that value" |
- text run at (0,57) width 239: "(18px and 27px, respectively). " |
- text run at (238,57) width 467: "Extra text is included for the purposes of testing this more" |
- text run at (0,84) width 91: "effectively." |
+ RenderText {#text} at (0,3) size 732x102 |
+ 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 732: "font-size should be 150% the base font size, and its line-height should be 150% of that value" |
+ text run at (0,57) width 235: "(18px and 27px, respectively). " |
+ text run at (235,57) width 464: "Extra text is included for the purposes of testing this more" |
+ text run at (0,84) width 90: "effectively." |
RenderBlock {P} at (0,709.33) size 769x162 |
- RenderText {#text} at (0,16) size 747x129 |
- text run at (0,16) width 683: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " |
- text run at (682,16) width 65: "Its font-" |
- text run at (0,70) width 746: "size should be 150% the base font size, and its line-height should be 300% of that value (18px and" |
- text run at (0,124) width 151: "54px, respectively). " |
- text run at (150,124) width 534: "Extra text is included for the purposes of testing this more effectively." |
+ RenderText {#text} at (0,16) size 750x129 |
+ text run at (0,16) width 686: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " |
+ text run at (686,16) width 64: "Its font-" |
+ text run at (0,70) width 750: "size should be 150% the base font size, and its line-height should be 300% of that value (18px and" |
+ text run at (0,124) width 153: "54px, respectively). " |
+ text run at (153,124) width 539: "Extra text is included for the purposes of testing this more effectively." |
RenderBlock {P} at (0,889.33) size 769x144 |
- RenderText {#text} at (0,7) size 766x129 |
- text run at (0,7) width 720: "This element should be in a monospace font, italicized and small caps, with a weight of" |
+ RenderText {#text} at (0,7) size 750x129 |
+ 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 711: "Its font-size should be 150% the base font size, and its line-height should be 2em," |
- text run at (0,79) width 550: "or twice the element's font size (18px and 36px, respectively). " |
- text run at (549,79) width 215: "Extra text is included for" |
- text run at (0,115) width 372: "the purposes of testing this more effectively." |
+ 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 618: "2em, or twice the element's font size (18px and 36px, 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,1051.33) size 769x288 |
- RenderText {#text} at (0,37) size 769x213 |
- text run at (0,37) width 703: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500. " |
- text run at (702,37) width 67: "Its font-" |
- text run at (0,133) width 635: "size should be 150% the base font size, or 18px, and its line-height should be 1in. " |
- text run at (634,133) width 101: "Extra text is" |
- text run at (0,229) width 455: "included for the purposes of testing this more effectively." |
+ RenderText {#text} at (0,37) size 765x213 |
+ 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 67: "Its font-" |
+ text run at (0,133) width 631: "size should be 150% the base font size, or 18px, and its line-height should be 1in. " |
+ text run at (631,133) width 99: "Extra text is" |
+ text run at (0,229) width 452: "included for the purposes of testing this more effectively." |
RenderBlock {P} at (0,1357.33) size 769x144 |
RenderText {#text} at (0,7) size 752x129 |
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" |
@@ -112,34 +112,34 @@ layer at (0,0) size 785x4233 |
text run at (687,7) width 51: "Extra text is" |
text run at (0,32) width 238: "included for the purposes of testing this more effectively." |
RenderBlock {P} at (0,1587.33) size 769x216 |
- RenderInline {SPAN} at (0,0) size 762x183 [bgcolor=#C0C0C0] |
- RenderText {#text} at (0,16) size 762x183 |
- text run at (0,16) width 683: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " |
- text run at (682,16) width 65: "Its font-" |
- text run at (0,70) width 746: "size should be 150% the base font size, and its line-height should be 300% of that value (18px and" |
- text run at (0,124) width 762: "54px, respectively). The text should have a silver background. The background color has been set on" |
- text run at (0,178) width 638: "an inline element and should therefore only cover the text, not the interline spacing." |
+ RenderInline {SPAN} at (0,0) size 763x183 [bgcolor=#C0C0C0] |
+ RenderText {#text} at (0,16) size 763x183 |
+ text run at (0,16) width 686: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " |
+ text run at (686,16) width 64: "Its font-" |
+ text run at (0,70) width 750: "size should be 150% the base font size, and its line-height should be 300% of that value (18px and" |
+ text run at (0,124) width 763: "54px, respectively). The text should have a silver background. The background color has been set on" |
+ text run at (0,178) width 642: "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,1821.33) size 769x2396 [border: (1px outset #808080)] |
- RenderTableSection {TBODY} at (1,1) size 767x2394 |
+ RenderTable {TABLE} at (0,1821.33) size 769x2357 [border: (1px outset #808080)] |
+ RenderTableSection {TBODY} at (1,1) size 767x2355 |
RenderTableRow {TR} at (0,0) size 767x26 |
RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] |
RenderInline {STRONG} at (0,0) size 163x18 |
RenderText {#text} at (4,4) size 163x18 |
text run at (4,4) width 163: "TABLE Testing Section" |
- RenderTableRow {TR} at (0,26) size 767x2368 |
- RenderTableCell {TD} at (0,1197) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderTableRow {TR} at (0,26) size 767x2329 |
+ RenderTableCell {TD} at (0,1177) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (4,4) size 4x18 |
text run at (4,4) width 4: " " |
- RenderTableCell {TD} at (12,26) size 755x2368.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
+ RenderTableCell {TD} at (12,26) size 755x2329.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
RenderBlock {P} at (4,4) size 747x36 |
RenderText {#text} at (0,0) size 732x36 |
text run at (0,0) width 564: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " |
text run at (564,0) width 168: "This is the \"base font size\"" |
text run at (0,18) width 204: "referred to in the following tests." |
RenderBlock {P} at (4,57.33) size 747x20 |
- RenderText {#text} at (0,0) size 504x20 |
- text run at (0,0) width 504: "This element should be 13pt. Helvetica which is in small-cap italics." |
+ RenderText {#text} at (0,0) size 501x20 |
+ text run at (0,0) width 501: "This element should be 13pt. Helvetica which is in small-cap italics." |
RenderBlock {P} at (4,101.33) size 747x144 |
RenderText {#text} at (0,4) size 735x136 |
text run at (0,4) width 374: "This element should be in a serif font. " |
@@ -169,39 +169,37 @@ layer at (0,0) size 785x4233 |
text run at (435,28) width 276: "The actual value of the font-size is UA-dependent." |
text run at (0,54) width 381: "Extra text is included for the purposes of testing this more effectively." |
RenderBlock {P} at (4,539.33) size 747x180 |
- RenderText {#text} at (0,4) size 727x172 |
- text run at (0,4) width 721: "This element should be in a sans-serif font, italicized and small caps," |
- text run at (0,40) width 227: "with a weight of 900. " |
- text run at (226,40) width 501: "Its font-size should be 150% the base font size," |
- text run at (0,76) width 677: "and its line-height should be 150% of that value (18px and 27px," |
- text run at (0,112) width 150: "respectively). " |
- text run at (149,112) width 569: "Extra text is included for the purposes of testing this" |
- text run at (0,148) width 179: "more effectively." |
+ RenderText {#text} at (0,4) size 721x172 |
+ text run at (0,4) width 714: "This element should be in a sans-serif font, italicized and small caps," |
+ text run at (0,40) width 226: "with a weight of 900. " |
+ text run at (226,40) width 495: "Its font-size should be 150% the base font size," |
+ text run at (0,76) width 671: "and its line-height should be 150% of that value (18px and 27px," |
+ text run at (0,112) width 148: "respectively). " |
+ text run at (148,112) width 561: "Extra text is included for the purposes of testing this" |
+ text run at (0,148) width 176: "more effectively." |
RenderBlock {P} at (4,743.33) size 747x288 |
- RenderText {#text} at (0,22) size 737x244 |
- text run at (0,22) width 737: "This element should be in a sans-serif font, italicized and small caps, with" |
- text run at (0,94) width 173: "a weight of 100. " |
- text run at (172,94) width 556: "Its font-size should be 150% the base font size, and its" |
- text run at (0,166) width 722: "line-height should be 300% of that value (18px and 54px, respectively)." |
- text run at (0,238) width 716: "Extra text is included for the purposes of testing this more effectively." |
- RenderBlock {P} at (4,1055.33) size 747x195 |
- RenderText {#text} at (0,8) size 730x179 |
- text run at (0,8) width 692: "This element should be in a monospace font, italicized and small caps, with a" |
- text run at (0,47) width 150: "weight of 900. " |
- text run at (149,47) width 581: "Its font-size should be 150% the base font size, and its line-" |
- text run at (0,86) width 654: "height should be 2em, or twice the element's font size (18px and 36px," |
- text run at (0,125) width 135: "respectively). " |
- text run at (134,125) width 534: "Extra text is included for the purposes of testing this more" |
- text run at (0,164) width 103: "effectively." |
- RenderBlock {P} at (4,1274.33) size 747x384 |
- RenderText {#text} at (0,34) size 746x316 |
- text run at (0,34) width 710: "This element should be in a sans-serif font, italicized and small caps," |
- text run at (0,130) width 226: "with a weight of 500. " |
- text run at (225,130) width 498: "Its font-size should be 150% the base font size," |
- text run at (0,226) width 437: "or 18px, and its line-height should be 1in. " |
- text run at (436,226) width 310: "Extra text is included for the" |
- text run at (0,322) width 434: "purposes of testing this more effectively." |
- RenderBlock {P} at (4,1682.33) size 747x144 |
+ RenderText {#text} at (0,22) size 746x244 |
+ text run at (0,22) width 746: "This element should be in a sans-serif font, italicized and small caps, with a" |
+ text run at (0,94) width 153: "weight of 100. " |
+ text run at (153,94) width 548: "Its font-size should be 150% the base font size, and its" |
+ text run at (0,166) width 712: "line-height should be 300% of that value (18px and 54px, respectively)." |
+ text run at (0,238) width 704: "Extra text is included for the purposes of testing this more effectively." |
+ RenderBlock {P} at (4,1055.33) size 747x156 |
+ RenderText {#text} at (0,8) size 740x140 |
+ text run at (0,8) width 740: "This element should be in a monospace font, italicized and small caps, with a weight" |
+ text run at (0,47) width 88: "of 900. " |
+ text run at (88,47) width 620: "Its font-size should be 150% the base font size, and its line-height" |
+ text run at (0,86) width 716: "should be 2em, or twice the element's font size (18px and 36px, respectively)." |
+ text run at (0,125) width 636: "Extra text is included for the purposes of testing this more effectively." |
+ RenderBlock {P} at (4,1235.33) size 747x384 |
+ RenderText {#text} at (0,34) size 739x316 |
+ text run at (0,34) width 702: "This element should be in a sans-serif font, italicized and small caps," |
+ text run at (0,130) width 225: "with a weight of 500. " |
+ text run at (225,130) width 491: "Its font-size should be 150% the base font size," |
+ text run at (0,226) width 433: "or 18px, and its line-height should be 1in. " |
+ text run at (433,226) width 306: "Extra text is included for the" |
+ text run at (0,322) width 428: "purposes of testing this more effectively." |
+ RenderBlock {P} at (4,1643.33) size 747x144 |
RenderText {#text} at (0,7) size 730x129 |
text run at (0,7) width 730: "This element should be in a sans-serif font, oblique and not small-caps, with a weight" |
text run at (0,43) width 62: "of 700. " |
@@ -209,20 +207,20 @@ layer at (0,0) size 785x4233 |
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,1844.33) size 747x64 |
+ RenderBlock {P} at (4,1805.33) size 747x64 |
RenderText {#text} at (0,8) size 736x47 |
text run at (0,8) width 373: "This element should be in a sans-serif font, with a weight of 400. " |
text run at (373,8) width 363: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" |
text run at (0,40) width 193: "shoud be 2.5 times that, or 24px. " |
text run at (193,40) width 394: "Extra text is included for the purposes of testing this more effectively." |
- RenderBlock {P} at (4,1932.33) size 747x432 |
- RenderInline {SPAN} at (0,0) size 737x388 [bgcolor=#C0C0C0] |
- RenderText {#text} at (0,22) size 737x388 |
- text run at (0,22) width 737: "This element should be in a sans-serif font, italicized and small caps, with" |
- text run at (0,94) width 173: "a weight of 100. " |
- text run at (172,94) width 556: "Its font-size should be 150% the base font size, and its" |
- text run at (0,166) width 722: "line-height should be 300% of that value (18px and 54px, respectively)." |
- text run at (0,238) width 699: "The text should have a silver background. The background color has" |
- text run at (0,310) width 717: "been set on an inline element and should therefore only cover the text," |
- text run at (0,382) width 253: "not the interline spacing." |
+ RenderBlock {P} at (4,1893.33) size 747x432 |
+ RenderInline {SPAN} at (0,0) size 746x388 [bgcolor=#C0C0C0] |
+ RenderText {#text} at (0,22) size 746x388 |
+ text run at (0,22) width 746: "This element should be in a sans-serif font, italicized and small caps, with a" |
+ text run at (0,94) width 153: "weight of 100. " |
+ text run at (153,94) width 548: "Its font-size should be 150% the base font size, and its" |
+ text run at (0,166) width 712: "line-height should be 300% of that value (18px and 54px, respectively)." |
+ text run at (0,238) width 739: "The text should have a silver background. The background color has been" |
+ text run at (0,310) width 734: "set on an inline element and should therefore only cover the text, not the" |
+ text run at (0,382) width 170: "interline spacing." |
RenderText {#text} at (0,0) size 0x0 |