⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 271110 in webkit


Ignore:
Timestamp:
Dec 30, 2020, 2:31:08 PM (6 years ago)
Author:
Alan Bujtas
Message:

[Legacy Line Layout] Remove unnecessary 'vertical-align: middle' integral rounding
https://bugs.webkit.org/show_bug.cgi?id=220198

Reviewed by Antti Koivisto.

Source/WebCore:

Let's not do "random" rounding for 'vertical-align: middle'. Fix it for all the alignment types by
adjusting the logical top position when the inline box stretches the line.

  • rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::computeLogicalBoxHeights):

  • rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::verticalPositionForBox):

LayoutTests:

Added additional 'vertical-align' values.

  • fast/sub-pixel/vertical-align-middle-overflow.html:
Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r271109 r271110  
     12020-12-30  Zalan Bujtas  <zalan@apple.com>
     2
     3        [Legacy Line Layout] Remove unnecessary 'vertical-align: middle' integral rounding
     4        https://bugs.webkit.org/show_bug.cgi?id=220198
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Added additional 'vertical-align' values.
     9
     10        * fast/sub-pixel/vertical-align-middle-overflow.html:
     11
    1122020-12-30  Simon Fraser  <simon.fraser@apple.com>
    213
  • trunk/LayoutTests/fast/sub-pixel/vertical-align-middle-overflow-expected.txt

    r122883 r271110  
    11PASS Does not overflow.
    2   Cell 2
    3 The block above should not have a scrollbar.
     2PASS Does not overflow.
     3PASS Does not overflow.
     4  text
     5  text
     6  text
     7The blocks above should not have scrollbars.
  • trunk/LayoutTests/fast/sub-pixel/vertical-align-middle-overflow.html

    r155272 r271110  
    77                width: 100px;
    88            }
    9             .icon {
     9            .subpixelAligned {
    1010                display: inline-block;
    11                 background-color: red;
     11                background-color: blue;
    1212                height: 29px;
    1313                width: 29px;
    14                 vertical-align: middle;
    1514            }
    1615        </style>
     
    1817    </head>
    1918    <body>
    20         <div id="test-block" class="block">
    21             <span class="icon">&nbsp;</span>
    22             <span>Cell 2</span>
     19        <div id="test-block1" class="block">
     20            <span class="subpixelAligned" style="vertical-align: middle">&nbsp;</span>
     21            <span>text</span>
     22        </div>
     23        <div id="test-block2" class="block">
     24            <span class="subpixelAligned" style="vertical-align: 58%">&nbsp;</span>
     25            <span>text</span>
     26        </div>
     27
     28        <div id="test-block3" class="block">
     29            <span class="subpixelAligned" style="vertical-align: 10.5px">&nbsp;</span>
     30            <span>text</span>
    2331        </div>
    2432
    2533        <p>
    26             The block above should not have a scrollbar.
     34            The blocks above should not have scrollbars.
    2735        </p>
    2836       
    2937        <script>
    30             var element = document.getElementById('test-block');
     38            for (let i = 1; i <= 3; ++i) {
     39                let element = document.getElementById('test-block' + i);
    3140
    32             if (element.offsetHeight == element.scrollHeight)
    33                 testPassed('Does not overflow.');
    34             else
    35                 testFailed('Overflows, offsetHeight ' + element.offsetHeight + 'px, scrollHeight ' + element.scrollHeight + 'px');
     41                if (element.offsetHeight == element.scrollHeight)
     42                    testPassed('Does not overflow.');
     43                else
     44                    testFailed('Overflows, offsetHeight ' + element.offsetHeight + 'px, scrollHeight ' + element.scrollHeight + 'px');
     45            }
    3646        </script>
    3747  </body>
  • trunk/LayoutTests/platform/ios-wk2/css2.1/t100801-c544-valgn-03-d-agi-expected.txt

    r180557 r271110  
    1111          text run at (85,20) width 210: "other blue rectangles on the line."
    1212      RenderBlock {P} at (15,56) size 754x235 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)]
    13         RenderText {#text} at (8,34) size 61x16
    14           text run at (8,34) width 61: "\x{C9}\x{C9}\x{C9} "
    15         RenderImage {IMG} at (68,25) size 31x31
    16         RenderText {#text} at (98,34) size 16x16
    17           text run at (98,34) width 16: " "
     13        RenderText {#text} at (8,35) size 61x16
     14          text run at (8,35) width 61: "\x{C9}\x{C9}\x{C9} "
     15        RenderImage {IMG} at (68,26) size 31x31
     16        RenderText {#text} at (98,35) size 16x16
     17          text run at (98,35) width 16: " "
    1818        RenderInline {SPAN} at (0,0) size 115x40 [color=#C0C0C0]
    19           RenderText {#text} at (113,15) size 115x40
    20             text run at (113,15) width 115: "xxx"
    21         RenderText {#text} at (227,34) size 16x16
    22           text run at (227,34) width 16: " "
    23         RenderImage {IMG} at (242,15) size 51x51
    24         RenderText {#text} at (292,34) size 76x16
    25           text run at (292,34) width 16: " "
    26           text run at (307,34) width 61: "\x{C9}\x{C9}\x{C9} "
    27         RenderImage {IMG} at (367,35) size 11x11
    28         RenderText {#text} at (377,34) size 16x16
    29           text run at (377,34) width 16: " "
     19          RenderText {#text} at (113,16) size 115x40
     20            text run at (113,16) width 115: "xxx"
     21        RenderText {#text} at (227,35) size 16x16
     22          text run at (227,35) width 16: " "
     23        RenderImage {IMG} at (242,16) size 51x51
     24        RenderText {#text} at (292,35) size 76x16
     25          text run at (292,35) width 16: " "
     26          text run at (307,35) width 61: "\x{C9}\x{C9}\x{C9} "
     27        RenderImage {IMG} at (367,36) size 11x11
     28        RenderText {#text} at (377,35) size 16x16
     29          text run at (377,35) width 16: " "
    3030        RenderInline {SMALL} at (0,0) size 31x11 [color=#C0C0C0]
    31           RenderText {#text} at (392,38) size 31x11
    32             text run at (392,38) width 31: "xxx"
    33         RenderText {#text} at (422,34) size 16x16
    34           text run at (422,34) width 16: " "
    35         RenderImage {IMG} at (437,30) size 21x21
    36         RenderText {#text} at (457,34) size 76x16
    37           text run at (457,34) width 16: " "
    38           text run at (472,34) width 61: "\x{C9}\x{C9}\x{C9} "
     31          RenderText {#text} at (392,39) size 31x11
     32            text run at (392,39) width 31: "xxx"
     33        RenderText {#text} at (422,35) size 16x16
     34          text run at (422,35) width 16: " "
     35        RenderImage {IMG} at (437,31) size 21x21
     36        RenderText {#text} at (457,35) size 76x16
     37          text run at (457,35) width 16: " "
     38          text run at (472,35) width 61: "\x{C9}\x{C9}\x{C9} "
    3939        RenderImage {IMG} at (532,8) size 66x66
    40         RenderText {#text} at (597,34) size 76x16
    41           text run at (597,34) width 16: " "
    42           text run at (612,34) width 61: "\x{C9}\x{C9}\x{C9} "
    43         RenderImage {IMG} at (672,23) size 36x36
     40        RenderText {#text} at (597,35) size 76x16
     41          text run at (597,35) width 16: " "
     42          text run at (612,35) width 61: "\x{C9}\x{C9}\x{C9} "
     43        RenderImage {IMG} at (672,24) size 36x35
    4444        RenderText {#text} at (0,0) size 0x0
    4545        RenderInline {SPAN} at (0,0) size 91x31 [color=#C0C0C0]
     
    6969        RenderText {#text} at (640,105) size 16x16
    7070          text run at (640,105) width 16: " "
    71         RenderImage {IMG} at (655,104) size 16x16
     71        RenderImage {IMG} at (655,104) size 16x15
    7272        RenderText {#text} at (670,105) size 16x16
    7373          text run at (670,105) width 16: " "
  • trunk/LayoutTests/platform/ios/css1/text_properties/vertical_align-expected.txt

    r269912 r271110  
    1 layer at (0,0) size 800x4470
     1layer at (0,0) size 800x4468
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x4470
    4   RenderBlock {HTML} at (0,0) size 800x4470
    5     RenderBody {BODY} at (8,8) size 784x4454 [bgcolor=#CCCCCC]
     3layer at (0,0) size 800x4468
     4  RenderBlock {HTML} at (0,0) size 800x4468
     5    RenderBody {BODY} at (8,8) size 784x4452 [bgcolor=#CCCCCC]
    66      RenderBlock {P} at (0,0) size 784x20
    77        RenderText {#text} at (0,0) size 363x19
     
    222222          text run at (0,0) width 765: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be"
    223223          text run at (0,20) width 371: "aligned with the text baseline (which is the default value)."
    224       RenderBlock {P} at (0,1853) size 784x233
     224      RenderBlock {P} at (0,1853) size 784x232
    225225        RenderText {#text} at (0,22) size 101x19
    226226          text run at (0,22) width 101: "This paragraph "
    227         RenderImage {IMG} at (100,18) size 10x30
     227        RenderImage {IMG} at (100,18) size 10x31
    228228        RenderText {#text} at (109,22) size 5x19
    229229          text run at (109,22) width 5: " "
     
    233233        RenderText {#text} at (468,22) size 5x19
    234234          text run at (468,22) width 5: " "
    235         RenderImage {IMG} at (472,8) size 16x50
     235        RenderImage {IMG} at (472,8) size 16x51
    236236        RenderText {#text} at (487,22) size 126x19
    237237          text run at (487,22) width 126: " of varying heights "
    238         RenderImage {IMG} at (612,28) size 4x10
     238        RenderImage {IMG} at (612,28) size 4x11
    239239        RenderText {#text} at (615,22) size 5x19
    240240          text run at (615,22) width 5: " "
     
    244244        RenderText {#text} at (689,22) size 5x19
    245245          text run at (689,22) width 5: " "
    246         RenderImage {IMG} at (693,23) size 7x20
     246        RenderImage {IMG} at (693,23) size 7x21
    247247        RenderText {#text} at (699,22) size 85x19
    248248          text run at (699,22) width 85: " all of which "
    249         RenderImage {IMG} at (0,77) size 20x65
     249        RenderImage {IMG} at (0,76) size 20x66
    250250        RenderText {#text} at (20,98) size 121x19
    251251          text run at (20,98) width 121: " should be aligned "
    252         RenderImage {IMG} at (140,92) size 12x35
     252        RenderImage {IMG} at (140,91) size 12x36
    253253        RenderText {#text} at (151,98) size 5x19
    254254          text run at (151,98) width 5: " "
     
    258258        RenderText {#text} at (391,98) size 5x19
    259259          text run at (391,98) width 5: " "
    260         RenderImage {IMG} at (395,84) size 16x50
     260        RenderImage {IMG} at (395,84) size 16x51
    261261        RenderText {#text} at (410,98) size 5x19
    262262          text run at (410,98) width 5: " "
     
    271271        RenderText {#text} at (758,98) size 5x19
    272272          text run at (758,98) width 5: " "
    273         RenderImage {IMG} at (762,84) size 16x50
     273        RenderImage {IMG} at (762,84) size 16x51
    274274        RenderText {#text} at (0,0) size 0x0
    275275        RenderInline {SMALL} at (0,0) size 194x19
    276           RenderText {#text} at (0,176) size 194x19
    277             text run at (0,176) width 194: "regardless of the line in which"
    278         RenderText {#text} at (193,176) size 5x19
    279           text run at (193,176) width 5: " "
    280         RenderImage {IMG} at (197,180) size 6x15
    281         RenderText {#text} at (202,176) size 5x19
    282           text run at (202,176) width 5: " "
     276          RenderText {#text} at (0,175) size 194x19
     277            text run at (0,175) width 194: "regardless of the line in which"
     278        RenderText {#text} at (193,175) size 5x19
     279          text run at (193,175) width 5: " "
     280        RenderImage {IMG} at (197,178) size 6x16
     281        RenderText {#text} at (202,175) size 5x19
     282          text run at (202,175) width 5: " "
    283283        RenderInline {BIG} at (0,0) size 156x24
    284           RenderText {#text} at (206,172) size 156x24
    285             text run at (206,172) width 156: "the images appear."
    286         RenderText {#text} at (361,176) size 5x19
    287           text run at (361,176) width 5: " "
    288         RenderImage {IMG} at (365,142) size 28x90
     284          RenderText {#text} at (206,171) size 156x24
     285            text run at (206,171) width 156: "the images appear."
     286        RenderText {#text} at (361,175) size 5x19
     287          text run at (361,175) width 5: " "
     288        RenderImage {IMG} at (365,141) size 28x90
    289289        RenderText {#text} at (0,0) size 0x0
    290       RenderBlock {P} at (0,2101) size 784x41
     290      RenderBlock {P} at (0,2100) size 784x41
    291291        RenderText {#text} at (0,0) size 751x39
    292292          text run at (0,0) width 751: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that"
    293293          text run at (0,20) width 178: "element is an image or not. "
    294294          text run at (177,20) width 563: "Each fragment of text has been SPANned appropriately in order to cause this to happen."
    295       RenderBlock {P} at (0,2157) size 784x203
     295      RenderBlock {P} at (0,2156) size 784x203
    296296        RenderInline {SPAN} at (0,0) size 97x19
    297297          RenderText {#text} at (0,0) size 97x19
     
    375375        RenderImage {IMG} at (211,112) size 28x90
    376376        RenderText {#text} at (0,0) size 0x0
    377       RenderTable {TABLE} at (0,2375) size 784x2079 [border: (1px outset #808080)]
    378         RenderTableSection {TBODY} at (1,1) size 782x2077
     377      RenderTable {TABLE} at (0,2374) size 784x2078 [border: (1px outset #808080)]
     378        RenderTableSection {TBODY} at (1,1) size 782x2076
    379379          RenderTableRow {TR} at (0,0) size 782x28
    380380            RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
     
    382382                RenderText {#text} at (4,4) size 161x19
    383383                  text run at (4,4) width 161: "TABLE Testing Section"
    384           RenderTableRow {TR} at (0,28) size 782x2049
    385             RenderTableCell {TD} at (0,1038) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
    386               RenderText {#text} at (4,3) size 4x20
    387                 text run at (4,4) width 4: " "
    388             RenderTableCell {TD} at (12,28) size 770x2049 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
     384          RenderTableRow {TR} at (0,28) size 782x2048
     385            RenderTableCell {TD} at (0,1037) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
     386              RenderText {#text} at (4,4) size 4x20
     387                text run at (4,5) width 4: " "
     388            RenderTableCell {TD} at (12,28) size 770x2048 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
    389389              RenderBlock {P} at (4,4) size 762x79
    390390                RenderImage {IMG} at (0,0) size 15x50
     
    563563                  text run at (0,0) width 746: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should"
    564564                  text run at (0,20) width 390: "be aligned with the text baseline (which is the default value)."
    565               RenderBlock {P} at (4,1538) size 762x233
     565              RenderBlock {P} at (4,1538) size 762x232
    566566                RenderText {#text} at (0,22) size 101x19
    567567                  text run at (0,22) width 101: "This paragraph "
    568                 RenderImage {IMG} at (100,18) size 10x30
     568                RenderImage {IMG} at (100,18) size 10x31
    569569                RenderText {#text} at (109,22) size 5x19
    570570                  text run at (109,22) width 5: " "
     
    574574                RenderText {#text} at (468,22) size 5x19
    575575                  text run at (468,22) width 5: " "
    576                 RenderImage {IMG} at (472,8) size 16x50
     576                RenderImage {IMG} at (472,8) size 16x51
    577577                RenderText {#text} at (487,22) size 126x19
    578578                  text run at (487,22) width 126: " of varying heights "
    579                 RenderImage {IMG} at (612,28) size 4x10
     579                RenderImage {IMG} at (612,28) size 4x11
    580580                RenderText {#text} at (615,22) size 5x19
    581581                  text run at (615,22) width 5: " "
     
    585585                RenderText {#text} at (689,22) size 5x19
    586586                  text run at (689,22) width 5: " "
    587                 RenderImage {IMG} at (693,23) size 7x20
     587                RenderImage {IMG} at (693,23) size 7x21
    588588                RenderText {#text} at (699,22) size 737x95
    589589                  text run at (699,22) width 38: " all of"
    590590                  text run at (0,98) width 44: "which "
    591                 RenderImage {IMG} at (43,77) size 21x65
     591                RenderImage {IMG} at (43,76) size 21x66
    592592                RenderText {#text} at (63,98) size 121x19
    593593                  text run at (63,98) width 121: " should be aligned "
    594                 RenderImage {IMG} at (183,92) size 12x35
     594                RenderImage {IMG} at (183,91) size 12x36
    595595                RenderText {#text} at (194,98) size 5x19
    596596                  text run at (194,98) width 5: " "
     
    600600                RenderText {#text} at (434,98) size 5x19
    601601                  text run at (434,98) width 5: " "
    602                 RenderImage {IMG} at (438,84) size 16x50
     602                RenderImage {IMG} at (438,84) size 16x51
    603603                RenderText {#text} at (453,98) size 5x19
    604604                  text run at (453,98) width 5: " "
    605                 RenderInline {SPAN} at (0,0) size 720x106
     605                RenderInline {SPAN} at (0,0) size 720x105
    606606                  RenderText {#text} at (457,91) size 18x28
    607607                    text run at (457,91) width 18: "a "
     
    609609                    RenderText {#text} at (474,59) size 204x67
    610610                      text run at (474,59) width 204: "14-point"
    611                   RenderText {#text} at (677,91) size 720x106
     611                  RenderText {#text} at (677,91) size 720x105
    612612                    text run at (677,91) width 43: " text"
    613                     text run at (0,169) width 76: "element"
    614                 RenderText {#text} at (75,176) size 5x19
    615                   text run at (75,176) width 5: " "
    616                 RenderImage {IMG} at (79,162) size 16x50
    617                 RenderText {#text} at (94,176) size 5x19
    618                   text run at (94,176) width 5: " "
     613                    text run at (0,168) width 76: "element"
     614                RenderText {#text} at (75,175) size 5x19
     615                  text run at (75,175) width 5: " "
     616                RenderImage {IMG} at (79,161) size 16x51
     617                RenderText {#text} at (94,175) size 5x19
     618                  text run at (94,175) width 5: " "
    619619                RenderInline {SMALL} at (0,0) size 195x19
    620                   RenderText {#text} at (98,176) size 195x19
    621                     text run at (98,176) width 195: "regardless of the line in which"
    622                 RenderText {#text} at (292,176) size 5x19
    623                   text run at (292,176) width 5: " "
    624                 RenderImage {IMG} at (296,180) size 6x15
    625                 RenderText {#text} at (301,176) size 5x19
    626                   text run at (301,176) width 5: " "
     620                  RenderText {#text} at (98,175) size 195x19
     621                    text run at (98,175) width 195: "regardless of the line in which"
     622                RenderText {#text} at (292,175) size 5x19
     623                  text run at (292,175) width 5: " "
     624                RenderImage {IMG} at (296,178) size 6x16
     625                RenderText {#text} at (301,175) size 5x19
     626                  text run at (301,175) width 5: " "
    627627                RenderInline {BIG} at (0,0) size 156x24
    628                   RenderText {#text} at (305,172) size 156x24
    629                     text run at (305,172) width 156: "the images appear."
    630                 RenderText {#text} at (460,176) size 5x19
    631                   text run at (460,176) width 5: " "
    632                 RenderImage {IMG} at (464,142) size 28x90
     628                  RenderText {#text} at (305,171) size 156x24
     629                    text run at (305,171) width 156: "the images appear."
     630                RenderText {#text} at (460,175) size 5x19
     631                  text run at (460,175) width 5: " "
     632                RenderImage {IMG} at (464,141) size 28x90
    633633                RenderText {#text} at (0,0) size 0x0
    634               RenderBlock {P} at (4,1786) size 762x41
     634              RenderBlock {P} at (4,1785) size 762x41
    635635                RenderText {#text} at (0,0) size 751x39
    636636                  text run at (0,0) width 751: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that"
    637637                  text run at (0,20) width 178: "element is an image or not. "
    638638                  text run at (177,20) width 563: "Each fragment of text has been SPANned appropriately in order to cause this to happen."
    639               RenderBlock {P} at (4,1842) size 762x203
     639              RenderBlock {P} at (4,1841) size 762x203
    640640                RenderInline {SPAN} at (0,0) size 97x19
    641641                  RenderText {#text} at (0,0) size 97x19
  • trunk/LayoutTests/platform/ios/css2.1/t100801-c544-valgn-03-d-agi-expected.txt

    r174491 r271110  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x321
    4   RenderBlock {HTML} at (0,0) size 800x321
    5     RenderBody {BODY} at (8,16) size 784x290
     3layer at (0,0) size 800x322
     4  RenderBlock {HTML} at (0,0) size 800x322
     5    RenderBody {BODY} at (8,16) size 784x291
    66      RenderBlock {P} at (0,0) size 784x40
    77        RenderText {#text} at (0,0) size 761x39
     
    1010          text run at (0,20) width 86: "alignment as "
    1111          text run at (85,20) width 210: "other blue rectangles on the line."
    12       RenderBlock {P} at (15,56) size 754x234 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)]
    13         RenderText {#text} at (8,36) size 61x16
    14           text run at (8,36) width 61: "\x{C9}\x{C9}\x{C9} "
     12      RenderBlock {P} at (15,56) size 754x235 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)]
     13        RenderText {#text} at (8,35) size 61x16
     14          text run at (8,35) width 61: "\x{C9}\x{C9}\x{C9} "
    1515        RenderImage {IMG} at (68,26) size 31x31
    16         RenderText {#text} at (98,36) size 16x16
    17           text run at (98,36) width 16: " "
     16        RenderText {#text} at (98,35) size 16x16
     17          text run at (98,35) width 16: " "
    1818        RenderInline {SPAN} at (0,0) size 115x40 [color=#C0C0C0]
    19           RenderText {#text} at (113,17) size 115x40
    20             text run at (113,17) width 115: "xxx"
    21         RenderText {#text} at (227,36) size 16x16
    22           text run at (227,36) width 16: " "
     19          RenderText {#text} at (113,16) size 115x40
     20            text run at (113,16) width 115: "xxx"
     21        RenderText {#text} at (227,35) size 16x16
     22          text run at (227,35) width 16: " "
    2323        RenderImage {IMG} at (242,16) size 51x51
    24         RenderText {#text} at (292,36) size 76x16
    25           text run at (292,36) width 16: " "
    26           text run at (307,36) width 61: "\x{C9}\x{C9}\x{C9} "
     24        RenderText {#text} at (292,35) size 76x16
     25          text run at (292,35) width 16: " "
     26          text run at (307,35) width 61: "\x{C9}\x{C9}\x{C9} "
    2727        RenderImage {IMG} at (367,36) size 11x11
    28         RenderText {#text} at (377,36) size 16x16
    29           text run at (377,36) width 16: " "
     28        RenderText {#text} at (377,35) size 16x16
     29          text run at (377,35) width 16: " "
    3030        RenderInline {SMALL} at (0,0) size 31x11 [color=#C0C0C0]
    31           RenderText {#text} at (392,40) size 31x11
    32             text run at (392,40) width 31: "xxx"
    33         RenderText {#text} at (422,36) size 16x16
    34           text run at (422,36) width 16: " "
     31          RenderText {#text} at (392,39) size 31x11
     32            text run at (392,39) width 31: "xxx"
     33        RenderText {#text} at (422,35) size 16x16
     34          text run at (422,35) width 16: " "
    3535        RenderImage {IMG} at (437,31) size 21x21
    36         RenderText {#text} at (457,36) size 76x16
    37           text run at (457,36) width 16: " "
    38           text run at (472,36) width 61: "\x{C9}\x{C9}\x{C9} "
     36        RenderText {#text} at (457,35) size 76x16
     37          text run at (457,35) width 16: " "
     38          text run at (472,35) width 61: "\x{C9}\x{C9}\x{C9} "
    3939        RenderImage {IMG} at (532,8) size 66x66
    40         RenderText {#text} at (597,36) size 76x16
    41           text run at (597,36) width 16: " "
    42           text run at (612,36) width 61: "\x{C9}\x{C9}\x{C9} "
    43         RenderImage {IMG} at (672,23) size 36x36
     40        RenderText {#text} at (597,35) size 76x16
     41          text run at (597,35) width 16: " "
     42          text run at (612,35) width 61: "\x{C9}\x{C9}\x{C9} "
     43        RenderImage {IMG} at (672,24) size 36x35
    4444        RenderText {#text} at (0,0) size 0x0
    4545        RenderInline {SPAN} at (0,0) size 91x31 [color=#C0C0C0]
     
    4848        RenderText {#text} at (98,105) size 16x16
    4949          text run at (98,105) width 16: " "
    50         RenderImage {IMG} at (113,85) size 51x51
     50        RenderImage {IMG} at (113,86) size 51x51
    5151        RenderText {#text} at (163,105) size 16x16
    5252          text run at (163,105) width 16: " "
     
    6161        RenderText {#text} at (530,105) size 16x16
    6262          text run at (530,105) width 16: " "
    63         RenderImage {IMG} at (545,85) size 51x51
     63        RenderImage {IMG} at (545,86) size 51x51
    6464        RenderText {#text} at (595,105) size 16x16
    6565          text run at (595,105) width 16: " "
     
    6969        RenderText {#text} at (640,105) size 16x16
    7070          text run at (640,105) width 16: " "
    71         RenderImage {IMG} at (655,102) size 16x16
     71        RenderImage {IMG} at (655,104) size 16x15
    7272        RenderText {#text} at (670,105) size 16x16
    7373          text run at (670,105) width 16: " "
     
    7676            text run at (685,101) width 61: "xxx"
    7777        RenderText {#text} at (0,0) size 0x0
    78         RenderImage {IMG} at (8,135) size 91x91
     78        RenderImage {IMG} at (8,136) size 91x91
    7979        RenderText {#text} at (98,175) size 61x16
    8080          text run at (98,175) width 16: " "
  • trunk/LayoutTests/platform/ios/fast/block/basic/014-expected.txt

    r179104 r271110  
    66      RenderInline {A} at (0,0) size 21x18 [color=#0000EE]
    77        RenderImage {IMG} at (0,0) size 21x21 [bgcolor=#008000]
    8       RenderText {#text} at (21,0) size 4x18
    9         text run at (21,0) width 4: " "
    10       RenderImage {IMG} at (24,0) size 22x21 [bgcolor=#008000]
    11       RenderText {#text} at (45,0) size 290x18
    12         text run at (45,0) width 290: " The two green blocks should line up vertically."
     8      RenderText {#text} at (21,1) size 4x18
     9        text run at (21,1) width 4: " "
     10      RenderImage {IMG} at (24,0) size 22x22 [bgcolor=#008000]
     11      RenderText {#text} at (45,1) size 290x18
     12        text run at (45,1) width 290: " The two green blocks should line up vertically."
  • trunk/LayoutTests/platform/ios/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt

    r270044 r271110  
    2525          RenderText {#text} at (0,12) size 138x19
    2626            text run at (0,12) width 138: "Progress style (size): "
    27           RenderBlock {PROGRESS} at (137,0) size 301x31
     27          RenderBlock {PROGRESS} at (137,0) size 301x30
    2828            RenderProgress {DIV} at (0,0) size 300x30
    2929              RenderBlock {DIV} at (0,0) size 300x30 [bgcolor=#808080]
     
    4949          RenderText {#text} at (0,12) size 195x19
    5050            text run at (0,12) width 195: "Styling for all three elements: "
    51           RenderBlock {PROGRESS} at (194,0) size 161x31 [bgcolor=#0000FF] [border: (3px solid #000066)]
     51          RenderBlock {PROGRESS} at (194,0) size 161x30 [bgcolor=#0000FF] [border: (3px solid #000066)]
    5252            RenderProgress {DIV} at (3,3) size 154x24
    5353              RenderBlock {DIV} at (0,0) size 154x24 [bgcolor=#FF0000] [border: (3px solid #990000)]
  • trunk/LayoutTests/platform/ios/fast/dom/HTMLProgressElement/progress-element-expected.txt

    r270044 r271110  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
    6       RenderProgress {PROGRESS} at (0,0) size 160x17
     6      RenderProgress {PROGRESS} at (0,0) size 160x16
    77      RenderInline {SMALL} at (0,0) size 134x15
    88        RenderProgress {PROGRESS} at (160,2) size 134x14
  • trunk/LayoutTests/platform/ios/fast/inline/002-expected.txt

    r179104 r271110  
    88      RenderInline {SPAN} at (0,0) size 46x19
    99        RenderText {#text} at (0,0) size 0x0
    10         RenderInline {SPAN} at (0,0) size 42x19
    11           RenderText {#text} at (45,1) size 42x19
     10        RenderInline {SPAN} at (0,0) size 42x20
     11          RenderText {#text} at (45,1) size 42x20
    1212            text run at (45,1) width 42: "Line 2"
    1313        RenderText {#text} at (86,0) size 5x19
  • trunk/LayoutTests/platform/ios/fast/table/table-display-types-strict-expected.txt

    r195740 r271110  
    4646                    RenderTableRow (anonymous) at (0,2) size 100x21
    4747                      RenderTableCell {TR} at (2,2) size 96x21 [r=0 c=0 rs=1 cs=1]
    48                         RenderInline {TD} at (0,0) size 48x21
    49                           RenderText {#text} at (1,1) size 46x19
     48                        RenderInline {TD} at (0,0) size 48x22
     49                          RenderText {#text} at (1,1) size 46x20
    5050                            text run at (1,1) width 46: "Head 1"
    51                         RenderInline {TD} at (0,0) size 49x21
    52                           RenderText {#text} at (48,1) size 47x19
     51                        RenderInline {TD} at (0,0) size 49x22
     52                          RenderText {#text} at (48,1) size 47x20
    5353                            text run at (48,1) width 47: "Head 2"
    5454              RenderTableCell {TFOOT} at (103,2) size 117x25 [r=0 c=1 rs=1 cs=1]
     
    5757                    RenderTableRow (anonymous) at (0,2) size 116x21
    5858                      RenderTableCell {TR} at (2,2) size 112x21 [r=0 c=0 rs=1 cs=1]
    59                         RenderInline {TD} at (0,0) size 56x21
    60                           RenderText {#text} at (1,1) size 54x19
     59                        RenderInline {TD} at (0,0) size 56x22
     60                          RenderText {#text} at (1,1) size 54x20
    6161                            text run at (1,1) width 54: "Footer 1"
    62                         RenderInline {TD} at (0,0) size 57x21
    63                           RenderText {#text} at (56,1) size 55x19
     62                        RenderInline {TD} at (0,0) size 57x22
     63                          RenderText {#text} at (56,1) size 55x20
    6464                            text run at (56,1) width 55: "Footer 2"
    6565          RenderTableSection {TBODY} at (0,29) size 222x23
    6666            RenderTableRow (anonymous) at (0,0) size 222x21
    6767              RenderTableCell {TR} at (2,0) size 100x21 [r=0 c=0 rs=1 cs=1]
    68                 RenderInline {TD} at (0,0) size 41x21
    69                   RenderText {#text} at (1,1) size 39x19
     68                RenderInline {TD} at (0,0) size 41x22
     69                  RenderText {#text} at (1,1) size 39x20
    7070                    text run at (1,1) width 39: "Cell 1"
    71                 RenderInline {TD} at (0,0) size 42x21
    72                   RenderText {#text} at (41,1) size 40x19
     71                RenderInline {TD} at (0,0) size 42x22
     72                  RenderText {#text} at (41,1) size 40x20
    7373                    text run at (41,1) width 40: "Cell 2"
    7474              RenderTableCell {TR} at (103,0) size 117x21 [r=0 c=1 rs=1 cs=1]
    75                 RenderInline {TD} at (0,0) size 41x21
    76                   RenderText {#text} at (1,1) size 39x19
     75                RenderInline {TD} at (0,0) size 41x22
     76                  RenderText {#text} at (1,1) size 39x20
    7777                    text run at (1,1) width 39: "Cell 3"
    78                 RenderInline {TD} at (0,0) size 42x21
    79                   RenderText {#text} at (41,1) size 40x19
     78                RenderInline {TD} at (0,0) size 42x22
     79                  RenderText {#text} at (41,1) size 40x20
    8080                    text run at (41,1) width 40: "Cell 4"
    8181      RenderBlock {TABLE} at (10,174) size 764x110 [border: (1px solid #000000)]
  • trunk/LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.txt

    r269912 r271110  
    1 layer at (0,0) size 785x4424
     1layer at (0,0) size 785x4422
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x4424
    4   RenderBlock {HTML} at (0,0) size 785x4424
    5     RenderBody {BODY} at (8,8) size 769x4408 [bgcolor=#CCCCCC]
     3layer at (0,0) size 785x4422
     4  RenderBlock {HTML} at (0,0) size 785x4422
     5    RenderBody {BODY} at (8,8) size 769x4406 [bgcolor=#CCCCCC]
    66      RenderBlock {P} at (0,0) size 769x18
    77        RenderText {#text} at (0,0) size 363x18
     
    222222          text run at (0,0) width 765: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be"
    223223          text run at (0,18) width 371: "aligned with the text baseline (which is the default value)."
    224       RenderBlock {P} at (0,1837) size 769x231
     224      RenderBlock {P} at (0,1837) size 769x230
    225225        RenderText {#text} at (0,22) size 101x18
    226226          text run at (0,22) width 101: "This paragraph "
    227         RenderImage {IMG} at (100,17) size 10x30
     227        RenderImage {IMG} at (100,17) size 10x31
    228228        RenderText {#text} at (109,22) size 5x18
    229229          text run at (109,22) width 5: " "
     
    233233        RenderText {#text} at (468,22) size 5x18
    234234          text run at (468,22) width 5: " "
    235         RenderImage {IMG} at (472,7) size 16x50
     235        RenderImage {IMG} at (472,7) size 16x51
    236236        RenderText {#text} at (487,22) size 126x18
    237237          text run at (487,22) width 126: " of varying heights "
    238         RenderImage {IMG} at (612,27) size 4x10
     238        RenderImage {IMG} at (612,27) size 4x11
    239239        RenderText {#text} at (615,22) size 5x18
    240240          text run at (615,22) width 5: " "
     
    244244        RenderText {#text} at (689,22) size 5x18
    245245          text run at (689,22) width 5: " "
    246         RenderImage {IMG} at (693,22) size 7x20
     246        RenderImage {IMG} at (693,22) size 7x21
    247247        RenderText {#text} at (699,22) size 737x93
    248248          text run at (699,22) width 38: " all of"
    249249          text run at (0,97) width 44: "which "
    250         RenderImage {IMG} at (43,75) size 21x65
     250        RenderImage {IMG} at (43,74) size 21x66
    251251        RenderText {#text} at (63,97) size 121x18
    252252          text run at (63,97) width 121: " should be aligned "
    253         RenderImage {IMG} at (183,90) size 12x35
     253        RenderImage {IMG} at (183,89) size 12x36
    254254        RenderText {#text} at (194,97) size 5x18
    255255          text run at (194,97) width 5: " "
     
    259259        RenderText {#text} at (434,97) size 5x18
    260260          text run at (434,97) width 5: " "
    261         RenderImage {IMG} at (438,82) size 16x50
     261        RenderImage {IMG} at (438,82) size 16x51
    262262        RenderText {#text} at (453,97) size 5x18
    263263          text run at (453,97) width 5: " "
    264         RenderInline {SPAN} at (0,0) size 720x106
     264        RenderInline {SPAN} at (0,0) size 720x105
    265265          RenderText {#text} at (457,89) size 18x28
    266266            text run at (457,89) width 18: "a "
     
    268268            RenderText {#text} at (474,57) size 204x69
    269269              text run at (474,57) width 204: "14-point"
    270           RenderText {#text} at (677,89) size 720x106
     270          RenderText {#text} at (677,89) size 720x105
    271271            text run at (677,89) width 43: " text"
    272             text run at (0,167) width 76: "element"
    273         RenderText {#text} at (75,175) size 5x18
    274           text run at (75,175) width 5: " "
    275         RenderImage {IMG} at (79,160) size 16x50
    276         RenderText {#text} at (94,175) size 5x18
    277           text run at (94,175) width 5: " "
     272            text run at (0,166) width 76: "element"
     273        RenderText {#text} at (75,174) size 5x18
     274          text run at (75,174) width 5: " "
     275        RenderImage {IMG} at (79,159) size 16x51
     276        RenderText {#text} at (94,174) size 5x18
     277          text run at (94,174) width 5: " "
    278278        RenderInline {SMALL} at (0,0) size 195x18
    279           RenderText {#text} at (98,175) size 195x18
    280             text run at (98,175) width 195: "regardless of the line in which"
    281         RenderText {#text} at (292,175) size 5x18
    282           text run at (292,175) width 5: " "
    283         RenderImage {IMG} at (296,178) size 6x15
    284         RenderText {#text} at (301,175) size 5x18
    285           text run at (301,175) width 5: " "
     279          RenderText {#text} at (98,174) size 195x18
     280            text run at (98,174) width 195: "regardless of the line in which"
     281        RenderText {#text} at (292,174) size 5x18
     282          text run at (292,174) width 5: " "
     283        RenderImage {IMG} at (296,176) size 6x16
     284        RenderText {#text} at (301,174) size 5x18
     285          text run at (301,174) width 5: " "
    286286        RenderInline {BIG} at (0,0) size 156x24
    287           RenderText {#text} at (305,170) size 156x24
    288             text run at (305,170) width 156: "the images appear."
    289         RenderText {#text} at (460,175) size 5x18
    290           text run at (460,175) width 5: " "
    291         RenderImage {IMG} at (464,140) size 28x90
     287          RenderText {#text} at (305,169) size 156x24
     288            text run at (305,169) width 156: "the images appear."
     289        RenderText {#text} at (460,174) size 5x18
     290          text run at (460,174) width 5: " "
     291        RenderImage {IMG} at (464,139) size 28x90
    292292        RenderText {#text} at (0,0) size 0x0
    293       RenderBlock {P} at (0,2083) size 769x37
     293      RenderBlock {P} at (0,2082) size 769x37
    294294        RenderText {#text} at (0,0) size 751x36
    295295          text run at (0,0) width 751: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that"
    296296          text run at (0,18) width 178: "element is an image or not. "
    297297          text run at (177,18) width 563: "Each fragment of text has been SPANned appropriately in order to cause this to happen."
    298       RenderBlock {P} at (0,2135) size 769x202
     298      RenderBlock {P} at (0,2134) size 769x202
    299299        RenderInline {SPAN} at (0,0) size 97x18
    300300          RenderText {#text} at (0,0) size 97x18
     
    378378        RenderImage {IMG} at (211,111) size 28x90
    379379        RenderText {#text} at (0,0) size 0x0
    380       RenderTable {TABLE} at (0,2352) size 769x2056 [border: (1px outset #808080)]
    381         RenderTableSection {TBODY} at (1,1) size 767x2054
     380      RenderTable {TABLE} at (0,2351) size 769x2055 [border: (1px outset #808080)]
     381        RenderTableSection {TBODY} at (1,1) size 767x2053
    382382          RenderTableRow {TR} at (0,0) size 767x26
    383383            RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
     
    385385                RenderText {#text} at (4,4) size 161x18
    386386                  text run at (4,4) width 161: "TABLE Testing Section"
    387           RenderTableRow {TR} at (0,26) size 767x2028
     387          RenderTableRow {TR} at (0,26) size 767x2027
    388388            RenderTableCell {TD} at (0,1026) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
    389               RenderText {#text} at (4,4) size 4x19
    390                 text run at (4,5) width 4: " "
    391             RenderTableCell {TD} at (12,26) size 755x2028 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
     389              RenderText {#text} at (4,3) size 4x19
     390                text run at (4,4) width 4: " "
     391            RenderTableCell {TD} at (12,26) size 755x2027 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
    392392              RenderBlock {P} at (4,4) size 747x76
    393393                RenderImage {IMG} at (0,0) size 15x50
     
    566566                  text run at (0,0) width 746: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should"
    567567                  text run at (0,18) width 390: "be aligned with the text baseline (which is the default value)."
    568               RenderBlock {P} at (4,1506) size 747x231
     568              RenderBlock {P} at (4,1506) size 747x230
    569569                RenderText {#text} at (0,22) size 101x18
    570570                  text run at (0,22) width 101: "This paragraph "
    571                 RenderImage {IMG} at (100,17) size 10x30
     571                RenderImage {IMG} at (100,17) size 10x31
    572572                RenderText {#text} at (109,22) size 5x18
    573573                  text run at (109,22) width 5: " "
     
    577577                RenderText {#text} at (468,22) size 5x18
    578578                  text run at (468,22) width 5: " "
    579                 RenderImage {IMG} at (472,7) size 16x50
     579                RenderImage {IMG} at (472,7) size 16x51
    580580                RenderText {#text} at (487,22) size 126x18
    581581                  text run at (487,22) width 126: " of varying heights "
    582                 RenderImage {IMG} at (612,27) size 4x10
     582                RenderImage {IMG} at (612,27) size 4x11
    583583                RenderText {#text} at (615,22) size 5x18
    584584                  text run at (615,22) width 5: " "
     
    588588                RenderText {#text} at (689,22) size 5x18
    589589                  text run at (689,22) width 5: " "
    590                 RenderImage {IMG} at (693,22) size 7x20
     590                RenderImage {IMG} at (693,22) size 7x21
    591591                RenderText {#text} at (699,22) size 737x93
    592592                  text run at (699,22) width 38: " all of"
    593593                  text run at (0,97) width 44: "which "
    594                 RenderImage {IMG} at (43,75) size 21x65
     594                RenderImage {IMG} at (43,74) size 21x66
    595595                RenderText {#text} at (63,97) size 121x18
    596596                  text run at (63,97) width 121: " should be aligned "
    597                 RenderImage {IMG} at (183,90) size 12x35
     597                RenderImage {IMG} at (183,89) size 12x36
    598598                RenderText {#text} at (194,97) size 5x18
    599599                  text run at (194,97) width 5: " "
     
    603603                RenderText {#text} at (434,97) size 5x18
    604604                  text run at (434,97) width 5: " "
    605                 RenderImage {IMG} at (438,82) size 16x50
     605                RenderImage {IMG} at (438,82) size 16x51
    606606                RenderText {#text} at (453,97) size 5x18
    607607                  text run at (453,97) width 5: " "
    608                 RenderInline {SPAN} at (0,0) size 720x106
     608                RenderInline {SPAN} at (0,0) size 720x105
    609609                  RenderText {#text} at (457,89) size 18x28
    610610                    text run at (457,89) width 18: "a "
     
    612612                    RenderText {#text} at (474,57) size 204x69
    613613                      text run at (474,57) width 204: "14-point"
    614                   RenderText {#text} at (677,89) size 720x106
     614                  RenderText {#text} at (677,89) size 720x105
    615615                    text run at (677,89) width 43: " text"
    616                     text run at (0,167) width 76: "element"
    617                 RenderText {#text} at (75,175) size 5x18
    618                   text run at (75,175) width 5: " "
    619                 RenderImage {IMG} at (79,160) size 16x50
    620                 RenderText {#text} at (94,175) size 5x18
    621                   text run at (94,175) width 5: " "
     616                    text run at (0,166) width 76: "element"
     617                RenderText {#text} at (75,174) size 5x18
     618                  text run at (75,174) width 5: " "
     619                RenderImage {IMG} at (79,159) size 16x51
     620                RenderText {#text} at (94,174) size 5x18
     621                  text run at (94,174) width 5: " "
    622622                RenderInline {SMALL} at (0,0) size 195x18
    623                   RenderText {#text} at (98,175) size 195x18
    624                     text run at (98,175) width 195: "regardless of the line in which"
    625                 RenderText {#text} at (292,175) size 5x18
    626                   text run at (292,175) width 5: " "
    627                 RenderImage {IMG} at (296,178) size 6x15
    628                 RenderText {#text} at (301,175) size 5x18
    629                   text run at (301,175) width 5: " "
     623                  RenderText {#text} at (98,174) size 195x18
     624                    text run at (98,174) width 195: "regardless of the line in which"
     625                RenderText {#text} at (292,174) size 5x18
     626                  text run at (292,174) width 5: " "
     627                RenderImage {IMG} at (296,176) size 6x16
     628                RenderText {#text} at (301,174) size 5x18
     629                  text run at (301,174) width 5: " "
    630630                RenderInline {BIG} at (0,0) size 156x24
    631                   RenderText {#text} at (305,170) size 156x24
    632                     text run at (305,170) width 156: "the images appear."
    633                 RenderText {#text} at (460,175) size 5x18
    634                   text run at (460,175) width 5: " "
    635                 RenderImage {IMG} at (464,140) size 28x90
    636                 RenderText {#text} at (0,0) size 0x0
    637               RenderBlock {P} at (4,1752) size 747x55
     631                  RenderText {#text} at (305,169) size 156x24
     632                    text run at (305,169) width 156: "the images appear."
     633                RenderText {#text} at (460,174) size 5x18
     634                  text run at (460,174) width 5: " "
     635                RenderImage {IMG} at (464,139) size 28x90
     636                RenderText {#text} at (0,0) size 0x0
     637              RenderBlock {P} at (4,1751) size 747x55
    638638                RenderText {#text} at (0,0) size 723x54
    639639                  text run at (0,0) width 723: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether"
     
    641641                  text run at (205,18) width 509: "Each fragment of text has been SPANned appropriately in order to cause this to"
    642642                  text run at (0,36) width 51: "happen."
    643               RenderBlock {P} at (4,1822) size 747x202
     643              RenderBlock {P} at (4,1821) size 747x202
    644644                RenderInline {SPAN} at (0,0) size 97x18
    645645                  RenderText {#text} at (0,0) size 97x18
  • trunk/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-03-d-agi-expected.txt

    r177774 r271110  
    1111          text run at (85,18) width 210: "other blue rectangles on the line."
    1212      RenderBlock {P} at (15,52) size 754x236 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)]
    13         RenderText {#text} at (8,34) size 61x16
    14           text run at (8,34) width 61: "\x{C9}\x{C9}\x{C9} "
    15         RenderImage {IMG} at (68,25) size 31x31
    16         RenderText {#text} at (98,34) size 16x16
    17           text run at (98,34) width 16: " "
     13        RenderText {#text} at (8,35) size 61x16
     14          text run at (8,35) width 61: "\x{C9}\x{C9}\x{C9} "
     15        RenderImage {IMG} at (68,26) size 31x31
     16        RenderText {#text} at (98,35) size 16x16
     17          text run at (98,35) width 16: " "
    1818        RenderInline {SPAN} at (0,0) size 115x39 [color=#C0C0C0]
    19           RenderText {#text} at (113,16) size 115x39
    20             text run at (113,16) width 115: "xxx"
    21         RenderText {#text} at (227,34) size 16x16
    22           text run at (227,34) width 16: " "
    23         RenderImage {IMG} at (242,15) size 51x51
    24         RenderText {#text} at (292,34) size 76x16
    25           text run at (292,34) width 16: " "
    26           text run at (307,34) width 61: "\x{C9}\x{C9}\x{C9} "
    27         RenderImage {IMG} at (367,35) size 11x11
    28         RenderText {#text} at (377,34) size 16x16
    29           text run at (377,34) width 16: " "
     19          RenderText {#text} at (113,17) size 115x39
     20            text run at (113,17) width 115: "xxx"
     21        RenderText {#text} at (227,35) size 16x16
     22          text run at (227,35) width 16: " "
     23        RenderImage {IMG} at (242,16) size 51x51
     24        RenderText {#text} at (292,35) size 76x16
     25          text run at (292,35) width 16: " "
     26          text run at (307,35) width 61: "\x{C9}\x{C9}\x{C9} "
     27        RenderImage {IMG} at (367,36) size 11x11
     28        RenderText {#text} at (377,35) size 16x16
     29          text run at (377,35) width 16: " "
    3030        RenderInline {SMALL} at (0,0) size 31x11 [color=#C0C0C0]
    31           RenderText {#text} at (392,38) size 31x11
    32             text run at (392,38) width 31: "xxx"
    33         RenderText {#text} at (422,34) size 16x16
    34           text run at (422,34) width 16: " "
    35         RenderImage {IMG} at (437,30) size 21x21
    36         RenderText {#text} at (457,34) size 76x16
    37           text run at (457,34) width 16: " "
    38           text run at (472,34) width 61: "\x{C9}\x{C9}\x{C9} "
     31          RenderText {#text} at (392,39) size 31x11
     32            text run at (392,39) width 31: "xxx"
     33        RenderText {#text} at (422,35) size 16x16
     34          text run at (422,35) width 16: " "
     35        RenderImage {IMG} at (437,31) size 21x21
     36        RenderText {#text} at (457,35) size 76x16
     37          text run at (457,35) width 16: " "
     38          text run at (472,35) width 61: "\x{C9}\x{C9}\x{C9} "
    3939        RenderImage {IMG} at (532,8) size 66x66
    40         RenderText {#text} at (597,34) size 76x16
    41           text run at (597,34) width 16: " "
    42           text run at (612,34) width 61: "\x{C9}\x{C9}\x{C9} "
    43         RenderImage {IMG} at (672,23) size 36x36
     40        RenderText {#text} at (597,35) size 76x16
     41          text run at (597,35) width 16: " "
     42          text run at (612,35) width 61: "\x{C9}\x{C9}\x{C9} "
     43        RenderImage {IMG} at (672,24) size 36x35
    4444        RenderText {#text} at (0,0) size 0x0
    4545        RenderInline {SPAN} at (0,0) size 91x31 [color=#C0C0C0]
     
    6969        RenderText {#text} at (640,106) size 16x16
    7070          text run at (640,106) width 16: " "
    71         RenderImage {IMG} at (655,105) size 16x16
     71        RenderImage {IMG} at (655,105) size 16x15
    7272        RenderText {#text} at (670,106) size 16x16
    7373          text run at (670,106) width 16: " "
  • trunk/LayoutTests/platform/mac/fast/block/basic/014-expected.txt

    r177774 r271110  
    66      RenderInline {A} at (0,0) size 21x16 [color=#0000EE]
    77        RenderImage {IMG} at (0,0) size 21x21 [bgcolor=#008000]
    8       RenderText {#text} at (21,1) size 4x16
    9         text run at (21,1) width 4: " "
    10       RenderImage {IMG} at (24,0) size 22x21 [bgcolor=#008000]
    11       RenderText {#text} at (45,1) size 290x16
    12         text run at (45,1) width 290: " The two green blocks should line up vertically."
     8      RenderText {#text} at (21,2) size 4x16
     9        text run at (21,2) width 4: " "
     10      RenderImage {IMG} at (24,0) size 22x22 [bgcolor=#008000]
     11      RenderText {#text} at (45,2) size 290x16
     12        text run at (45,2) width 290: " The two green blocks should line up vertically."
  • trunk/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt

    r270044 r271110  
    2525          RenderText {#text} at (0,13) size 138x18
    2626            text run at (0,13) width 138: "Progress style (size): "
    27           RenderBlock {PROGRESS} at (137,0) size 301x31
     27          RenderBlock {PROGRESS} at (137,0) size 301x30
    2828            RenderProgress {DIV} at (0,0) size 300x30
    2929              RenderBlock {DIV} at (0,0) size 300x30 [bgcolor=#808080]
     
    4949          RenderText {#text} at (0,13) size 195x18
    5050            text run at (0,13) width 195: "Styling for all three elements: "
    51           RenderBlock {PROGRESS} at (194,0) size 161x31 [bgcolor=#0000FF] [border: (3px solid #000066)]
     51          RenderBlock {PROGRESS} at (194,0) size 161x30 [bgcolor=#0000FF] [border: (3px solid #000066)]
    5252            RenderProgress {DIV} at (3,3) size 154x24
    5353              RenderBlock {DIV} at (0,0) size 154x24 [bgcolor=#FF0000] [border: (3px solid #990000)]
  • trunk/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/progress-element-expected.txt

    r270044 r271110  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
    6       RenderProgress {PROGRESS} at (0,0) size 160x22
     6      RenderProgress {PROGRESS} at (0,0) size 160x21
    77      RenderInline {SMALL} at (0,0) size 134x15
    88        RenderProgress {PROGRESS} at (160,7) size 134x14
  • trunk/LayoutTests/platform/mac/fast/encoding/utf-16-big-endian-expected.txt

    r268520 r271110  
    1 layer at (0,0) size 792x1121
     1layer at (0,0) size 792x1120
    22  RenderView at (0,0) size 785x585
    3 layer at (0,0) size 785x1121
    4   RenderBlock {HTML} at (0,0) size 785x1122
    5     RenderBody {BODY} at (8,8) size 769x1101 [bgcolor=#EEEEEE]
     3layer at (0,0) size 785x1120
     4  RenderBlock {HTML} at (0,0) size 785x1121
     5    RenderBody {BODY} at (8,8) size 769x1100 [bgcolor=#EEEEEE]
    66      RenderBlock (anonymous) at (0,0) size 769x20
    77        RenderInline {SPAN} at (0,0) size 192x15
     
    4343      RenderBlock (anonymous) at (0,85) size 769x3
    4444        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    45       RenderBlock (anonymous) at (0,94) size 769x68
    46         RenderInline {SPAN} at (0,0) size 586x65
    47           RenderInline {SPAN} at (0,0) size 586x65
    48             RenderText {#text} at (0,0) size 0x0
    49             RenderImage {IMG} at (0,1) size 66x20
     45      RenderBlock (anonymous) at (0,94) size 769x67
     46        RenderInline {SPAN} at (0,0) size 586x64
     47          RenderInline {SPAN} at (0,0) size 586x64
     48            RenderText {#text} at (0,0) size 0x0
     49            RenderImage {IMG} at (0,0) size 66x20
    5050            RenderText {#text} at (66,2) size 4x15
    5151              text run at (66,2) width 4: " "
     
    5757            RenderText {#text} at (0,0) size 0x0
    5858          RenderText {#text} at (0,0) size 0x0
    59       RenderBlock (anonymous) at (0,168) size 769x3
    60         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    61       RenderBlock (anonymous) at (0,176) size 769x42
     59      RenderBlock (anonymous) at (0,167) size 769x3
     60        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     61      RenderBlock (anonymous) at (0,175) size 769x42
    6262        RenderInline {SPAN} at (0,0) size 129x41
    6363          RenderInline {SPAN} at (0,0) size 129x41
     
    7171              RenderBR {BR} at (128,1) size 1x17
    7272            RenderText {#text} at (0,0) size 0x0
    73       RenderBlock (anonymous) at (0,277) size 769x0
    74         RenderInline {SPAN} at (0,0) size 0x0
    75           RenderInline {SPAN} at (0,0) size 0x0
    76             RenderText {#text} at (0,0) size 0x0
    77           RenderText {#text} at (0,0) size 0x0
    78       RenderBlock (anonymous) at (0,284) size 769x3
    79         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    80       RenderBlock (anonymous) at (0,293) size 769x22
     73      RenderBlock (anonymous) at (0,276) size 769x0
     74        RenderInline {SPAN} at (0,0) size 0x0
     75          RenderInline {SPAN} at (0,0) size 0x0
     76            RenderText {#text} at (0,0) size 0x0
     77          RenderText {#text} at (0,0) size 0x0
     78      RenderBlock (anonymous) at (0,283) size 769x3
     79        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     80      RenderBlock (anonymous) at (0,292) size 769x22
    8181        RenderInline {SPAN} at (0,0) size 136x15
    8282          RenderInline {SPAN} at (0,0) size 136x15
     
    9393              RenderInline {SPAN} at (0,0) size 0x0
    9494                RenderText {#text} at (0,0) size 0x0
    95       RenderBlock (anonymous) at (0,314) size 769x61
     95      RenderBlock (anonymous) at (0,313) size 769x61
    9696        RenderTable {TABLE} at (0,0) size 584x60
    9797          RenderTableSection {TBODY} at (0,0) size 584x60
     
    111111                RenderText {#text} at (1,37) size 417x17
    112112                  text run at (1,37) width 417: "Comments: -** TICKETLESS CONF CODE IS WHGNSO**"
    113       RenderBlock (anonymous) at (0,374) size 769x0
    114         RenderInline {SPAN} at (0,0) size 0x0
    115           RenderInline {SPAN} at (0,0) size 0x0
    116             RenderInline {SPAN} at (0,0) size 0x0
    117               RenderInline {SPAN} at (0,0) size 0x0
    118               RenderText {#text} at (0,0) size 0x0
    119       RenderBlock (anonymous) at (0,380) size 769x3
    120         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    121       RenderBlock (anonymous) at (0,389) size 769x0
    122         RenderInline {SPAN} at (0,0) size 0x0
    123           RenderInline {SPAN} at (0,0) size 0x0
    124             RenderInline {SPAN} at (0,0) size 0x0
    125               RenderInline {SPAN} at (0,0) size 0x0
    126                 RenderText {#text} at (0,0) size 0x0
    127       RenderBlock (anonymous) at (0,389) size 769x197
     113      RenderBlock (anonymous) at (0,373) size 769x0
     114        RenderInline {SPAN} at (0,0) size 0x0
     115          RenderInline {SPAN} at (0,0) size 0x0
     116            RenderInline {SPAN} at (0,0) size 0x0
     117              RenderInline {SPAN} at (0,0) size 0x0
     118              RenderText {#text} at (0,0) size 0x0
     119      RenderBlock (anonymous) at (0,379) size 769x3
     120        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     121      RenderBlock (anonymous) at (0,388) size 769x0
     122        RenderInline {SPAN} at (0,0) size 0x0
     123          RenderInline {SPAN} at (0,0) size 0x0
     124            RenderInline {SPAN} at (0,0) size 0x0
     125              RenderInline {SPAN} at (0,0) size 0x0
     126                RenderText {#text} at (0,0) size 0x0
     127      RenderBlock (anonymous) at (0,388) size 769x197
    128128        RenderTable {TABLE} at (0,0) size 717x196
    129129          RenderTableSection {TBODY} at (0,0) size 717x196
     
    207207                    RenderInline {SPACE} at (0,0) size 0x17
    208208                      RenderBR {BR} at (0,0) size 0x17
    209       RenderBlock (anonymous) at (0,585) size 769x0
    210         RenderInline {SPAN} at (0,0) size 0x0
    211           RenderInline {SPAN} at (0,0) size 0x0
    212             RenderInline {SPAN} at (0,0) size 0x0
    213               RenderInline {SPAN} at (0,0) size 0x0
    214               RenderText {#text} at (0,0) size 0x0
    215       RenderBlock (anonymous) at (0,592) size 769x3
    216         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    217       RenderBlock (anonymous) at (0,600) size 769x0
    218         RenderInline {SPAN} at (0,0) size 0x0
    219           RenderInline {SPAN} at (0,0) size 0x0
    220             RenderInline {SPAN} at (0,0) size 0x0
    221               RenderInline {SPAN} at (0,0) size 0x0
    222                 RenderText {#text} at (0,0) size 0x0
    223       RenderBlock (anonymous) at (0,600) size 769x197
     209      RenderBlock (anonymous) at (0,584) size 769x0
     210        RenderInline {SPAN} at (0,0) size 0x0
     211          RenderInline {SPAN} at (0,0) size 0x0
     212            RenderInline {SPAN} at (0,0) size 0x0
     213              RenderInline {SPAN} at (0,0) size 0x0
     214              RenderText {#text} at (0,0) size 0x0
     215      RenderBlock (anonymous) at (0,591) size 769x3
     216        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     217      RenderBlock (anonymous) at (0,599) size 769x0
     218        RenderInline {SPAN} at (0,0) size 0x0
     219          RenderInline {SPAN} at (0,0) size 0x0
     220            RenderInline {SPAN} at (0,0) size 0x0
     221              RenderInline {SPAN} at (0,0) size 0x0
     222                RenderText {#text} at (0,0) size 0x0
     223      RenderBlock (anonymous) at (0,599) size 769x197
    224224        RenderTable {TABLE} at (0,0) size 604x196
    225225          RenderTableSection {TBODY} at (0,0) size 604x196
     
    303303                    RenderInline {SPACE} at (0,0) size 0x17
    304304                      RenderBR {BR} at (0,0) size 0x17
    305       RenderBlock (anonymous) at (0,796) size 769x0
    306         RenderInline {SPAN} at (0,0) size 0x0
    307           RenderInline {SPAN} at (0,0) size 0x0
    308             RenderInline {SPAN} at (0,0) size 0x0
    309               RenderInline {SPAN} at (0,0) size 0x0
    310               RenderText {#text} at (0,0) size 0x0
    311       RenderBlock (anonymous) at (0,803) size 769x3
    312         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    313       RenderBlock (anonymous) at (0,812) size 769x0
    314         RenderInline {SPAN} at (0,0) size 0x0
    315           RenderInline {SPAN} at (0,0) size 0x0
    316             RenderInline {SPAN} at (0,0) size 0x0
    317               RenderInline {SPAN} at (0,0) size 0x0
    318                 RenderText {#text} at (0,0) size 0x0
    319       RenderBlock (anonymous) at (0,812) size 769x115
     305      RenderBlock (anonymous) at (0,795) size 769x0
     306        RenderInline {SPAN} at (0,0) size 0x0
     307          RenderInline {SPAN} at (0,0) size 0x0
     308            RenderInline {SPAN} at (0,0) size 0x0
     309              RenderInline {SPAN} at (0,0) size 0x0
     310              RenderText {#text} at (0,0) size 0x0
     311      RenderBlock (anonymous) at (0,802) size 769x3
     312        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     313      RenderBlock (anonymous) at (0,811) size 769x0
     314        RenderInline {SPAN} at (0,0) size 0x0
     315          RenderInline {SPAN} at (0,0) size 0x0
     316            RenderInline {SPAN} at (0,0) size 0x0
     317              RenderInline {SPAN} at (0,0) size 0x0
     318                RenderText {#text} at (0,0) size 0x0
     319      RenderBlock (anonymous) at (0,811) size 769x115
    320320        RenderTable {TABLE} at (0,0) size 618x114
    321321          RenderTableSection {TBODY} at (0,0) size 618x114
     
    356356                      text run at (242,91) width 6: " "
    357357                    RenderBR {BR} at (247,91) size 1x17
    358       RenderBlock (anonymous) at (0,926) size 769x0
    359         RenderInline {SPAN} at (0,0) size 0x0
    360           RenderInline {SPAN} at (0,0) size 0x0
    361             RenderInline {SPAN} at (0,0) size 0x0
    362               RenderInline {SPAN} at (0,0) size 0x0
    363               RenderText {#text} at (0,0) size 0x0
    364       RenderBlock (anonymous) at (0,932) size 769x3
    365         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    366       RenderBlock (anonymous) at (0,941) size 769x51
    367         RenderInline {SPAN} at (0,0) size 196x48
     358      RenderBlock (anonymous) at (0,925) size 769x0
     359        RenderInline {SPAN} at (0,0) size 0x0
     360          RenderInline {SPAN} at (0,0) size 0x0
     361            RenderInline {SPAN} at (0,0) size 0x0
     362              RenderInline {SPAN} at (0,0) size 0x0
     363              RenderText {#text} at (0,0) size 0x0
     364      RenderBlock (anonymous) at (0,931) size 769x3
     365        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     366      RenderBlock (anonymous) at (0,940) size 769x51
     367        RenderInline {SPAN} at (0,0) size 196x47
    368368          RenderInline {SPAN} at (0,0) size 0x0
    369369            RenderInline {SPAN} at (0,0) size 0x0
     
    373373            RenderText {#text} at (0,0) size 0x0
    374374            RenderImage {IMG} at (0,0) size 20x20
    375             RenderText {#text} at (20,0) size 78x17
    376               text run at (20,0) width 5: " "
    377               text run at (24,0) width 74: "Remarks:"
    378             RenderBR {BR} at (97,0) size 1x17
     375            RenderText {#text} at (20,1) size 78x17
     376              text run at (20,1) width 5: " "
     377              text run at (24,1) width 74: "Remarks:"
     378            RenderBR {BR} at (97,1) size 1x17
    379379          RenderText {#text} at (0,0) size 0x0
    380380          RenderBR {BR} at (0,20) size 0x15
     
    385385            RenderBR {BR} at (195,35) size 1x15
    386386          RenderText {#text} at (0,0) size 0x0
    387       RenderBlock (anonymous) at (0,998) size 769x3
    388         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    389       RenderBlock (anonymous) at (0,1006) size 769x22
     387      RenderBlock (anonymous) at (0,997) size 769x3
     388        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     389      RenderBlock (anonymous) at (0,1005) size 769x22
    390390        RenderInline {SPAN} at (0,0) size 188x15
    391391          RenderInline {SPAN} at (0,0) size 188x17
     
    404404            RenderText {#text} at (0,0) size 0x0
    405405          RenderText {#text} at (0,0) size 0x0
    406       RenderBlock (anonymous) at (0,1034) size 769x3
    407         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    408       RenderBlock (anonymous) at (0,1043) size 769x21
     406      RenderBlock (anonymous) at (0,1033) size 769x3
     407        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     408      RenderBlock (anonymous) at (0,1042) size 769x21
    409409        RenderInline {SPAN} at (0,0) size 279x15
    410410          RenderInline {SPAN} at (0,0) size 279x15
     
    413413              RenderText {#text} at (0,0) size 0x0
    414414              RenderImage {IMG} at (0,0) size 20x20
    415               RenderText {#text} at (20,0) size 259x17
    416                 text run at (20,0) width 5: " "
    417                 text run at (24,0) width 255: "Remarks and Service Information"
    418               RenderBR {BR} at (278,0) size 1x17
    419             RenderText {#text} at (0,0) size 0x0
    420             RenderText {#text} at (0,0) size 0x0
    421       RenderBlock (anonymous) at (0,1069) size 769x32
     415              RenderText {#text} at (20,1) size 259x17
     416                text run at (20,1) width 5: " "
     417                text run at (24,1) width 255: "Remarks and Service Information"
     418              RenderBR {BR} at (278,1) size 1x17
     419            RenderText {#text} at (0,0) size 0x0
     420            RenderText {#text} at (0,0) size 0x0
     421      RenderBlock (anonymous) at (0,1068) size 769x32
    422422        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    423423        RenderBlock {P} at (0,15) size 769x16
     
    428428              text run at (200,0) width 162: "Click here for latest updates"
    429429          RenderText {#text} at (0,0) size 0x0
    430       RenderBlock (anonymous) at (0,1113) size 769x0
     430      RenderBlock (anonymous) at (0,1112) size 769x0
    431431        RenderInline {SPAN} at (0,0) size 0x0
    432432          RenderInline {SPAN} at (0,0) size 0x0
     
    450450  RenderInline (relative positioned) {SPAN} at (0,0) size 586x38
    451451    RenderText {#text} at (0,0) size 0x0
    452     RenderImage {IMG} at (0,21) size 20x20
    453     RenderText {#text} at (20,29) size 566x15
    454       text run at (20,29) width 4: " "
    455       text run at (23,29) width 56: "Address: "
    456       text run at (78,29) width 508: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
    457     RenderBR {BR} at (585,29) size 1x15
    458     RenderImage {IMG} at (0,44) size 20x20
    459     RenderText {#text} at (20,52) size 403x15
    460       text run at (20,52) width 4: " "
    461       text run at (23,52) width 49: "Deliver: "
    462       text run at (71,52) width 102: "DEBI STANGEL, "
    463       text run at (172,52) width 116: "119 GLEN COURT, "
    464       text run at (287,52) width 136: "DANVILLE CA Z/94526"
    465 layer at (23,185) size 20x15
     452    RenderImage {IMG} at (0,20) size 20x20
     453    RenderText {#text} at (20,28) size 566x15
     454      text run at (20,28) width 4: " "
     455      text run at (23,28) width 56: "Address: "
     456      text run at (78,28) width 508: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
     457    RenderBR {BR} at (585,28) size 1x15
     458    RenderImage {IMG} at (0,43) size 20x20
     459    RenderText {#text} at (20,51) size 403x15
     460      text run at (20,51) width 4: " "
     461      text run at (23,51) width 49: "Deliver: "
     462      text run at (71,51) width 102: "DEBI STANGEL, "
     463      text run at (172,51) width 116: "119 GLEN COURT, "
     464      text run at (287,51) width 136: "DANVILLE CA Z/94526"
     465layer at (23,184) size 20x15
    466466  RenderInline (relative positioned) {SPAN} at (0,0) size 20x15
    467467    RenderText {#text} at (0,0) size 0x0
    468468    RenderImage {IMG} at (0,21) size 20x20
    469469    RenderText {#text} at (0,0) size 0x0
    470 layer at (23,226) size 769x60
    471   RenderBlock (anonymous) at (0,217) size 769x61
    472 layer at (43,211) size 523x60
     470layer at (23,225) size 769x60
     471  RenderBlock (anonymous) at (0,216) size 769x61
     472layer at (43,210) size 523x60
    473473  RenderTable {TABLE} at (0,0) size 524x60 [border: (1px outset #808080)]
    474474    RenderTableSection {TBODY} at (1,1) size 522x58
  • trunk/LayoutTests/platform/mac/fast/encoding/utf-16-little-endian-expected.txt

    r268520 r271110  
    1 layer at (0,0) size 792x1121
     1layer at (0,0) size 792x1120
    22  RenderView at (0,0) size 785x585
    3 layer at (0,0) size 785x1121
    4   RenderBlock {HTML} at (0,0) size 785x1122
    5     RenderBody {BODY} at (8,8) size 769x1101 [bgcolor=#EEEEEE]
     3layer at (0,0) size 785x1120
     4  RenderBlock {HTML} at (0,0) size 785x1121
     5    RenderBody {BODY} at (8,8) size 769x1100 [bgcolor=#EEEEEE]
    66      RenderBlock (anonymous) at (0,0) size 769x20
    77        RenderInline {SPAN} at (0,0) size 192x15
     
    4343      RenderBlock (anonymous) at (0,85) size 769x3
    4444        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    45       RenderBlock (anonymous) at (0,94) size 769x68
    46         RenderInline {SPAN} at (0,0) size 586x65
    47           RenderInline {SPAN} at (0,0) size 586x65
    48             RenderText {#text} at (0,0) size 0x0
    49             RenderImage {IMG} at (0,1) size 66x20
     45      RenderBlock (anonymous) at (0,94) size 769x67
     46        RenderInline {SPAN} at (0,0) size 586x64
     47          RenderInline {SPAN} at (0,0) size 586x64
     48            RenderText {#text} at (0,0) size 0x0
     49            RenderImage {IMG} at (0,0) size 66x20
    5050            RenderText {#text} at (66,2) size 4x15
    5151              text run at (66,2) width 4: " "
     
    5757            RenderText {#text} at (0,0) size 0x0
    5858          RenderText {#text} at (0,0) size 0x0
    59       RenderBlock (anonymous) at (0,168) size 769x3
    60         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    61       RenderBlock (anonymous) at (0,176) size 769x42
     59      RenderBlock (anonymous) at (0,167) size 769x3
     60        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     61      RenderBlock (anonymous) at (0,175) size 769x42
    6262        RenderInline {SPAN} at (0,0) size 129x41
    6363          RenderInline {SPAN} at (0,0) size 129x41
     
    7171              RenderBR {BR} at (128,1) size 1x17
    7272            RenderText {#text} at (0,0) size 0x0
    73       RenderBlock (anonymous) at (0,277) size 769x0
    74         RenderInline {SPAN} at (0,0) size 0x0
    75           RenderInline {SPAN} at (0,0) size 0x0
    76             RenderText {#text} at (0,0) size 0x0
    77           RenderText {#text} at (0,0) size 0x0
    78       RenderBlock (anonymous) at (0,284) size 769x3
    79         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    80       RenderBlock (anonymous) at (0,293) size 769x22
     73      RenderBlock (anonymous) at (0,276) size 769x0
     74        RenderInline {SPAN} at (0,0) size 0x0
     75          RenderInline {SPAN} at (0,0) size 0x0
     76            RenderText {#text} at (0,0) size 0x0
     77          RenderText {#text} at (0,0) size 0x0
     78      RenderBlock (anonymous) at (0,283) size 769x3
     79        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     80      RenderBlock (anonymous) at (0,292) size 769x22
    8181        RenderInline {SPAN} at (0,0) size 136x15
    8282          RenderInline {SPAN} at (0,0) size 136x15
     
    9393              RenderInline {SPAN} at (0,0) size 0x0
    9494                RenderText {#text} at (0,0) size 0x0
    95       RenderBlock (anonymous) at (0,314) size 769x61
     95      RenderBlock (anonymous) at (0,313) size 769x61
    9696        RenderTable {TABLE} at (0,0) size 584x60
    9797          RenderTableSection {TBODY} at (0,0) size 584x60
     
    111111                RenderText {#text} at (1,37) size 417x17
    112112                  text run at (1,37) width 417: "Comments: -** TICKETLESS CONF CODE IS WHGNSO**"
    113       RenderBlock (anonymous) at (0,374) size 769x0
    114         RenderInline {SPAN} at (0,0) size 0x0
    115           RenderInline {SPAN} at (0,0) size 0x0
    116             RenderInline {SPAN} at (0,0) size 0x0
    117               RenderInline {SPAN} at (0,0) size 0x0
    118               RenderText {#text} at (0,0) size 0x0
    119       RenderBlock (anonymous) at (0,380) size 769x3
    120         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    121       RenderBlock (anonymous) at (0,389) size 769x0
    122         RenderInline {SPAN} at (0,0) size 0x0
    123           RenderInline {SPAN} at (0,0) size 0x0
    124             RenderInline {SPAN} at (0,0) size 0x0
    125               RenderInline {SPAN} at (0,0) size 0x0
    126                 RenderText {#text} at (0,0) size 0x0
    127       RenderBlock (anonymous) at (0,389) size 769x197
     113      RenderBlock (anonymous) at (0,373) size 769x0
     114        RenderInline {SPAN} at (0,0) size 0x0
     115          RenderInline {SPAN} at (0,0) size 0x0
     116            RenderInline {SPAN} at (0,0) size 0x0
     117              RenderInline {SPAN} at (0,0) size 0x0
     118              RenderText {#text} at (0,0) size 0x0
     119      RenderBlock (anonymous) at (0,379) size 769x3
     120        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     121      RenderBlock (anonymous) at (0,388) size 769x0
     122        RenderInline {SPAN} at (0,0) size 0x0
     123          RenderInline {SPAN} at (0,0) size 0x0
     124            RenderInline {SPAN} at (0,0) size 0x0
     125              RenderInline {SPAN} at (0,0) size 0x0
     126                RenderText {#text} at (0,0) size 0x0
     127      RenderBlock (anonymous) at (0,388) size 769x197
    128128        RenderTable {TABLE} at (0,0) size 717x196
    129129          RenderTableSection {TBODY} at (0,0) size 717x196
     
    207207                    RenderInline {SPACE} at (0,0) size 0x17
    208208                      RenderBR {BR} at (0,0) size 0x17
    209       RenderBlock (anonymous) at (0,585) size 769x0
    210         RenderInline {SPAN} at (0,0) size 0x0
    211           RenderInline {SPAN} at (0,0) size 0x0
    212             RenderInline {SPAN} at (0,0) size 0x0
    213               RenderInline {SPAN} at (0,0) size 0x0
    214               RenderText {#text} at (0,0) size 0x0
    215       RenderBlock (anonymous) at (0,592) size 769x3
    216         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    217       RenderBlock (anonymous) at (0,600) size 769x0
    218         RenderInline {SPAN} at (0,0) size 0x0
    219           RenderInline {SPAN} at (0,0) size 0x0
    220             RenderInline {SPAN} at (0,0) size 0x0
    221               RenderInline {SPAN} at (0,0) size 0x0
    222                 RenderText {#text} at (0,0) size 0x0
    223       RenderBlock (anonymous) at (0,600) size 769x197
     209      RenderBlock (anonymous) at (0,584) size 769x0
     210        RenderInline {SPAN} at (0,0) size 0x0
     211          RenderInline {SPAN} at (0,0) size 0x0
     212            RenderInline {SPAN} at (0,0) size 0x0
     213              RenderInline {SPAN} at (0,0) size 0x0
     214              RenderText {#text} at (0,0) size 0x0
     215      RenderBlock (anonymous) at (0,591) size 769x3
     216        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     217      RenderBlock (anonymous) at (0,599) size 769x0
     218        RenderInline {SPAN} at (0,0) size 0x0
     219          RenderInline {SPAN} at (0,0) size 0x0
     220            RenderInline {SPAN} at (0,0) size 0x0
     221              RenderInline {SPAN} at (0,0) size 0x0
     222                RenderText {#text} at (0,0) size 0x0
     223      RenderBlock (anonymous) at (0,599) size 769x197
    224224        RenderTable {TABLE} at (0,0) size 604x196
    225225          RenderTableSection {TBODY} at (0,0) size 604x196
     
    303303                    RenderInline {SPACE} at (0,0) size 0x17
    304304                      RenderBR {BR} at (0,0) size 0x17
    305       RenderBlock (anonymous) at (0,796) size 769x0
    306         RenderInline {SPAN} at (0,0) size 0x0
    307           RenderInline {SPAN} at (0,0) size 0x0
    308             RenderInline {SPAN} at (0,0) size 0x0
    309               RenderInline {SPAN} at (0,0) size 0x0
    310               RenderText {#text} at (0,0) size 0x0
    311       RenderBlock (anonymous) at (0,803) size 769x3
    312         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    313       RenderBlock (anonymous) at (0,812) size 769x0
    314         RenderInline {SPAN} at (0,0) size 0x0
    315           RenderInline {SPAN} at (0,0) size 0x0
    316             RenderInline {SPAN} at (0,0) size 0x0
    317               RenderInline {SPAN} at (0,0) size 0x0
    318                 RenderText {#text} at (0,0) size 0x0
    319       RenderBlock (anonymous) at (0,812) size 769x115
     305      RenderBlock (anonymous) at (0,795) size 769x0
     306        RenderInline {SPAN} at (0,0) size 0x0
     307          RenderInline {SPAN} at (0,0) size 0x0
     308            RenderInline {SPAN} at (0,0) size 0x0
     309              RenderInline {SPAN} at (0,0) size 0x0
     310              RenderText {#text} at (0,0) size 0x0
     311      RenderBlock (anonymous) at (0,802) size 769x3
     312        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     313      RenderBlock (anonymous) at (0,811) size 769x0
     314        RenderInline {SPAN} at (0,0) size 0x0
     315          RenderInline {SPAN} at (0,0) size 0x0
     316            RenderInline {SPAN} at (0,0) size 0x0
     317              RenderInline {SPAN} at (0,0) size 0x0
     318                RenderText {#text} at (0,0) size 0x0
     319      RenderBlock (anonymous) at (0,811) size 769x115
    320320        RenderTable {TABLE} at (0,0) size 618x114
    321321          RenderTableSection {TBODY} at (0,0) size 618x114
     
    356356                      text run at (242,91) width 6: " "
    357357                    RenderBR {BR} at (247,91) size 1x17
    358       RenderBlock (anonymous) at (0,926) size 769x0
    359         RenderInline {SPAN} at (0,0) size 0x0
    360           RenderInline {SPAN} at (0,0) size 0x0
    361             RenderInline {SPAN} at (0,0) size 0x0
    362               RenderInline {SPAN} at (0,0) size 0x0
    363               RenderText {#text} at (0,0) size 0x0
    364       RenderBlock (anonymous) at (0,932) size 769x3
    365         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    366       RenderBlock (anonymous) at (0,941) size 769x51
    367         RenderInline {SPAN} at (0,0) size 196x48
     358      RenderBlock (anonymous) at (0,925) size 769x0
     359        RenderInline {SPAN} at (0,0) size 0x0
     360          RenderInline {SPAN} at (0,0) size 0x0
     361            RenderInline {SPAN} at (0,0) size 0x0
     362              RenderInline {SPAN} at (0,0) size 0x0
     363              RenderText {#text} at (0,0) size 0x0
     364      RenderBlock (anonymous) at (0,931) size 769x3
     365        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     366      RenderBlock (anonymous) at (0,940) size 769x51
     367        RenderInline {SPAN} at (0,0) size 196x47
    368368          RenderInline {SPAN} at (0,0) size 0x0
    369369            RenderInline {SPAN} at (0,0) size 0x0
     
    373373            RenderText {#text} at (0,0) size 0x0
    374374            RenderImage {IMG} at (0,0) size 20x20
    375             RenderText {#text} at (20,0) size 78x17
    376               text run at (20,0) width 5: " "
    377               text run at (24,0) width 74: "Remarks:"
    378             RenderBR {BR} at (97,0) size 1x17
     375            RenderText {#text} at (20,1) size 78x17
     376              text run at (20,1) width 5: " "
     377              text run at (24,1) width 74: "Remarks:"
     378            RenderBR {BR} at (97,1) size 1x17
    379379          RenderText {#text} at (0,0) size 0x0
    380380          RenderBR {BR} at (0,20) size 0x15
     
    385385            RenderBR {BR} at (195,35) size 1x15
    386386          RenderText {#text} at (0,0) size 0x0
    387       RenderBlock (anonymous) at (0,998) size 769x3
    388         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    389       RenderBlock (anonymous) at (0,1006) size 769x22
     387      RenderBlock (anonymous) at (0,997) size 769x3
     388        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     389      RenderBlock (anonymous) at (0,1005) size 769x22
    390390        RenderInline {SPAN} at (0,0) size 188x15
    391391          RenderInline {SPAN} at (0,0) size 188x17
     
    404404            RenderText {#text} at (0,0) size 0x0
    405405          RenderText {#text} at (0,0) size 0x0
    406       RenderBlock (anonymous) at (0,1034) size 769x3
    407         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    408       RenderBlock (anonymous) at (0,1043) size 769x21
     406      RenderBlock (anonymous) at (0,1033) size 769x3
     407        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     408      RenderBlock (anonymous) at (0,1042) size 769x21
    409409        RenderInline {SPAN} at (0,0) size 279x15
    410410          RenderInline {SPAN} at (0,0) size 279x15
     
    413413              RenderText {#text} at (0,0) size 0x0
    414414              RenderImage {IMG} at (0,0) size 20x20
    415               RenderText {#text} at (20,0) size 259x17
    416                 text run at (20,0) width 5: " "
    417                 text run at (24,0) width 255: "Remarks and Service Information"
    418               RenderBR {BR} at (278,0) size 1x17
    419             RenderText {#text} at (0,0) size 0x0
    420             RenderText {#text} at (0,0) size 0x0
    421       RenderBlock (anonymous) at (0,1069) size 769x32
     415              RenderText {#text} at (20,1) size 259x17
     416                text run at (20,1) width 5: " "
     417                text run at (24,1) width 255: "Remarks and Service Information"
     418              RenderBR {BR} at (278,1) size 1x17
     419            RenderText {#text} at (0,0) size 0x0
     420            RenderText {#text} at (0,0) size 0x0
     421      RenderBlock (anonymous) at (0,1068) size 769x32
    422422        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    423423        RenderBlock {P} at (0,15) size 769x16
     
    428428              text run at (200,0) width 162: "Click here for latest updates"
    429429          RenderText {#text} at (0,0) size 0x0
    430       RenderBlock (anonymous) at (0,1113) size 769x0
     430      RenderBlock (anonymous) at (0,1112) size 769x0
    431431        RenderInline {SPAN} at (0,0) size 0x0
    432432          RenderInline {SPAN} at (0,0) size 0x0
     
    450450  RenderInline (relative positioned) {SPAN} at (0,0) size 586x38
    451451    RenderText {#text} at (0,0) size 0x0
    452     RenderImage {IMG} at (0,21) size 20x20
    453     RenderText {#text} at (20,29) size 566x15
    454       text run at (20,29) width 4: " "
    455       text run at (23,29) width 56: "Address: "
    456       text run at (78,29) width 508: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
    457     RenderBR {BR} at (585,29) size 1x15
    458     RenderImage {IMG} at (0,44) size 20x20
    459     RenderText {#text} at (20,52) size 403x15
    460       text run at (20,52) width 4: " "
    461       text run at (23,52) width 49: "Deliver: "
    462       text run at (71,52) width 102: "DEBI STANGEL, "
    463       text run at (172,52) width 116: "119 GLEN COURT, "
    464       text run at (287,52) width 136: "DANVILLE CA Z/94526"
    465 layer at (23,185) size 20x15
     452    RenderImage {IMG} at (0,20) size 20x20
     453    RenderText {#text} at (20,28) size 566x15
     454      text run at (20,28) width 4: " "
     455      text run at (23,28) width 56: "Address: "
     456      text run at (78,28) width 508: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
     457    RenderBR {BR} at (585,28) size 1x15
     458    RenderImage {IMG} at (0,43) size 20x20
     459    RenderText {#text} at (20,51) size 403x15
     460      text run at (20,51) width 4: " "
     461      text run at (23,51) width 49: "Deliver: "
     462      text run at (71,51) width 102: "DEBI STANGEL, "
     463      text run at (172,51) width 116: "119 GLEN COURT, "
     464      text run at (287,51) width 136: "DANVILLE CA Z/94526"
     465layer at (23,184) size 20x15
    466466  RenderInline (relative positioned) {SPAN} at (0,0) size 20x15
    467467    RenderText {#text} at (0,0) size 0x0
    468468    RenderImage {IMG} at (0,21) size 20x20
    469469    RenderText {#text} at (0,0) size 0x0
    470 layer at (23,226) size 769x60
    471   RenderBlock (anonymous) at (0,217) size 769x61
    472 layer at (43,211) size 523x60
     470layer at (23,225) size 769x60
     471  RenderBlock (anonymous) at (0,216) size 769x61
     472layer at (43,210) size 523x60
    473473  RenderTable {TABLE} at (0,0) size 524x60 [border: (1px outset #808080)]
    474474    RenderTableSection {TBODY} at (1,1) size 522x58
  • trunk/LayoutTests/platform/mac/fast/inline/002-expected.txt

    r177774 r271110  
    88      RenderInline {SPAN} at (0,0) size 46x18
    99        RenderText {#text} at (0,0) size 0x0
    10         RenderInline {SPAN} at (0,0) size 42x18
    11           RenderText {#text} at (45,1) size 42x18
     10        RenderInline {SPAN} at (0,0) size 42x19
     11          RenderText {#text} at (45,1) size 42x19
    1212            text run at (45,1) width 42: "Line 2"
    1313        RenderText {#text} at (86,0) size 5x18
  • trunk/LayoutTests/platform/mac/fast/table/table-display-types-strict-expected.txt

    r195740 r271110  
    4646                    RenderTableRow (anonymous) at (0,2) size 100x19
    4747                      RenderTableCell {TR} at (2,2) size 96x19 [r=0 c=0 rs=1 cs=1]
    48                         RenderInline {TD} at (0,0) size 48x20
    49                           RenderText {#text} at (1,1) size 46x18
     48                        RenderInline {TD} at (0,0) size 48x21
     49                          RenderText {#text} at (1,1) size 46x19
    5050                            text run at (1,1) width 46: "Head 1"
    51                         RenderInline {TD} at (0,0) size 49x20
    52                           RenderText {#text} at (48,1) size 47x18
     51                        RenderInline {TD} at (0,0) size 49x21
     52                          RenderText {#text} at (48,1) size 47x19
    5353                            text run at (48,1) width 47: "Head 2"
    5454              RenderTableCell {TFOOT} at (103,2) size 117x23 [r=0 c=1 rs=1 cs=1]
     
    5757                    RenderTableRow (anonymous) at (0,2) size 116x19
    5858                      RenderTableCell {TR} at (2,2) size 112x19 [r=0 c=0 rs=1 cs=1]
    59                         RenderInline {TD} at (0,0) size 56x20
    60                           RenderText {#text} at (1,1) size 54x18
     59                        RenderInline {TD} at (0,0) size 56x21
     60                          RenderText {#text} at (1,1) size 54x19
    6161                            text run at (1,1) width 54: "Footer 1"
    62                         RenderInline {TD} at (0,0) size 57x20
    63                           RenderText {#text} at (56,1) size 55x18
     62                        RenderInline {TD} at (0,0) size 57x21
     63                          RenderText {#text} at (56,1) size 55x19
    6464                            text run at (56,1) width 55: "Footer 2"
    6565          RenderTableSection {TBODY} at (0,27) size 222x21
    6666            RenderTableRow (anonymous) at (0,0) size 222x19
    6767              RenderTableCell {TR} at (2,0) size 100x19 [r=0 c=0 rs=1 cs=1]
    68                 RenderInline {TD} at (0,0) size 41x20
    69                   RenderText {#text} at (1,1) size 39x18
     68                RenderInline {TD} at (0,0) size 41x21
     69                  RenderText {#text} at (1,1) size 39x19
    7070                    text run at (1,1) width 39: "Cell 1"
    71                 RenderInline {TD} at (0,0) size 42x20
    72                   RenderText {#text} at (41,1) size 40x18
     71                RenderInline {TD} at (0,0) size 42x21
     72                  RenderText {#text} at (41,1) size 40x19
    7373                    text run at (41,1) width 40: "Cell 2"
    7474              RenderTableCell {TR} at (103,0) size 117x19 [r=0 c=1 rs=1 cs=1]
    75                 RenderInline {TD} at (0,0) size 41x20
    76                   RenderText {#text} at (1,1) size 39x18
     75                RenderInline {TD} at (0,0) size 41x21
     76                  RenderText {#text} at (1,1) size 39x19
    7777                    text run at (1,1) width 39: "Cell 3"
    78                 RenderInline {TD} at (0,0) size 42x20
    79                   RenderText {#text} at (41,1) size 40x18
     78                RenderInline {TD} at (0,0) size 42x21
     79                  RenderText {#text} at (41,1) size 40x19
    8080                    text run at (41,1) width 40: "Cell 4"
    8181      RenderBlock {TABLE} at (10,162) size 764x102 [border: (1px solid #000000)]
  • trunk/Source/WebCore/ChangeLog

    r271109 r271110  
     12020-12-30  Zalan Bujtas  <zalan@apple.com>
     2
     3        [Legacy Line Layout] Remove unnecessary 'vertical-align: middle' integral rounding
     4        https://bugs.webkit.org/show_bug.cgi?id=220198
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Let's not do "random" rounding for 'vertical-align: middle'. Fix it for all the alignment types by
     9        adjusting the logical top position when the inline box stretches the line.
     10
     11        * rendering/InlineFlowBox.cpp:
     12        (WebCore::InlineFlowBox::computeLogicalBoxHeights):
     13        * rendering/RootInlineBox.cpp:
     14        (WebCore::RootInlineBox::verticalPositionForBox):
     15
    1162020-12-30  Simon Fraser  <simon.fraser@apple.com>
    217
  • trunk/Source/WebCore/rendering/InlineFlowBox.cpp

    r270044 r271110  
    567567        return;
    568568
     569    InlineBox* maxAscentInlineBox = nullptr;
    569570    for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
    570571        if (child->renderer().isOutOfFlowPositioned())
     
    605606                maxAscent = ascent;
    606607                setMaxAscent = true;
     608                maxAscentInlineBox = child;
    607609            }
    608610
     
    613615        }
    614616
    615         if (inlineFlowBox)
     617        if (inlineFlowBox) {
    616618            inlineFlowBox->computeLogicalBoxHeights(rootBox, maxPositionTop, maxPositionBottom, maxAscent, maxDescent,
    617                                                     setMaxAscent, setMaxDescent, strictMode, textBoxDataMap,
    618                                                     baselineType, verticalPositionCache);
     619                setMaxAscent, setMaxDescent, strictMode, textBoxDataMap, baselineType, verticalPositionCache);
     620        }
     621    }
     622    if (maxAscentInlineBox) {
     623        // When the inline box stretches the ascent, we floor the logical top value to make sure the inline box does not
     624        // stick out of block container at the top (see above).
     625        // In such cases the logical top also needs to be adjusted to match this stretched ascent geometry.
     626        // (not doing so will result a subpixel logical top offset while it should be flushed with the top edge)
     627        maxAscentInlineBox->setLogicalTop(floorf(maxAscentInlineBox->logicalTop()));
    619628    }
    620629}
  • trunk/Source/WebCore/rendering/RootInlineBox.cpp

    r270990 r271110  
    942942            verticalPosition += renderer->baselinePosition(baselineType(), firstLine, lineDirection) - fontMetrics.ascent(baselineType());
    943943        else if (verticalAlign == VerticalAlign::Middle)
    944             verticalPosition = (verticalPosition - LayoutUnit(fontMetrics.xHeight() / 2) - renderer->lineHeight(firstLine, lineDirection) / 2 + renderer->baselinePosition(baselineType(), firstLine, lineDirection)).round();
     944            verticalPosition = (verticalPosition - LayoutUnit(fontMetrics.xHeight() / 2) - renderer->lineHeight(firstLine, lineDirection) / 2 + renderer->baselinePosition(baselineType(), firstLine, lineDirection));
    945945        else if (verticalAlign == VerticalAlign::TextBottom) {
    946946            verticalPosition += fontMetrics.descent(baselineType());
Note: See TracChangeset for help on using the changeset viewer.