| 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 6337631491058d4f9d77e0d133f166da07b4fe34..2f391d6cff0b3344e5fe909e6c55bb1e5396718e 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 785x4194
|
| RenderView at (0,0) size 785x600
|
| layer at (0,0) size 785x4194
|
| - RenderBlock {HTML} at (0,0) size 785x4195
|
| - RenderBody {BODY} at (8,8) size 769x4179 [bgcolor=#CCCCCC]
|
| + 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:"
|
| @@ -37,24 +37,24 @@ layer at (0,0) size 785x4194
|
| RenderText {#text} at (0,0) size 706x14
|
| 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) size 769x21
|
| + RenderBlock {P} at (0,251.33) size 769x20
|
| RenderText {#text} at (0,0) size 497x20
|
| text run at (0,0) width 497: "This element should be 13pt. Helvetica which is in small-cap italics."
|
| - RenderBlock {P} at (0,289) size 769x82
|
| + 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. "
|
| text run at (282,2) width 480: "Its font-size should be 150% the base font size, and its line-height"
|
| text run at (0,29) width 423: "should 150% of that value (18px and 27px, respectively). "
|
| text run at (423,29) width 297: "Extra text is included for the purposes of"
|
| text run at (0,56) width 208: "testing this more effectively."
|
| - RenderBlock {P} at (0,388) size 769x82
|
| + RenderBlock {P} at (0,388.33) size 769x81
|
| RenderText {#text} at (0,3) size 760x75
|
| text run at (0,3) width 348: "This element should be in a sans-serif font. "
|
| text run at (348,3) width 412: "Its font-size should be 150% the base font size, and"
|
| text run at (0,30) width 568: "its line-height should 150% of that value (18px and 27px, respectively). "
|
| text run at (568,30) width 192: "Extra text is included for"
|
| text run at (0,57) width 351: "the purposes of testing this more effectively."
|
| - RenderBlock {P} at (0,487) size 769x79
|
| + RenderBlock {P} at (0,487.33) size 769x78
|
| RenderText {#text} at (0,2) size 762x47
|
| text run at (0,2) width 628: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. "
|
| text run at (628,2) width 134: "For example, if the font-"
|
| @@ -67,7 +67,7 @@ layer at (0,0) size 785x4194
|
| text run at (408,28) width 280: "The actual value of the font-size is UA-dependent. "
|
| 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) size 769x109
|
| + RenderBlock {P} at (0,583.33) size 769x108
|
| 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"
|
| @@ -75,14 +75,14 @@ layer at (0,0) size 785x4194
|
| 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) size 769x163
|
| + RenderBlock {P} at (0,709.33) size 769x162
|
| 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) size 769x145
|
| + RenderBlock {P} at (0,889.33) size 769x144
|
| 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. "
|
| @@ -90,14 +90,14 @@ layer at (0,0) size 785x4194
|
| 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) size 769x289
|
| + RenderBlock {P} at (0,1051.33) size 769x288
|
| 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) size 769x145
|
| + 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"
|
| text run at (0,43) width 40: "700. "
|
| @@ -105,12 +105,12 @@ layer at (0,0) size 785x4194
|
| 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 (0,1519) size 769x51
|
| + RenderBlock {P} at (0,1519.33) size 769x50
|
| RenderText {#text} at (0,6) size 754x37
|
| text run at (0,6) width 301: "This element should be in a sans-serif font, with a weight of 400. "
|
| text run at (301,6) width 453: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px."
|
| text run at (0,31) width 318: "Extra text is included for the purposes of testing this more effectively."
|
| - RenderBlock {P} at (0,1587) size 769x217
|
| + RenderBlock {P} at (0,1587.33) size 769x216
|
| 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. "
|
| @@ -119,7 +119,7 @@ layer at (0,0) size 785x4194
|
| 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) size 769x2358 [border: (1px outset #808080)]
|
| + 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]
|
| @@ -130,16 +130,16 @@ layer at (0,0) size 785x4194
|
| 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 755x2330 [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) size 747x21
|
| + RenderBlock {P} at (4,57.33) size 747x20
|
| RenderText {#text} at (0,0) size 497x20
|
| text run at (0,0) width 497: "This element should be 13pt. Helvetica which is in small-cap italics."
|
| - RenderBlock {P} at (4,101) size 747x145
|
| + 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. "
|
| text run at (374,4) width 361: "Its font-size should be 150% the base"
|
| @@ -147,7 +147,7 @@ layer at (0,0) size 785x4194
|
| text run at (0,76) width 138: "respectively). "
|
| text run at (138,76) width 563: "Extra text is included for the purposes of testing this more"
|
| text run at (0,112) width 111: "effectively."
|
| - RenderBlock {P} at (4,269) size 747x145
|
| + RenderBlock {P} at (4,269.33) size 747x144
|
| RenderText {#text} at (0,4) size 733x136
|
| text run at (0,4) width 461: "This element should be in a sans-serif font. "
|
| text run at (461,4) width 232: "Its font-size should be"
|
| @@ -155,7 +155,7 @@ layer at (0,0) size 785x4194
|
| text run at (0,76) width 324: "(18px and 27px, respectively). "
|
| text run at (324,76) width 399: "Extra text is included for the purposes"
|
| text run at (0,112) width 322: "of testing this more effectively."
|
| - RenderBlock {P} at (4,437) size 747x79
|
| + RenderBlock {P} at (4,437.33) size 747x78
|
| RenderText {#text} at (0,2) size 731x47
|
| text run at (0,2) width 628: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. "
|
| text run at (628,2) width 103: "For example, if the"
|
| @@ -167,7 +167,7 @@ layer at (0,0) size 785x4194
|
| text run at (112,28) width 323: " is calculated at 10px, then the line-height should be 20px. "
|
| 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) size 747x181
|
| + RenderBlock {P} at (4,539.33) size 747x180
|
| 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. "
|
| @@ -176,21 +176,21 @@ layer at (0,0) size 785x4194
|
| 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) size 747x289
|
| + RenderBlock {P} at (4,743.33) size 747x288
|
| 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) size 747x157
|
| + 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) size 747x385
|
| + 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. "
|
| @@ -198,7 +198,7 @@ layer at (0,0) size 785x4194
|
| 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) size 747x145
|
| + 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. "
|
| @@ -206,13 +206,13 @@ layer at (0,0) size 785x4194
|
| 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,1805) size 747x65
|
| + RenderBlock {P} at (4,1805.33) size 747x64
|
| RenderText {#text} at (0,8) size 714x47
|
| text run at (0,8) width 378: "This element should be in a sans-serif font, with a weight of 400. "
|
| text run at (378,8) width 336: "Its font-size should be 80% of 12px, or 9.6px, and its line-"
|
| text run at (0,40) width 235: "height shoud be 2.5 times that, or 24px. "
|
| text run at (235,40) width 405: "Extra text is included for the purposes of testing this more effectively."
|
| - RenderBlock {P} at (4,1893) size 747x433
|
| + 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"
|
|
|