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

Changeset 295701 in webkit


Ignore:
Timestamp:
Jun 21, 2022, 4:28:41 PM (4 years ago)
Author:
commit-queue@webkit.org
Message:

getComputedStyle(img).height returns string of a rounded int not a float
​https://bugs.webkit.org/show_bug.cgi?id=206161
<rdar://93860607>

Patch by Sammy Gill <​sgill26@apple.com> on 2022-06-21
Reviewed by Alan Bujtas.

When computing the logical height/width for a replaced element, we may
need to calculate it using (used width) / (intrinsic ratio) or
(used height) / (intrinsic ratio). In either case, these are the
used values according to the spec, which means they may be floats.

Currently, WebKit performs these computations, but it also rounds them
leading to an incorrect value. By removing these calls to round, the
computed value should line up with what is specified in the spec.

As a result of this change, several tests needed to be rebaselined since
the generated content was slightly different. In the test cases, there
were certain elements that computed a slightly different width/height
value, which resulted in different dimensions that were used in the
rendering as well as in the output of the tests. Depending on how the
dimensions of an element changed, this could have in turn caused a
nearby element to get rendered slightly differetly as well. For example,
if an element had a slight increase in its height, this could have
caused a neighboring element to have a slightly different position in
the y dimension. The more of these interactions/differences there are
would mean we would see a greater difference in the expected vs actual
output (e.g. css1/text_properties/vertical_align.html).

However, this change should be seen as a progression when comparing the
tests with the results of other browsers. By loading up the tests in
other browsers, you can see that the dimensions that are calculated
are more in line with the new values generated with this patch.

Referenced spec: ​https://www.w3.org/TR/CSS21/visudet.html#propdef-height

  • Source/WebCore/rendering/RenderReplaced.cpp:

(WebCore::resolveWidthForRatio):
(WebCore::RenderReplaced::computeReplacedLogicalWidth const):
(WebCore::resolveHeightForRatio):
(WebCore::RenderReplaced::computeReplacedLogicalHeight const):

  • LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt:
  • LayoutTests/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt:
  • LayoutTests/fast/writing-mode/block-level-images-expected.txt:
  • LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio-expected.txt:
  • LayoutTests/platform/mac/css1/box_properties/width-expected.txt:
  • LayoutTests/platform/mac/css1/formatting_model/replaced_elements-expected.txt:
  • LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.txt:
  • LayoutTests/platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.txt:
  • LayoutTests/platform/mac/fast/replaced/width100percent-image-expected.txt:
  • LayoutTests/platform/mac/svg/wicd/test-rightsizing-b-expected.txt:
  • LayoutTests/platform/mac/tables/mozilla/bugs/bug14929-expected.txt:
  • LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug85016-expected.txt:
  • LayoutTests/svg/css/max-width-2-expected.html:
  • LayoutTests/platform/glib/css2.1/t090501-c414-flt-03-b-g-expected.txt:
  • LayoutTests/platform/glib/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt:
  • LayoutTests/platform/glib/tables/mozilla_expected_failures/bugs/bug85016-expected.txt:
  • LayoutTests/platform/gtk/css1/box_properties/width-expected.txt:
  • LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.txt:
  • LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.txt:
  • LayoutTests/platform/gtk/css2.1/t090501-c414-flt-03-b-g-expected.png:
  • LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.png:
  • LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.txt:
  • LayoutTests/platform/gtk/fast/replaced/width100percent-image-expected.txt:
  • LayoutTests/platform/gtk/tables/mozilla/bugs/bug14929-expected.txt:
  • LayoutTests/platform/ios/css1/text_properties/vertical_align-expected.txt:
  • LayoutTests/platform/ios/fast/replaced/width100percent-image-expected.txt:
  • LayoutTests/platform/ios/tables/mozilla/bugs/bug14929-expected.txt:
  • LayoutTests/platform/ios/tables/mozilla_expected_failures/bugs/bug85016-expected.txt:
  • LayoutTests/platform/glib/TestExpectations:
  • LayoutTests/platform/gtk/TestExpectations:

Canonical link: ​https://commits.webkit.org/251706@main

Location:
trunk
Files:
31 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt

    r149088 r295701  
    88layer at (51,141) size 560x320
    99  RenderBlock (positioned) {DIV} at (1,40) size 561x322 [border: (1px solid #FF0000)]
    10     RenderImage {IMG} at (1,1) size 393x319
     10    RenderImage {IMG} at (1,1) size 394x319
    1111    RenderText {#text} at (0,0) size 0x0
    1212    RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/fast/writing-mode/block-level-images-expected.txt

    r109453 r295701  
    44  RenderBlock {HTML} at (0,0) size 800x316
    55    RenderBody {BODY} at (8,8) size 784x0
    6       RenderBlock (floating) {DIV} at (2,2) size 264x304 [border: (2px solid #000000)]
     6      RenderBlock (floating) {DIV} at (2,2) size 265x304 [border: (2px solid #000000)]
    77        RenderBlock {DIV} at (2,2) size 25x300 [bgcolor=#008000]
    88        RenderImage {IMG} at (27,2) size 154x156 [border: (1px solid #800080) (2px solid #800000) (5px dashed #808080) (2px solid #800000)]
    9         RenderImage {IMG} at (181,42) size 56x50
    10         RenderBlock {DIV} at (237,2) size 25x300 [bgcolor=#008000]
    11       RenderBlock (floating) {DIV} at (270,2) size 264x304 [border: (2px solid #000000)]
     9        RenderImage {IMG} at (181,42) size 57x50
     10        RenderBlock {DIV} at (237,2) size 26x300 [bgcolor=#008000]
     11      RenderBlock (floating) {DIV} at (270,2) size 265x304 [border: (2px solid #000000)]
    1212        RenderBlock {DIV} at (2,2) size 25x300 [bgcolor=#008000]
    1313        RenderImage {IMG} at (27,146) size 154x156 [border: (5px dashed #808080) (2px solid #800000) (1px solid #800080) (2px solid #800000)]
    14         RenderImage {IMG} at (181,212) size 56x50
    15         RenderBlock {DIV} at (237,2) size 25x300 [bgcolor=#008000]
     14        RenderImage {IMG} at (181,212) size 57x50
     15        RenderBlock {DIV} at (237,2) size 26x300 [bgcolor=#008000]
  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio-expected.txt

    r264522 r295701  
    22layer at (0,0) size 800x600
    33  RenderView at (0,0) size 800x600
    4 layer at (0,0) size 800x130
    5   RenderBlock {HTML} at (0,0) size 800x130
     4layer at (0,0) size 800x129
     5  RenderBlock {HTML} at (0,0) size 800x129
    66    RenderBody {BODY} at (8,8) size 784x0
    77layer at (8,8) size 203x0
    … …  
    99    RenderHTMLCanvas {CANVAS} at (0,0) size 61x61 [bgcolor=#008000]
    1010    RenderHTMLCanvas {CANVAS} at (60,0) size 62x61 [bgcolor=#008000]
    11     RenderHTMLCanvas {CANVAS} at (0,61) size 122x61 [bgcolor=#008000]
     11    RenderHTMLCanvas {CANVAS} at (0,60) size 122x61 [bgcolor=#008000]
  • trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt

    r278689 r295701  
    4141PASS Loaded images test: Error image with width and height attributes
    4242PASS Loaded images test: Error image with width, height and alt attributes
    43 FAIL Loaded images test: <img> with width and height attributes, but not equal to the original aspect ratio assert_approx_equals: The original aspect ratio of blue.png expected 1.2547169811320755 +/- 0.001 but got 1.25
     43PASS Loaded images test: <img> with width and height attributes, but not equal to the original aspect ratio
    4444
  • trunk/LayoutTests/platform/glib/TestExpectations

    r295555 r295701  
    698698webkit.org/b/241568 imported/w3c/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-003.html [ ImageOnlyFailure ]
    699699
     700# Changes to logical height/width computations (https://bugs.webkit.org/show_bug.cgi?id=241601)
     701webkit.org/b/241601 css2.1/t090501-c414-flt-03-b-g.html [ Failure ]
    700702
    701703#////////////////////////////////////////////////////////////////////////////////////////
  • trunk/LayoutTests/platform/glib/css2.1/t090501-c414-flt-03-b-g-expected.txt

    r288112 r295701  
    88          text run at (0,2) width 246: "In the following test, the purple square "
    99          text run at (246,2) width 150: "should be on the left (\x{21E6}"
    10         RenderImage {IMG} at (396,0) size 19x20
    11         RenderText {#text} at (415,2) size 215x17
    12           text run at (415,2) width 215: "), and the teal square on the right ("
    13         RenderImage {IMG} at (630,0) size 19x20
    14         RenderText {#text} at (649,2) size 738x35
    15           text run at (649,2) width 89: "\x{21E8}) of the blue"
     10        RenderImage {IMG} at (396,0) size 20x20
     11        RenderText {#text} at (415,2) size 216x17
     12          text run at (415,2) width 216: "), and the teal square on the right ("
     13        RenderImage {IMG} at (630,0) size 20x20
     14        RenderText {#text} at (649,2) size 739x35
     15          text run at (649,2) width 90: "\x{21E8}) of the blue"
    1616          text run at (0,20) width 61: "rectangle."
    1717      RenderBlock {DIV} at (0,54) size 784x70
  • trunk/LayoutTests/platform/glib/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt

    r285011 r295701  
    88layer at (51,141) size 560x320
    99  RenderBlock (positioned) {div} at (1,40) size 561x322 [border: (1px solid #FF0000)]
    10     RenderImage {img} at (1,1) size 393x319
     10    RenderImage {img} at (1,1) size 394x319
    1111    RenderText {#text} at (0,0) size 0x0
    1212    RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/glib/tables/mozilla_expected_failures/bugs/bug85016-expected.txt

    r261673 r295701  
    1313      RenderBlock {DIV} at (32,735) size 657x657 [border: (3px dotted #008000)]
    1414        RenderBlock {DIV} at (35,35) size 587x587 [border: (1px solid #FF0000)]
    15           RenderImage {IMG} at (1,1) size 860x585
     15          RenderImage {IMG} at (1,1) size 861x585
    1616          RenderText {#text} at (0,0) size 0x0
    1717      RenderBlock {P} at (0,1424) size 721x18
  • trunk/LayoutTests/platform/gtk/TestExpectations

    r295512 r295701  
    910910webkit.org/b/239750 media/media-source/media-mp4-xhe-aac.html [ Skip ]
    911911
     912# Changes to logical height/width computations (https://bugs.webkit.org/show_bug.cgi?id=241601)
     913webkit.org/b/241601 svg/wicd/rightsizing-grid.xhtml [ Failure ]
     914webkit.org/b/241601 svg/wicd/test-rightsizing-b.xhtml [ Failure ]
     915
    912916#////////////////////////////////////////////////////////////////////////////////////////
    913917# End of Expected failures.
  • trunk/LayoutTests/platform/gtk/css1/box_properties/width-expected.txt

    r282363 r295701  
    6060                  text run at (0,0) width 287: "The square above should be fifty pixels wide."
    6161              RenderBlock (anonymous) at (4,104) size 363x181
    62                 RenderImage {IMG} at (0,0) size 182x181
     62                RenderImage {IMG} at (0,0) size 182x182
    6363                RenderText {#text} at (0,0) size 0x0
    6464              RenderBlock {P} at (4,301) size 363x36
  • trunk/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.txt

    r282363 r295701  
    1 layer at (0,0) size 785x2341
     1layer at (0,0) size 785x2339
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x2341
    4   RenderBlock {HTML} at (0,0) size 785x2341
    5     RenderBody {BODY} at (8,8) size 769x2325 [bgcolor=#CCCCCC]
     3layer at (0,0) size 785x2339
     4  RenderBlock {HTML} at (0,0) size 785x2339
     5    RenderBody {BODY} at (8,8) size 769x2323 [bgcolor=#CCCCCC]
    66      RenderBlock {P} at (0,0) size 769x18
    77        RenderText {#text} at (0,0) size 355x17
    … …  
    3939          text run at (0,0) width 400: "The above image should be a 15px square aligned at the center."
    4040      RenderImage {IMG} at (192,350) size 385x385
    41       RenderBlock {P} at (0,751) size 769x36
     41      RenderBlock {P} at (0,750) size 769x37
    4242        RenderText {#text} at (0,0) size 766x35
    4343          text run at (0,0) width 766: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally within"
    4444          text run at (0,18) width 123: "the parent element: "
    4545          text run at (123,18) width 395: "the document body in the first half, and the table in the second."
    46       RenderImage {IMG} at (384,803) size 385x385
    47       RenderBlock {P} at (0,1204) size 769x36
     46      RenderImage {IMG} at (384,802) size 385x385
     47      RenderBlock {P} at (0,1203) size 769x36
    4848        RenderText {#text} at (0,0) size 758x35
    4949          text run at (0,0) width 758: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of the"
    5050          text run at (0,18) width 100: "parent element: "
    5151          text run at (100,18) width 395: "the document body in the first half, and the table in the second."
    52       RenderTable {TABLE} at (0,1256) size 769x1069 [border: (1px outset #808080)]
    53         RenderTableSection {TBODY} at (1,1) size 767x1067
     52      RenderTable {TABLE} at (0,1255) size 769x1068 [border: (1px outset #808080)]
     53        RenderTableSection {TBODY} at (1,1) size 767x1066
    5454          RenderTableRow {TR} at (0,0) size 767x26
    5555            RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
    … …  
    5757                RenderText {#text} at (4,4) size 161x17
    5858                  text run at (4,4) width 161: "TABLE Testing Section"
    59           RenderTableRow {TR} at (0,26) size 767x1041
    60             RenderTableCell {TD} at (0,533) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
    61               RenderText {#text} at (4,3) size 4x19
     59          RenderTableRow {TR} at (0,26) size 767x1040
     60            RenderTableCell {TD} at (0,533) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
     61              RenderText {#text} at (4,4) size 4x17
    6262                text run at (4,4) width 4: " "
    63             RenderTableCell {TD} at (12,26) size 755x1041 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
     63            RenderTableCell {TD} at (12,26) size 755x1040 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
    6464              RenderBlock {P} at (4,4) size 747x19
    6565                RenderImage {IMG} at (0,0) size 15x15
    … …  
    7575                  text run at (0,0) width 400: "The above image should be a 15px square aligned at the center."
    7676              RenderImage {IMG} at (190,169) size 375x374
    77               RenderBlock {P} at (4,559) size 747x36
     77              RenderBlock {P} at (4,558) size 747x37
    7878                RenderText {#text} at (0,0) size 722x35
    7979                  text run at (0,0) width 722: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally"
    8080                  text run at (0,18) width 167: "within the parent element: "
    8181                  text run at (167,18) width 395: "the document body in the first half, and the table in the second."
    82               RenderImage {IMG} at (377,611) size 374x374
    83               RenderBlock {P} at (4,1001) size 747x36
     82              RenderImage {IMG} at (377,610) size 374x374
     83              RenderBlock {P} at (4,1000) size 747x36
    8484                RenderText {#text} at (0,0) size 735x35
    8585                  text run at (0,0) width 735: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of"
  • trunk/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.txt

    r288112 r295701  
    174174          text run at (80,122) width 101: " all of which "
    175175        RenderImage {IMG} at (181,122) size 20x65
    176         RenderText {#text} at (201,122) size 5x21
    177           text run at (201,122) width 5: " "
    178         RenderInline {SPAN} at (0,0) size 262x41
    179           RenderText {#text} at (206,106) size 262x41
    180             text run at (206,106) width 262: "should be aligned"
    181         RenderText {#text} at (468,122) size 5x21
    182           text run at (468,122) width 5: " "
    183         RenderImage {IMG} at (473,122) size 11x35
    184         RenderText {#text} at (484,122) size 123x21
    185           text run at (484,122) width 123: " with the top of "
    186         RenderImage {IMG} at (607,122) size 9x30
    187         RenderText {#text} at (616,122) size 5x21
    188           text run at (616,122) width 5: " "
    189         RenderInline {SPAN} at (0,0) size 733x142
    190           RenderText {#text} at (621,114) size 19x31
    191             text run at (621,114) width 19: "a "
    192           RenderInline {SPAN} at (0,0) size 733x188
    193             RenderText {#text} at (640,77) size 733x188
    194               text run at (640,77) width 93: "14-"
     176        RenderText {#text} at (200,122) size 6x21
     177          text run at (200,122) width 6: " "
     178        RenderInline {SPAN} at (0,0) size 263x41
     179          RenderText {#text} at (205,106) size 263x41
     180            text run at (205,106) width 263: "should be aligned"
     181        RenderText {#text} at (467,122) size 6x21
     182          text run at (467,122) width 6: " "
     183        RenderImage {IMG} at (472,122) size 11x35
     184        RenderText {#text} at (483,122) size 123x21
     185          text run at (483,122) width 123: " with the top of "
     186        RenderImage {IMG} at (606,122) size 9x30
     187        RenderText {#text} at (615,122) size 5x21
     188          text run at (615,122) width 5: " "
     189        RenderInline {SPAN} at (0,0) size 732x142
     190          RenderText {#text} at (620,114) size 19x31
     191            text run at (620,114) width 19: "a "
     192          RenderInline {SPAN} at (0,0) size 732x188
     193            RenderText {#text} at (639,77) size 732x188
     194              text run at (639,77) width 93: "14-"
    195195              text run at (0,188) width 143: "point"
    196196          RenderText {#text} at (143,225) size 144x31
    … …  
    207207          text run at (501,233) width 5: " "
    208208        RenderImage {IMG} at (506,233) size 5x15
    209         RenderText {#text} at (511,233) size 5x21
    210           text run at (511,233) width 5: " "
    211         RenderInline {BIG} at (0,0) size 155x24
    212           RenderText {#text} at (516,231) size 155x24
    213             text run at (516,231) width 155: "the images appear."
     209        RenderText {#text} at (510,233) size 6x21
     210          text run at (510,233) width 6: " "
     211        RenderInline {BIG} at (0,0) size 156x24
     212          RenderText {#text} at (515,231) size 156x24
     213            text run at (515,231) width 156: "the images appear."
    214214        RenderText {#text} at (670,233) size 6x21
    215215          text run at (670,233) width 6: " "
    … …  
    247247          text run at (0,98) width 43: "which "
    248248        RenderImage {IMG} at (43,76) size 20x66
    249         RenderText {#text} at (63,98) size 119x18
    250           text run at (63,98) width 119: " should be aligned "
    251         RenderImage {IMG} at (182,91) size 11x36
    252         RenderText {#text} at (193,98) size 4x18
    253           text run at (193,98) width 4: " "
     249        RenderText {#text} at (62,98) size 120x18
     250          text run at (62,98) width 120: " should be aligned "
     251        RenderImage {IMG} at (181,91) size 11x36
     252        RenderText {#text} at (192,98) size 4x18
     253          text run at (192,98) width 4: " "
    254254        RenderInline {SPAN} at (0,0) size 236x37
    255           RenderText {#text} at (197,83) size 236x37
    256             text run at (197,83) width 236: "with the middle of"
    257         RenderText {#text} at (433,98) size 4x18
    258           text run at (433,98) width 4: " "
    259         RenderImage {IMG} at (437,83) size 15x51
    260         RenderText {#text} at (452,98) size 4x18
    261           text run at (452,98) width 4: " "
    262         RenderInline {SPAN} at (0,0) size 720x105
    263           RenderText {#text} at (456,91) size 17x27
    264             text run at (456,91) width 17: "a "
     255          RenderText {#text} at (196,83) size 236x37
     256            text run at (196,83) width 236: "with the middle of"
     257        RenderText {#text} at (432,98) size 4x18
     258          text run at (432,98) width 4: " "
     259        RenderImage {IMG} at (436,83) size 15x51
     260        RenderText {#text} at (451,98) size 4x18
     261          text run at (451,98) width 4: " "
     262        RenderInline {SPAN} at (0,0) size 719x105
     263          RenderText {#text} at (455,91) size 17x27
     264            text run at (455,91) width 17: "a "
    265265          RenderInline {SPAN} at (0,0) size 204x67
    266             RenderText {#text} at (473,59) size 204x67
    267               text run at (473,59) width 204: "14-point"
    268           RenderText {#text} at (677,91) size 720x105
    269             text run at (677,91) width 43: " text"
     266            RenderText {#text} at (472,59) size 204x67
     267              text run at (472,59) width 204: "14-point"
     268          RenderText {#text} at (676,91) size 719x105
     269            text run at (676,91) width 43: " text"
    270270            text run at (0,169) width 78: "element"
    271271        RenderText {#text} at (77,176) size 5x18
    … …  
    349349        RenderText {#text} at (284,47) size 5x17
    350350          text run at (284,47) width 5: " "
    351         RenderImage {IMG} at (288,47) size 12x35
    352         RenderText {#text} at (299,47) size 5x17
    353           text run at (299,47) width 5: " "
     351        RenderImage {IMG} at (288,47) size 11x35
     352        RenderText {#text} at (298,47) size 5x17
     353          text run at (298,47) width 5: " "
    354354        RenderInline {SPAN} at (0,0) size 189x36
    355           RenderText {#text} at (303,47) size 189x36
    356             text run at (303,47) width 189: "with the top of"
    357         RenderText {#text} at (491,47) size 5x17
    358           text run at (491,47) width 5: " "
    359         RenderImage {IMG} at (495,47) size 16x50
    360         RenderText {#text} at (510,47) size 5x17
    361           text run at (510,47) width 5: " "
     355          RenderText {#text} at (302,47) size 189x36
     356            text run at (302,47) width 189: "with the top of"
     357        RenderText {#text} at (490,47) size 5x17
     358          text run at (490,47) width 5: " "
     359        RenderImage {IMG} at (494,47) size 16x50
     360        RenderText {#text} at (509,47) size 5x17
     361          text run at (509,47) width 5: " "
    362362        RenderInline {SPAN} at (0,0) size 129x17
    363           RenderText {#text} at (514,47) size 129x17
    364             text run at (514,47) width 129: "the tallest element in"
    365         RenderText {#text} at (642,47) size 5x17
    366           text run at (642,47) width 5: " "
    367         RenderImage {IMG} at (646,47) size 6x15
    368         RenderText {#text} at (651,47) size 5x17
    369           text run at (651,47) width 5: " "
    370         RenderInline {BIG} at (0,0) size 744x89
    371           RenderText {#text} at (655,47) size 744x89
    372             text run at (655,47) width 89: "whichever"
     363          RenderText {#text} at (513,47) size 129x17
     364            text run at (513,47) width 129: "the tallest element in"
     365        RenderText {#text} at (641,47) size 5x17
     366          text run at (641,47) width 5: " "
     367        RenderImage {IMG} at (645,47) size 6x15
     368        RenderText {#text} at (650,47) size 5x17
     369          text run at (650,47) width 5: " "
     370        RenderInline {BIG} at (0,0) size 743x89
     371          RenderText {#text} at (654,47) size 743x89
     372            text run at (654,47) width 89: "whichever"
    373373            text run at (0,112) width 207: "line the elements appear."
    374374        RenderText {#text} at (206,112) size 5x17
    … …  
    518518                  text run at (80,122) width 101: " all of which "
    519519                RenderImage {IMG} at (181,122) size 20x65
    520                 RenderText {#text} at (201,122) size 5x21
    521                   text run at (201,122) width 5: " "
    522                 RenderInline {SPAN} at (0,0) size 262x41
    523                   RenderText {#text} at (206,106) size 262x41
    524                     text run at (206,106) width 262: "should be aligned"
    525                 RenderText {#text} at (468,122) size 5x21
    526                   text run at (468,122) width 5: " "
    527                 RenderImage {IMG} at (473,122) size 11x35
    528                 RenderText {#text} at (484,122) size 123x21
    529                   text run at (484,122) width 123: " with the top of "
    530                 RenderImage {IMG} at (607,122) size 9x30
    531                 RenderText {#text} at (616,122) size 5x21
    532                   text run at (616,122) width 5: " "
    533                 RenderInline {SPAN} at (0,0) size 733x142
    534                   RenderText {#text} at (621,114) size 19x31
    535                     text run at (621,114) width 19: "a "
    536                   RenderInline {SPAN} at (0,0) size 733x188
    537                     RenderText {#text} at (640,77) size 733x188
    538                       text run at (640,77) width 93: "14-"
     520                RenderText {#text} at (200,122) size 6x21
     521                  text run at (200,122) width 6: " "
     522                RenderInline {SPAN} at (0,0) size 263x41
     523                  RenderText {#text} at (205,106) size 263x41
     524                    text run at (205,106) width 263: "should be aligned"
     525                RenderText {#text} at (467,122) size 6x21
     526                  text run at (467,122) width 6: " "
     527                RenderImage {IMG} at (472,122) size 11x35
     528                RenderText {#text} at (483,122) size 123x21
     529                  text run at (483,122) width 123: " with the top of "
     530                RenderImage {IMG} at (606,122) size 9x30
     531                RenderText {#text} at (615,122) size 5x21
     532                  text run at (615,122) width 5: " "
     533                RenderInline {SPAN} at (0,0) size 732x142
     534                  RenderText {#text} at (620,114) size 19x31
     535                    text run at (620,114) width 19: "a "
     536                  RenderInline {SPAN} at (0,0) size 732x188
     537                    RenderText {#text} at (639,77) size 732x188
     538                      text run at (639,77) width 93: "14-"
    539539                      text run at (0,188) width 143: "point"
    540540                  RenderText {#text} at (143,225) size 144x31
    … …  
    551551                  text run at (501,233) width 5: " "
    552552                RenderImage {IMG} at (506,233) size 5x15
    553                 RenderText {#text} at (511,233) size 5x21
    554                   text run at (511,233) width 5: " "
    555                 RenderInline {BIG} at (0,0) size 155x24
    556                   RenderText {#text} at (516,231) size 155x24
    557                     text run at (516,231) width 155: "the images appear."
     553                RenderText {#text} at (510,233) size 6x21
     554                  text run at (510,233) width 6: " "
     555                RenderInline {BIG} at (0,0) size 156x24
     556                  RenderText {#text} at (515,231) size 156x24
     557                    text run at (515,231) width 156: "the images appear."
    558558                RenderText {#text} at (670,233) size 6x21
    559559                  text run at (670,233) width 6: " "
    … …  
    591591                  text run at (0,98) width 43: "which "
    592592                RenderImage {IMG} at (43,76) size 20x66
    593                 RenderText {#text} at (63,98) size 119x18
    594                   text run at (63,98) width 119: " should be aligned "
    595                 RenderImage {IMG} at (182,91) size 11x36
    596                 RenderText {#text} at (193,98) size 4x18
    597                   text run at (193,98) width 4: " "
     593                RenderText {#text} at (62,98) size 120x18
     594                  text run at (62,98) width 120: " should be aligned "
     595                RenderImage {IMG} at (181,91) size 11x36
     596                RenderText {#text} at (192,98) size 4x18
     597                  text run at (192,98) width 4: " "
    598598                RenderInline {SPAN} at (0,0) size 236x37
    599                   RenderText {#text} at (197,83) size 236x37
    600                     text run at (197,83) width 236: "with the middle of"
    601                 RenderText {#text} at (433,98) size 4x18
    602                   text run at (433,98) width 4: " "
    603                 RenderImage {IMG} at (437,83) size 15x51
    604                 RenderText {#text} at (452,98) size 4x18
    605                   text run at (452,98) width 4: " "
    606                 RenderInline {SPAN} at (0,0) size 720x105
    607                   RenderText {#text} at (456,91) size 17x27
    608                     text run at (456,91) width 17: "a "
     599                  RenderText {#text} at (196,83) size 236x37
     600                    text run at (196,83) width 236: "with the middle of"
     601                RenderText {#text} at (432,98) size 4x18
     602                  text run at (432,98) width 4: " "
     603                RenderImage {IMG} at (436,83) size 15x51
     604                RenderText {#text} at (451,98) size 4x18
     605                  text run at (451,98) width 4: " "
     606                RenderInline {SPAN} at (0,0) size 719x105
     607                  RenderText {#text} at (455,91) size 17x27
     608                    text run at (455,91) width 17: "a "
    609609                  RenderInline {SPAN} at (0,0) size 204x67
    610                     RenderText {#text} at (473,59) size 204x67
    611                       text run at (473,59) width 204: "14-point"
    612                   RenderText {#text} at (677,91) size 720x105
    613                     text run at (677,91) width 43: " text"
     610                    RenderText {#text} at (472,59) size 204x67
     611                      text run at (472,59) width 204: "14-point"
     612                  RenderText {#text} at (676,91) size 719x105
     613                    text run at (676,91) width 43: " text"
    614614                    text run at (0,169) width 78: "element"
    615615                RenderText {#text} at (77,176) size 5x18
    … …  
    693693                RenderText {#text} at (284,47) size 5x17
    694694                  text run at (284,47) width 5: " "
    695                 RenderImage {IMG} at (288,47) size 12x35
    696                 RenderText {#text} at (299,47) size 5x17
    697                   text run at (299,47) width 5: " "
     695                RenderImage {IMG} at (288,47) size 11x35
     696                RenderText {#text} at (298,47) size 5x17
     697                  text run at (298,47) width 5: " "
    698698                RenderInline {SPAN} at (0,0) size 189x36
    699                   RenderText {#text} at (303,47) size 189x36
    700                     text run at (303,47) width 189: "with the top of"
    701                 RenderText {#text} at (491,47) size 5x17
    702                   text run at (491,47) width 5: " "
    703                 RenderImage {IMG} at (495,47) size 16x50
    704                 RenderText {#text} at (510,47) size 5x17
    705                   text run at (510,47) width 5: " "
     699                  RenderText {#text} at (302,47) size 189x36
     700                    text run at (302,47) width 189: "with the top of"
     701                RenderText {#text} at (490,47) size 5x17
     702                  text run at (490,47) width 5: " "
     703                RenderImage {IMG} at (494,47) size 16x50
     704                RenderText {#text} at (509,47) size 5x17
     705                  text run at (509,47) width 5: " "
    706706                RenderInline {SPAN} at (0,0) size 129x17
    707                   RenderText {#text} at (514,47) size 129x17
    708                     text run at (514,47) width 129: "the tallest element in"
    709                 RenderText {#text} at (642,47) size 5x17
    710                   text run at (642,47) width 5: " "
    711                 RenderImage {IMG} at (646,47) size 6x15
    712                 RenderText {#text} at (651,47) size 5x17
    713                   text run at (651,47) width 5: " "
    714                 RenderInline {BIG} at (0,0) size 744x89
    715                   RenderText {#text} at (655,47) size 744x89
    716                     text run at (655,47) width 89: "whichever"
     707                  RenderText {#text} at (513,47) size 129x17
     708                    text run at (513,47) width 129: "the tallest element in"
     709                RenderText {#text} at (641,47) size 5x17
     710                  text run at (641,47) width 5: " "
     711                RenderImage {IMG} at (645,47) size 6x15
     712                RenderText {#text} at (650,47) size 5x17
     713                  text run at (650,47) width 5: " "
     714                RenderInline {BIG} at (0,0) size 743x89
     715                  RenderText {#text} at (654,47) size 743x89
     716                    text run at (654,47) width 89: "whichever"
    717717                    text run at (0,112) width 207: "line the elements appear."
    718718                RenderText {#text} at (206,112) size 5x17
  • trunk/LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.txt

    r221675 r295701  
    1212      RenderBlock {DIV} at (0,34) size 800x152
    1313        RenderBlock {DIV} at (0,0) size 402x152 [border: (1px solid #DDDDDD)]
    14           RenderImage {IMG} at (155,1) size 92x100
     14          RenderImage {IMG} at (154,1) size 94x100
  • trunk/LayoutTests/platform/gtk/fast/replaced/width100percent-image-expected.txt

    r282363 r295701  
    2929            RenderTableCell {TD} at (1,1) size 216x277 [r=0 c=0 rs=1 cs=1]
    3030              RenderImage {IMG} at (1,1) size 214x275
    31             RenderTableCell {TD} at (218,1) size 216x277 [r=0 c=1 rs=1 cs=1]
     31            RenderTableCell {TD} at (217,1) size 217x277 [r=0 c=1 rs=1 cs=1]
    3232              RenderImage {IMG} at (1,1) size 214x275
    33             RenderTableCell {TD} at (435,1) size 216x277 [r=0 c=2 rs=1 cs=1]
     33            RenderTableCell {TD} at (434,1) size 217x277 [r=0 c=2 rs=1 cs=1]
    3434              RenderImage {IMG} at (1,1) size 214x275
    35             RenderTableCell {TD} at (652,129) size 131x21 [r=0 c=3 rs=1 cs=1]
     35            RenderTableCell {TD} at (651,129) size 132x21 [r=0 c=3 rs=1 cs=1]
    3636              RenderText {#text} at (1,0) size 4x19
    3737                text run at (1,1) width 4: " "
  • trunk/LayoutTests/platform/gtk/tables/mozilla/bugs/bug14929-expected.txt

    r238733 r295701  
    2929            RenderTableRow {TR} at (0,2) size 638x22
    3030              RenderTableCell {TD} at (2,2) size 635x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
    31                 RenderImage {IMG} at (2,2) size 190x18
     31                RenderImage {IMG} at (2,2) size 190x19
    3232            RenderTableRow {TR} at (0,26) size 638x22
    3333              RenderTableCell {TD} at (2,26) size 127x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
  • trunk/LayoutTests/platform/ios/css1/text_properties/vertical_align-expected.txt

    r282306 r295701  
    176176          text run at (53,123) width 101: " all of which "
    177177        RenderImage {IMG} at (153,123) size 21x65
    178         RenderText {#text} at (173,123) size 6x22
    179           text run at (173,123) width 6: " "
     178        RenderText {#text} at (173,123) size 5x22
     179          text run at (173,123) width 5: " "
    180180        RenderInline {SPAN} at (0,0) size 262x42
    181           RenderText {#text} at (178,107) size 262x42
    182             text run at (178,107) width 262: "should be aligned"
    183         RenderText {#text} at (439,123) size 6x22
    184           text run at (439,123) width 6: " "
    185         RenderImage {IMG} at (444,123) size 12x35
    186         RenderText {#text} at (455,123) size 122x22
    187           text run at (455,123) width 122: " with the top of "
    188         RenderImage {IMG} at (576,123) size 10x30
    189         RenderText {#text} at (585,123) size 5x22
    190           text run at (585,123) width 5: " "
    191         RenderInline {SPAN} at (0,0) size 703x144
    192           RenderText {#text} at (589,115) size 21x32
    193             text run at (589,115) width 21: "a "
    194           RenderInline {SPAN} at (0,0) size 703x191
    195             RenderText {#text} at (609,77) size 703x191
    196               text run at (609,77) width 94: "14-"
     181          RenderText {#text} at (177,107) size 262x42
     182            text run at (177,107) width 262: "should be aligned"
     183        RenderText {#text} at (438,123) size 6x22
     184          text run at (438,123) width 6: " "
     185        RenderImage {IMG} at (443,123) size 12x35
     186        RenderText {#text} at (454,123) size 122x22
     187          text run at (454,123) width 122: " with the top of "
     188        RenderImage {IMG} at (575,123) size 10x30
     189        RenderText {#text} at (584,123) size 5x22
     190          text run at (584,123) width 5: " "
     191        RenderInline {SPAN} at (0,0) size 702x144
     192          RenderText {#text} at (588,115) size 21x32
     193            text run at (588,115) width 21: "a "
     194          RenderInline {SPAN} at (0,0) size 702x191
     195            RenderText {#text} at (608,77) size 702x191
     196              text run at (608,77) width 94: "14-"
    197197              text run at (0,189) width 144: "point"
    198198          RenderText {#text} at (143,227) size 146x32
    … …  
    208208        RenderText {#text} at (506,235) size 6x22
    209209          text run at (506,235) width 6: " "
    210         RenderImage {IMG} at (511,235) size 6x15
    211         RenderText {#text} at (516,235) size 5x22
    212           text run at (516,235) width 5: " "
    213         RenderInline {BIG} at (0,0) size 157x24
    214           RenderText {#text} at (520,233) size 157x24
    215             text run at (520,233) width 157: "the images appear."
    216         RenderText {#text} at (676,235) size 6x22
    217           text run at (676,235) width 6: " "
    218         RenderImage {IMG} at (681,235) size 28x90
     210        RenderImage {IMG} at (511,235) size 5x15
     211        RenderText {#text} at (515,235) size 6x22
     212          text run at (515,235) width 6: " "
     213        RenderInline {BIG} at (0,0) size 156x24
     214          RenderText {#text} at (520,233) size 156x24
     215            text run at (520,233) width 156: "the images appear."
     216        RenderText {#text} at (675,235) size 6x22
     217          text run at (675,235) width 6: " "
     218        RenderImage {IMG} at (680,235) size 28x90
    219219        RenderText {#text} at (0,0) size 0x0
    220220      RenderBlock {P} at (0,1797) size 784x41
    … …  
    248248          text run at (699,22) width 81: " all of which"
    249249        RenderImage {IMG} at (0,77) size 20x66
    250         RenderText {#text} at (20,98) size 121x20
    251           text run at (20,98) width 121: " should be aligned "
    252         RenderImage {IMG} at (140,92) size 12x36
    253         RenderText {#text} at (151,98) size 5x20
    254           text run at (151,98) width 5: " "
     250        RenderText {#text} at (19,98) size 122x20
     251          text run at (19,98) width 122: " should be aligned "
     252        RenderImage {IMG} at (140,92) size 11x36
     253        RenderText {#text} at (150,98) size 5x20
     254          text run at (150,98) width 5: " "
    255255        RenderInline {SPAN} at (0,0) size 237x37
    256           RenderText {#text} at (155,84) size 237x37
    257             text run at (155,84) width 237: "with the middle of"
    258         RenderText {#text} at (391,98) size 5x20
    259           text run at (391,98) width 5: " "
    260         RenderImage {IMG} at (395,84) size 16x51
    261         RenderText {#text} at (410,98) size 5x20
    262           text run at (410,98) width 5: " "
     256          RenderText {#text} at (154,84) size 237x37
     257            text run at (154,84) width 237: "with the middle of"
     258        RenderText {#text} at (390,98) size 5x20
     259          text run at (390,98) width 5: " "
     260        RenderImage {IMG} at (394,84) size 16x51
     261        RenderText {#text} at (409,98) size 5x20
     262          text run at (409,98) width 5: " "
    263263        RenderInline {SPAN} at (0,0) size 345x29
    264           RenderText {#text} at (414,91) size 18x29
    265             text run at (414,91) width 18: "a "
     264          RenderText {#text} at (413,91) size 18x29
     265            text run at (413,91) width 18: "a "
    266266          RenderInline {SPAN} at (0,0) size 204x68
    267             RenderText {#text} at (431,59) size 204x68
    268               text run at (431,59) width 204: "14-point"
    269           RenderText {#text} at (634,91) size 125x29
    270             text run at (634,91) width 125: " text element"
    271         RenderText {#text} at (758,98) size 5x20
    272           text run at (758,98) width 5: " "
    273         RenderImage {IMG} at (762,84) size 16x51
     267            RenderText {#text} at (430,59) size 204x68
     268              text run at (430,59) width 204: "14-point"
     269          RenderText {#text} at (633,91) size 125x29
     270            text run at (633,91) width 125: " text element"
     271        RenderText {#text} at (757,98) size 5x20
     272          text run at (757,98) width 5: " "
     273        RenderImage {IMG} at (761,84) size 16x51
    274274        RenderText {#text} at (0,0) size 0x0
    275275        RenderInline {SMALL} at (0,0) size 194x20
    … …  
    278278        RenderText {#text} at (193,176) size 5x20
    279279          text run at (193,176) width 5: " "
    280         RenderImage {IMG} at (197,180) size 6x16
    281         RenderText {#text} at (202,176) size 5x20
    282           text run at (202,176) width 5: " "
    283         RenderInline {BIG} at (0,0) size 156x25
    284           RenderText {#text} at (206,172) size 156x25
    285             text run at (206,172) width 156: "the images appear."
     280        RenderImage {IMG} at (197,180) size 5x16
     281        RenderText {#text} at (201,176) size 5x20
     282          text run at (201,176) width 5: " "
     283        RenderInline {BIG} at (0,0) size 157x25
     284          RenderText {#text} at (205,172) size 157x25
     285            text run at (205,172) width 157: "the images appear."
    286286        RenderText {#text} at (361,176) size 5x20
    287287          text run at (361,176) width 5: " "
    … …  
    340340        RenderText {#text} at (146,47) size 5x19
    341341          text run at (146,47) width 5: " "
    342         RenderImage {IMG} at (150,47) size 21x65
    343         RenderText {#text} at (170,47) size 5x19
    344           text run at (170,47) width 5: " "
     342        RenderImage {IMG} at (150,47) size 20x65
     343        RenderText {#text} at (169,47) size 5x19
     344          text run at (169,47) width 5: " "
    345345        RenderInline {SPAN} at (0,0) size 114x19
    346           RenderText {#text} at (174,47) size 114x19
    347             text run at (174,47) width 114: "should be aligned"
    348         RenderText {#text} at (287,47) size 5x19
    349           text run at (287,47) width 5: " "
    350         RenderImage {IMG} at (291,47) size 12x35
    351         RenderText {#text} at (302,47) size 5x19
    352           text run at (302,47) width 5: " "
     346          RenderText {#text} at (173,47) size 114x19
     347            text run at (173,47) width 114: "should be aligned"
     348        RenderText {#text} at (286,47) size 5x19
     349          text run at (286,47) width 5: " "
     350        RenderImage {IMG} at (290,47) size 12x35
     351        RenderText {#text} at (301,47) size 5x19
     352          text run at (301,47) width 5: " "
    353353        RenderInline {SPAN} at (0,0) size 188x36
    354           RenderText {#text} at (306,48) size 188x36
    355             text run at (306,48) width 188: "with the top of"
    356         RenderText {#text} at (493,47) size 5x19
    357           text run at (493,47) width 5: " "
    358         RenderImage {IMG} at (497,47) size 16x50
    359         RenderText {#text} at (512,47) size 5x19
    360           text run at (512,47) width 5: " "
     354          RenderText {#text} at (305,48) size 188x36
     355            text run at (305,48) width 188: "with the top of"
     356        RenderText {#text} at (492,47) size 5x19
     357          text run at (492,47) width 5: " "
     358        RenderImage {IMG} at (496,47) size 16x50
     359        RenderText {#text} at (511,47) size 5x19
     360          text run at (511,47) width 5: " "
    361361        RenderInline {SPAN} at (0,0) size 134x19
    362           RenderText {#text} at (516,47) size 134x19
    363             text run at (516,47) width 134: "the tallest element in"
    364         RenderText {#text} at (649,47) size 5x19
    365           text run at (649,47) width 5: " "
    366         RenderImage {IMG} at (653,47) size 6x15
    367         RenderText {#text} at (658,47) size 5x19
    368           text run at (658,47) width 5: " "
    369         RenderInline {BIG} at (0,0) size 751x89
    370           RenderText {#text} at (662,47) size 751x89
    371             text run at (662,47) width 89: "whichever"
     362          RenderText {#text} at (515,47) size 134x19
     363            text run at (515,47) width 134: "the tallest element in"
     364        RenderText {#text} at (648,47) size 5x19
     365          text run at (648,47) width 5: " "
     366        RenderImage {IMG} at (652,47) size 6x15
     367        RenderText {#text} at (657,47) size 5x19
     368          text run at (657,47) width 5: " "
     369        RenderInline {BIG} at (0,0) size 749x89
     370          RenderText {#text} at (661,47) size 749x89
     371            text run at (661,47) width 88: "whichever"
    372372            text run at (0,112) width 208: "line the elements appear."
    373373        RenderText {#text} at (207,112) size 5x19
    … …  
    522522                  RenderText {#text} at (205,107) size 262x42
    523523                    text run at (205,107) width 262: "should be aligned"
    524                 RenderText {#text} at (466,123) size 6x22
    525                   text run at (466,123) width 6: " "
    526                 RenderImage {IMG} at (471,123) size 12x35
    527                 RenderText {#text} at (482,123) size 122x22
    528                   text run at (482,123) width 122: " with the top of "
    529                 RenderImage {IMG} at (603,123) size 10x30
    530                 RenderText {#text} at (612,123) size 5x22
    531                   text run at (612,123) width 5: " "
    532                 RenderInline {SPAN} at (0,0) size 730x144
    533                   RenderText {#text} at (616,115) size 21x32
    534                     text run at (616,115) width 21: "a "
    535                   RenderInline {SPAN} at (0,0) size 730x191
    536                     RenderText {#text} at (636,77) size 730x191
    537                       text run at (636,77) width 94: "14-"
     524                RenderText {#text} at (466,123) size 5x22
     525                  text run at (466,123) width 5: " "
     526                RenderImage {IMG} at (470,123) size 12x35
     527                RenderText {#text} at (481,123) size 122x22
     528                  text run at (481,123) width 122: " with the top of "
     529                RenderImage {IMG} at (602,123) size 10x30
     530                RenderText {#text} at (611,123) size 5x22
     531                  text run at (611,123) width 5: " "
     532                RenderInline {SPAN} at (0,0) size 729x144
     533                  RenderText {#text} at (615,115) size 21x32
     534                    text run at (615,115) width 21: "a "
     535                  RenderInline {SPAN} at (0,0) size 729x191
     536                    RenderText {#text} at (635,77) size 729x191
     537                      text run at (635,77) width 94: "14-"
    538538                      text run at (0,189) width 144: "point"
    539539                  RenderText {#text} at (143,227) size 146x32
    … …  
    549549                RenderText {#text} at (506,235) size 6x22
    550550                  text run at (506,235) width 6: " "
    551                 RenderImage {IMG} at (511,235) size 6x15
    552                 RenderText {#text} at (516,235) size 5x22
    553                   text run at (516,235) width 5: " "
    554                 RenderInline {BIG} at (0,0) size 157x24
    555                   RenderText {#text} at (520,233) size 157x24
    556                     text run at (520,233) width 157: "the images appear."
    557                 RenderText {#text} at (676,235) size 6x22
    558                   text run at (676,235) width 6: " "
    559                 RenderImage {IMG} at (681,235) size 28x90
     551                RenderImage {IMG} at (511,235) size 5x15
     552                RenderText {#text} at (515,235) size 6x22
     553                  text run at (515,235) width 6: " "
     554                RenderInline {BIG} at (0,0) size 156x24
     555                  RenderText {#text} at (520,233) size 156x24
     556                    text run at (520,233) width 156: "the images appear."
     557                RenderText {#text} at (675,235) size 6x22
     558                  text run at (675,235) width 6: " "
     559                RenderImage {IMG} at (680,235) size 28x90
    560560                RenderText {#text} at (0,0) size 0x0
    561561              RenderBlock {P} at (4,1482) size 762x41
    … …  
    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 21x66
    592                 RenderText {#text} at (63,98) size 121x20
    593                   text run at (63,98) width 121: " should be aligned "
    594                 RenderImage {IMG} at (183,92) size 12x36
    595                 RenderText {#text} at (194,98) size 5x20
    596                   text run at (194,98) width 5: " "
     591                RenderImage {IMG} at (43,77) size 20x66
     592                RenderText {#text} at (62,98) size 122x20
     593                  text run at (62,98) width 122: " should be aligned "
     594                RenderImage {IMG} at (183,92) size 11x36
     595                RenderText {#text} at (193,98) size 5x20
     596                  text run at (193,98) width 5: " "
    597597                RenderInline {SPAN} at (0,0) size 237x37
    598                   RenderText {#text} at (198,84) size 237x37
    599                     text run at (198,84) width 237: "with the middle of"
    600                 RenderText {#text} at (434,98) size 5x20
    601                   text run at (434,98) width 5: " "
    602                 RenderImage {IMG} at (438,84) size 16x51
    603                 RenderText {#text} at (453,98) size 5x20
    604                   text run at (453,98) width 5: " "
    605                 RenderInline {SPAN} at (0,0) size 720x107
    606                   RenderText {#text} at (457,91) size 18x29
    607                     text run at (457,91) width 18: "a "
     598                  RenderText {#text} at (197,84) size 237x37
     599                    text run at (197,84) width 237: "with the middle of"
     600                RenderText {#text} at (433,98) size 5x20
     601                  text run at (433,98) width 5: " "
     602                RenderImage {IMG} at (437,84) size 16x51
     603                RenderText {#text} at (452,98) size 5x20
     604                  text run at (452,98) width 5: " "
     605                RenderInline {SPAN} at (0,0) size 719x107
     606                  RenderText {#text} at (456,91) size 18x29
     607                    text run at (456,91) width 18: "a "
    608608                  RenderInline {SPAN} at (0,0) size 204x68
    609                     RenderText {#text} at (474,59) size 204x68
    610                       text run at (474,59) width 204: "14-point"
    611                   RenderText {#text} at (677,91) size 720x107
    612                     text run at (677,91) width 43: " text"
     609                    RenderText {#text} at (473,59) size 204x68
     610                      text run at (473,59) width 204: "14-point"
     611                  RenderText {#text} at (676,91) size 719x107
     612                    text run at (676,91) width 43: " text"
    613613                    text run at (0,169) width 76: "element"
    614614                RenderText {#text} at (75,176) size 5x20
    … …  
    622622                RenderText {#text} at (292,176) size 5x20
    623623                  text run at (292,176) width 5: " "
    624                 RenderImage {IMG} at (296,180) size 6x16
    625                 RenderText {#text} at (301,176) size 5x20
    626                   text run at (301,176) width 5: " "
    627                 RenderInline {BIG} at (0,0) size 156x25
    628                   RenderText {#text} at (305,172) size 156x25
    629                     text run at (305,172) width 156: "the images appear."
     624                RenderImage {IMG} at (296,180) size 5x16
     625                RenderText {#text} at (300,176) size 5x20
     626                  text run at (300,176) width 5: " "
     627                RenderInline {BIG} at (0,0) size 157x25
     628                  RenderText {#text} at (304,172) size 157x25
     629                    text run at (304,172) width 157: "the images appear."
    630630                RenderText {#text} at (460,176) size 5x20
    631631                  text run at (460,176) width 5: " "
    … …  
    684684                RenderText {#text} at (146,47) size 5x19
    685685                  text run at (146,47) width 5: " "
    686                 RenderImage {IMG} at (150,47) size 21x65
    687                 RenderText {#text} at (170,47) size 5x19
    688                   text run at (170,47) width 5: " "
     686                RenderImage {IMG} at (150,47) size 20x65
     687                RenderText {#text} at (169,47) size 5x19
     688                  text run at (169,47) width 5: " "
    689689                RenderInline {SPAN} at (0,0) size 114x19
    690                   RenderText {#text} at (174,47) size 114x19
    691                     text run at (174,47) width 114: "should be aligned"
    692                 RenderText {#text} at (287,47) size 5x19
    693                   text run at (287,47) width 5: " "
    694                 RenderImage {IMG} at (291,47) size 12x35
    695                 RenderText {#text} at (302,47) size 5x19
    696                   text run at (302,47) width 5: " "
     690                  RenderText {#text} at (173,47) size 114x19
     691                    text run at (173,47) width 114: "should be aligned"
     692                RenderText {#text} at (286,47) size 5x19
     693                  text run at (286,47) width 5: " "
     694                RenderImage {IMG} at (290,47) size 12x35
     695                RenderText {#text} at (301,47) size 5x19
     696                  text run at (301,47) width 5: " "
    697697                RenderInline {SPAN} at (0,0) size 188x36
    698                   RenderText {#text} at (306,48) size 188x36
    699                     text run at (306,48) width 188: "with the top of"
    700                 RenderText {#text} at (493,47) size 5x19
    701                   text run at (493,47) width 5: " "
    702                 RenderImage {IMG} at (497,47) size 16x50
    703                 RenderText {#text} at (512,47) size 5x19
    704                   text run at (512,47) width 5: " "
     698                  RenderText {#text} at (305,48) size 188x36
     699                    text run at (305,48) width 188: "with the top of"
     700                RenderText {#text} at (492,47) size 5x19
     701                  text run at (492,47) width 5: " "
     702                RenderImage {IMG} at (496,47) size 16x50
     703                RenderText {#text} at (511,47) size 5x19
     704                  text run at (511,47) width 5: " "
    705705                RenderInline {SPAN} at (0,0) size 134x19
    706                   RenderText {#text} at (516,47) size 134x19
    707                     text run at (516,47) width 134: "the tallest element in"
    708                 RenderText {#text} at (649,47) size 5x19
    709                   text run at (649,47) width 5: " "
    710                 RenderImage {IMG} at (653,47) size 6x15
    711                 RenderText {#text} at (658,47) size 5x19
    712                   text run at (658,47) width 5: " "
    713                 RenderInline {BIG} at (0,0) size 751x89
    714                   RenderText {#text} at (662,47) size 751x89
    715                     text run at (662,47) width 89: "whichever"
     706                  RenderText {#text} at (515,47) size 134x19
     707                    text run at (515,47) width 134: "the tallest element in"
     708                RenderText {#text} at (648,47) size 5x19
     709                  text run at (648,47) width 5: " "
     710                RenderImage {IMG} at (652,47) size 6x15
     711                RenderText {#text} at (657,47) size 5x19
     712                  text run at (657,47) width 5: " "
     713                RenderInline {BIG} at (0,0) size 749x89
     714                  RenderText {#text} at (661,47) size 749x89
     715                    text run at (661,47) width 88: "whichever"
    716716                    text run at (0,112) width 208: "line the elements appear."
    717717                RenderText {#text} at (207,112) size 5x19
  • trunk/LayoutTests/platform/ios/fast/replaced/width100percent-image-expected.txt

    r282306 r295701  
    2929            RenderTableCell {TD} at (1,1) size 216x277 [r=0 c=0 rs=1 cs=1]
    3030              RenderImage {IMG} at (1,1) size 214x275
    31             RenderTableCell {TD} at (218,1) size 216x277 [r=0 c=1 rs=1 cs=1]
     31            RenderTableCell {TD} at (217,1) size 217x277 [r=0 c=1 rs=1 cs=1]
    3232              RenderImage {IMG} at (1,1) size 214x275
    33             RenderTableCell {TD} at (435,1) size 216x277 [r=0 c=2 rs=1 cs=1]
     33            RenderTableCell {TD} at (434,1) size 217x277 [r=0 c=2 rs=1 cs=1]
    3434              RenderImage {IMG} at (1,1) size 214x275
    35             RenderTableCell {TD} at (652,128) size 131x23 [r=0 c=3 rs=1 cs=1]
     35            RenderTableCell {TD} at (651,128) size 132x23 [r=0 c=3 rs=1 cs=1]
    3636              RenderText {#text} at (1,0) size 4x21
    3737                text run at (1,1) width 4: " "
  • trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug14929-expected.txt

    r195740 r295701  
    2929            RenderTableRow {TR} at (0,2) size 638x22
    3030              RenderTableCell {TD} at (2,2) size 635x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
    31                 RenderImage {IMG} at (2,2) size 190x18
     31                RenderImage {IMG} at (2,2) size 190x19
    3232            RenderTableRow {TR} at (0,26) size 638x24
    3333              RenderTableCell {TD} at (2,26) size 127x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
  • trunk/LayoutTests/platform/ios/tables/mozilla_expected_failures/bugs/bug85016-expected.txt

    r235192 r295701  
    1313      RenderBlock {DIV} at (32,752) size 672x672 [border: (3px dotted #008000)]
    1414        RenderBlock {DIV} at (35,35) size 602x602 [border: (1px solid #FF0000)]
    15           RenderImage {IMG} at (1,1) size 882x600
     15          RenderImage {IMG} at (1,1) size 883x600
    1616          RenderText {#text} at (0,0) size 0x0
    1717      RenderBlock {P} at (0,1456) size 736x20
  • trunk/LayoutTests/platform/mac/css1/box_properties/width-expected.txt

    r282306 r295701  
    6060                  text run at (0,0) width 291: "The square above should be fifty pixels wide."
    6161              RenderBlock (anonymous) at (4,104) size 363x181
    62                 RenderImage {IMG} at (0,0) size 182x181
     62                RenderImage {IMG} at (0,0) size 182x182
    6363                RenderText {#text} at (0,0) size 0x0
    6464              RenderBlock {P} at (4,301) size 363x36
  • trunk/LayoutTests/platform/mac/css1/formatting_model/replaced_elements-expected.txt

    r282306 r295701  
    1 layer at (0,0) size 785x2341
     1layer at (0,0) size 785x2339
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x2341
    4   RenderBlock {HTML} at (0,0) size 785x2341
    5     RenderBody {BODY} at (8,8) size 769x2325 [bgcolor=#CCCCCC]
     3layer at (0,0) size 785x2339
     4  RenderBlock {HTML} at (0,0) size 785x2339
     5    RenderBody {BODY} at (8,8) size 769x2323 [bgcolor=#CCCCCC]
    66      RenderBlock {P} at (0,0) size 769x18
    77        RenderText {#text} at (0,0) size 363x18
    … …  
    3939          text run at (0,0) width 406: "The above image should be a 15px square aligned at the center."
    4040      RenderImage {IMG} at (192,350) size 385x385
    41       RenderBlock {P} at (0,751) size 769x36
     41      RenderBlock {P} at (0,750) size 769x37
    4242        RenderText {#text} at (0,0) size 738x36
    4343          text run at (0,0) width 738: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally"
    4444          text run at (0,18) width 172: "within the parent element: "
    4545          text run at (171,18) width 404: "the document body in the first half, and the table in the second."
    46       RenderImage {IMG} at (384,803) size 385x385
    47       RenderBlock {P} at (0,1204) size 769x36
     46      RenderImage {IMG} at (384,802) size 385x385
     47      RenderBlock {P} at (0,1203) size 769x36
    4848        RenderText {#text} at (0,0) size 750x36
    4949          text run at (0,0) width 750: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of"
    5050          text run at (0,18) width 127: "the parent element: "
    5151          text run at (126,18) width 404: "the document body in the first half, and the table in the second."
    52       RenderTable {TABLE} at (0,1256) size 769x1069 [border: (1px outset #808080)]
    53         RenderTableSection {TBODY} at (1,1) size 767x1067
     52      RenderTable {TABLE} at (0,1255) size 769x1068 [border: (1px outset #808080)]
     53        RenderTableSection {TBODY} at (1,1) size 767x1066
    5454          RenderTableRow {TR} at (0,0) size 767x26
    5555            RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
    … …  
    5757                RenderText {#text} at (4,4) size 161x18
    5858                  text run at (4,4) width 161: "TABLE Testing Section"
    59           RenderTableRow {TR} at (0,26) size 767x1041
    60             RenderTableCell {TD} at (0,533) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
    61               RenderText {#text} at (4,3) size 4x20
     59          RenderTableRow {TR} at (0,26) size 767x1040
     60            RenderTableCell {TD} at (0,533) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
     61              RenderText {#text} at (4,4) size 4x18
    6262                text run at (4,4) width 4: " "
    63             RenderTableCell {TD} at (12,26) size 755x1041 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
     63            RenderTableCell {TD} at (12,26) size 755x1040 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
    6464              RenderBlock {P} at (4,4) size 747x19
    6565                RenderImage {IMG} at (0,0) size 15x15
    … …  
    7575                  text run at (0,0) width 406: "The above image should be a 15px square aligned at the center."
    7676              RenderImage {IMG} at (190,169) size 375x374
    77               RenderBlock {P} at (4,559) size 747x36
     77              RenderBlock {P} at (4,558) size 747x37
    7878                RenderText {#text} at (0,0) size 738x36
    7979                  text run at (0,0) width 738: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally"
    8080                  text run at (0,18) width 172: "within the parent element: "
    8181                  text run at (171,18) width 404: "the document body in the first half, and the table in the second."
    82               RenderImage {IMG} at (377,611) size 374x374
    83               RenderBlock {P} at (4,1001) size 747x36
     82              RenderImage {IMG} at (377,610) size 374x374
     83              RenderBlock {P} at (4,1000) size 747x36
    8484                RenderText {#text} at (0,0) size 733x36
    8585                  text run at (0,0) width 733: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge"
  • trunk/LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.txt

    r282306 r295701  
    176176          text run at (53,122) width 101: " all of which "
    177177        RenderImage {IMG} at (153,122) size 21x65
    178         RenderText {#text} at (173,122) size 6x22
    179           text run at (173,122) width 6: " "
     178        RenderText {#text} at (173,122) size 5x22
     179          text run at (173,122) width 5: " "
    180180        RenderInline {SPAN} at (0,0) size 262x43
    181           RenderText {#text} at (178,105) size 262x43
    182             text run at (178,105) width 262: "should be aligned"
    183         RenderText {#text} at (439,122) size 6x22
    184           text run at (439,122) width 6: " "
    185         RenderImage {IMG} at (444,122) size 12x35
    186         RenderText {#text} at (455,122) size 122x22
    187           text run at (455,122) width 122: " with the top of "
    188         RenderImage {IMG} at (576,122) size 10x30
    189         RenderText {#text} at (585,122) size 5x22
    190           text run at (585,122) width 5: " "
    191         RenderInline {SPAN} at (0,0) size 703x144
    192           RenderText {#text} at (589,114) size 21x32
    193             text run at (589,114) width 21: "a "
    194           RenderInline {SPAN} at (0,0) size 703x194
    195             RenderText {#text} at (609,75) size 703x194
    196               text run at (609,75) width 94: "14-"
     181          RenderText {#text} at (177,105) size 262x43
     182            text run at (177,105) width 262: "should be aligned"
     183        RenderText {#text} at (438,122) size 6x22
     184          text run at (438,122) width 6: " "
     185        RenderImage {IMG} at (443,122) size 12x35
     186        RenderText {#text} at (454,122) size 122x22
     187          text run at (454,122) width 122: " with the top of "
     188        RenderImage {IMG} at (575,122) size 10x30
     189        RenderText {#text} at (584,122) size 5x22
     190          text run at (584,122) width 5: " "
     191        RenderInline {SPAN} at (0,0) size 702x144
     192          RenderText {#text} at (588,114) size 21x32
     193            text run at (588,114) width 21: "a "
     194          RenderInline {SPAN} at (0,0) size 702x194
     195            RenderText {#text} at (608,75) size 702x194
     196              text run at (608,75) width 94: "14-"
    197197              text run at (0,187) width 144: "point"
    198198          RenderText {#text} at (143,226) size 146x32
    … …  
    208208        RenderText {#text} at (506,234) size 6x22
    209209          text run at (506,234) width 6: " "
    210         RenderImage {IMG} at (511,234) size 6x15
    211         RenderText {#text} at (516,234) size 5x22
    212           text run at (516,234) width 5: " "
    213         RenderInline {BIG} at (0,0) size 157x24
    214           RenderText {#text} at (520,232) size 157x24
    215             text run at (520,232) width 157: "the images appear."
    216         RenderText {#text} at (676,234) size 6x22
    217           text run at (676,234) width 6: " "
    218         RenderImage {IMG} at (681,234) size 28x90
     210        RenderImage {IMG} at (511,234) size 5x15
     211        RenderText {#text} at (515,234) size 6x22
     212          text run at (515,234) width 6: " "
     213        RenderInline {BIG} at (0,0) size 156x24
     214          RenderText {#text} at (520,232) size 156x24
     215            text run at (520,232) width 156: "the images appear."
     216        RenderText {#text} at (675,234) size 6x22
     217          text run at (675,234) width 6: " "
     218        RenderImage {IMG} at (680,234) size 28x90
    219219        RenderText {#text} at (0,0) size 0x0
    220220      RenderBlock {P} at (0,1785) size 769x37
    … …  
    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 21x66
    251         RenderText {#text} at (63,97) size 121x19
    252           text run at (63,97) width 121: " should be aligned "
    253         RenderImage {IMG} at (183,90) size 12x36
    254         RenderText {#text} at (194,97) size 5x19
    255           text run at (194,97) width 5: " "
     250        RenderImage {IMG} at (43,75) size 20x66
     251        RenderText {#text} at (62,97) size 122x19
     252          text run at (62,97) width 122: " should be aligned "
     253        RenderImage {IMG} at (183,90) size 11x36
     254        RenderText {#text} at (193,97) size 5x19
     255          text run at (193,97) width 5: " "
    256256        RenderInline {SPAN} at (0,0) size 237x38
    257           RenderText {#text} at (198,82) size 237x38
    258             text run at (198,82) width 237: "with the middle of"
    259         RenderText {#text} at (434,97) size 5x19
    260           text run at (434,97) width 5: " "
    261         RenderImage {IMG} at (438,82) size 16x51
    262         RenderText {#text} at (453,97) size 5x19
    263           text run at (453,97) width 5: " "
    264         RenderInline {SPAN} at (0,0) size 720x107
    265           RenderText {#text} at (457,89) size 18x29
    266             text run at (457,89) width 18: "a "
     257          RenderText {#text} at (197,82) size 237x38
     258            text run at (197,82) width 237: "with the middle of"
     259        RenderText {#text} at (433,97) size 5x19
     260          text run at (433,97) width 5: " "
     261        RenderImage {IMG} at (437,82) size 16x51
     262        RenderText {#text} at (452,97) size 5x19
     263          text run at (452,97) width 5: " "
     264        RenderInline {SPAN} at (0,0) size 719x107
     265          RenderText {#text} at (456,89) size 18x29
     266            text run at (456,89) width 18: "a "
    267267          RenderInline {SPAN} at (0,0) size 204x70
    268             RenderText {#text} at (474,57) size 204x70
    269               text run at (474,57) width 204: "14-point"
    270           RenderText {#text} at (677,89) size 720x107
    271             text run at (677,89) width 43: " text"
     268            RenderText {#text} at (473,57) size 204x70
     269              text run at (473,57) width 204: "14-point"
     270          RenderText {#text} at (676,89) size 719x107
     271            text run at (676,89) width 43: " text"
    272272            text run at (0,167) width 76: "element"
    273273        RenderText {#text} at (75,175) size 5x19
    … …  
    281281        RenderText {#text} at (292,175) size 5x19
    282282          text run at (292,175) width 5: " "
    283         RenderImage {IMG} at (296,178) size 6x16
    284         RenderText {#text} at (301,175) size 5x19
    285           text run at (301,175) width 5: " "
    286         RenderInline {BIG} at (0,0) size 156x25
    287           RenderText {#text} at (305,170) size 156x25
    288             text run at (305,170) width 156: "the images appear."
     283        RenderImage {IMG} at (296,178) size 5x16
     284        RenderText {#text} at (300,175) size 5x19
     285          text run at (300,175) width 5: " "
     286        RenderInline {BIG} at (0,0) size 157x25
     287          RenderText {#text} at (304,170) size 157x25
     288            text run at (304,170) width 157: "the images appear."
    289289        RenderText {#text} at (460,175) size 5x19
    290290          text run at (460,175) width 5: " "
    … …  
    343343        RenderText {#text} at (146,46) size 5x18
    344344          text run at (146,46) width 5: " "
    345         RenderImage {IMG} at (150,46) size 21x65
    346         RenderText {#text} at (170,46) size 5x18
    347           text run at (170,46) width 5: " "
     345        RenderImage {IMG} at (150,46) size 20x65
     346        RenderText {#text} at (169,46) size 5x18
     347          text run at (169,46) width 5: " "
    348348        RenderInline {SPAN} at (0,0) size 114x18
    349           RenderText {#text} at (174,46) size 114x18
    350             text run at (174,46) width 114: "should be aligned"
    351         RenderText {#text} at (287,46) size 5x18
    352           text run at (287,46) width 5: " "
    353         RenderImage {IMG} at (291,46) size 12x35
    354         RenderText {#text} at (302,46) size 5x18
    355           text run at (302,46) width 5: " "
     349          RenderText {#text} at (173,46) size 114x18
     350            text run at (173,46) width 114: "should be aligned"
     351        RenderText {#text} at (286,46) size 5x18
     352          text run at (286,46) width 5: " "
     353        RenderImage {IMG} at (290,46) size 12x35
     354        RenderText {#text} at (301,46) size 5x18
     355          text run at (301,46) width 5: " "
    356356        RenderInline {SPAN} at (0,0) size 188x37
    357           RenderText {#text} at (306,46) size 188x37
    358             text run at (306,46) width 188: "with the top of"
    359         RenderText {#text} at (493,46) size 5x18
    360           text run at (493,46) width 5: " "
    361         RenderImage {IMG} at (497,46) size 16x50
    362         RenderText {#text} at (512,46) size 5x18
    363           text run at (512,46) width 5: " "
     357          RenderText {#text} at (305,46) size 188x37
     358            text run at (305,46) width 188: "with the top of"
     359        RenderText {#text} at (492,46) size 5x18
     360          text run at (492,46) width 5: " "
     361        RenderImage {IMG} at (496,46) size 16x50
     362        RenderText {#text} at (511,46) size 5x18
     363          text run at (511,46) width 5: " "
    364364        RenderInline {SPAN} at (0,0) size 134x18
    365           RenderText {#text} at (516,46) size 134x18
    366             text run at (516,46) width 134: "the tallest element in"
    367         RenderText {#text} at (649,46) size 5x18
    368           text run at (649,46) width 5: " "
    369         RenderImage {IMG} at (653,46) size 6x15
    370         RenderText {#text} at (658,46) size 5x18
    371           text run at (658,46) width 5: " "
    372         RenderInline {BIG} at (0,0) size 751x89
    373           RenderText {#text} at (662,46) size 751x89
    374             text run at (662,46) width 89: "whichever"
     365          RenderText {#text} at (515,46) size 134x18
     366            text run at (515,46) width 134: "the tallest element in"
     367        RenderText {#text} at (648,46) size 5x18
     368          text run at (648,46) width 5: " "
     369        RenderImage {IMG} at (652,46) size 6x15
     370        RenderText {#text} at (657,46) size 5x18
     371          text run at (657,46) width 5: " "
     372        RenderInline {BIG} at (0,0) size 749x89
     373          RenderText {#text} at (661,46) size 749x89
     374            text run at (661,46) width 88: "whichever"
    375375            text run at (0,111) width 208: "line the elements appear."
    376376        RenderText {#text} at (207,111) size 5x18
    … …  
    525525                  RenderText {#text} at (205,105) size 262x43
    526526                    text run at (205,105) width 262: "should be aligned"
    527                 RenderText {#text} at (466,122) size 6x22
    528                   text run at (466,122) width 6: " "
    529                 RenderImage {IMG} at (471,122) size 12x35
    530                 RenderText {#text} at (482,122) size 122x22
    531                   text run at (482,122) width 122: " with the top of "
    532                 RenderImage {IMG} at (603,122) size 10x30
    533                 RenderText {#text} at (612,122) size 5x22
    534                   text run at (612,122) width 5: " "
    535                 RenderInline {SPAN} at (0,0) size 730x144
    536                   RenderText {#text} at (616,114) size 21x32
    537                     text run at (616,114) width 21: "a "
    538                   RenderInline {SPAN} at (0,0) size 730x194
    539                     RenderText {#text} at (636,75) size 730x194
    540                       text run at (636,75) width 94: "14-"
     527                RenderText {#text} at (466,122) size 5x22
     528                  text run at (466,122) width 5: " "
     529                RenderImage {IMG} at (470,122) size 12x35
     530                RenderText {#text} at (481,122) size 122x22
     531                  text run at (481,122) width 122: " with the top of "
     532                RenderImage {IMG} at (602,122) size 10x30
     533                RenderText {#text} at (611,122) size 5x22
     534                  text run at (611,122) width 5: " "
     535                RenderInline {SPAN} at (0,0) size 729x144
     536                  RenderText {#text} at (615,114) size 21x32
     537                    text run at (615,114) width 21: "a "
     538                  RenderInline {SPAN} at (0,0) size 729x194
     539                    RenderText {#text} at (635,75) size 729x194
     540                      text run at (635,75) width 94: "14-"
    541541                      text run at (0,187) width 144: "point"
    542542                  RenderText {#text} at (143,226) size 146x32
    … …  
    552552                RenderText {#text} at (506,234) size 6x22
    553553                  text run at (506,234) width 6: " "
    554                 RenderImage {IMG} at (511,234) size 6x15
    555                 RenderText {#text} at (516,234) size 5x22
    556                   text run at (516,234) width 5: " "
    557                 RenderInline {BIG} at (0,0) size 157x24
    558                   RenderText {#text} at (520,232) size 157x24
    559                     text run at (520,232) width 157: "the images appear."
    560                 RenderText {#text} at (676,234) size 6x22
    561                   text run at (676,234) width 6: " "
    562                 RenderImage {IMG} at (681,234) size 28x90
     554                RenderImage {IMG} at (511,234) size 5x15
     555                RenderText {#text} at (515,234) size 6x22
     556                  text run at (515,234) width 6: " "
     557                RenderInline {BIG} at (0,0) size 156x24
     558                  RenderText {#text} at (520,232) size 156x24
     559                    text run at (520,232) width 156: "the images appear."
     560                RenderText {#text} at (675,234) size 6x22
     561                  text run at (675,234) width 6: " "
     562                RenderImage {IMG} at (680,234) size 28x90
    563563                RenderText {#text} at (0,0) size 0x0
    564564              RenderBlock {P} at (4,1454) size 747x37
    … …  
    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 21x66
    595                 RenderText {#text} at (63,97) size 121x19
    596                   text run at (63,97) width 121: " should be aligned "
    597                 RenderImage {IMG} at (183,90) size 12x36
    598                 RenderText {#text} at (194,97) size 5x19
    599                   text run at (194,97) width 5: " "
     594                RenderImage {IMG} at (43,75) size 20x66
     595                RenderText {#text} at (62,97) size 122x19
     596                  text run at (62,97) width 122: " should be aligned "
     597                RenderImage {IMG} at (183,90) size 11x36
     598                RenderText {#text} at (193,97) size 5x19
     599                  text run at (193,97) width 5: " "
    600600                RenderInline {SPAN} at (0,0) size 237x38
    601                   RenderText {#text} at (198,82) size 237x38
    602                     text run at (198,82) width 237: "with the middle of"
    603                 RenderText {#text} at (434,97) size 5x19
    604                   text run at (434,97) width 5: " "
    605                 RenderImage {IMG} at (438,82) size 16x51
    606                 RenderText {#text} at (453,97) size 5x19
    607                   text run at (453,97) width 5: " "
    608                 RenderInline {SPAN} at (0,0) size 720x107
    609                   RenderText {#text} at (457,89) size 18x29
    610                     text run at (457,89) width 18: "a "
     601                  RenderText {#text} at (197,82) size 237x38
     602                    text run at (197,82) width 237: "with the middle of"
     603                RenderText {#text} at (433,97) size 5x19
     604                  text run at (433,97) width 5: " "
     605                RenderImage {IMG} at (437,82) size 16x51
     606                RenderText {#text} at (452,97) size 5x19
     607                  text run at (452,97) width 5: " "
     608                RenderInline {SPAN} at (0,0) size 719x107
     609                  RenderText {#text} at (456,89) size 18x29
     610                    text run at (456,89) width 18: "a "
    611611                  RenderInline {SPAN} at (0,0) size 204x70
    612                     RenderText {#text} at (474,57) size 204x70
    613                       text run at (474,57) width 204: "14-point"
    614                   RenderText {#text} at (677,89) size 720x107
    615                     text run at (677,89) width 43: " text"
     612                    RenderText {#text} at (473,57) size 204x70
     613                      text run at (473,57) width 204: "14-point"
     614                  RenderText {#text} at (676,89) size 719x107
     615                    text run at (676,89) width 43: " text"
    616616                    text run at (0,167) width 76: "element"
    617617                RenderText {#text} at (75,175) size 5x19
    … …  
    625625                RenderText {#text} at (292,175) size 5x19
    626626                  text run at (292,175) width 5: " "
    627                 RenderImage {IMG} at (296,178) size 6x16
    628                 RenderText {#text} at (301,175) size 5x19
    629                   text run at (301,175) width 5: " "
    630                 RenderInline {BIG} at (0,0) size 156x25
    631                   RenderText {#text} at (305,170) size 156x25
    632                     text run at (305,170) width 156: "the images appear."
     627                RenderImage {IMG} at (296,178) size 5x16
     628                RenderText {#text} at (300,175) size 5x19
     629                  text run at (300,175) width 5: " "
     630                RenderInline {BIG} at (0,0) size 157x25
     631                  RenderText {#text} at (304,170) size 157x25
     632                    text run at (304,170) width 157: "the images appear."
    633633                RenderText {#text} at (460,175) size 5x19
    634634                  text run at (460,175) width 5: " "
    … …  
    688688                RenderText {#text} at (146,46) size 5x18
    689689                  text run at (146,46) width 5: " "
    690                 RenderImage {IMG} at (150,46) size 21x65
    691                 RenderText {#text} at (170,46) size 5x18
    692                   text run at (170,46) width 5: " "
     690                RenderImage {IMG} at (150,46) size 20x65
     691                RenderText {#text} at (169,46) size 5x18
     692                  text run at (169,46) width 5: " "
    693693                RenderInline {SPAN} at (0,0) size 114x18
    694                   RenderText {#text} at (174,46) size 114x18
    695                     text run at (174,46) width 114: "should be aligned"
    696                 RenderText {#text} at (287,46) size 5x18
    697                   text run at (287,46) width 5: " "
    698                 RenderImage {IMG} at (291,46) size 12x35
    699                 RenderText {#text} at (302,46) size 5x18
    700                   text run at (302,46) width 5: " "
     694                  RenderText {#text} at (173,46) size 114x18
     695                    text run at (173,46) width 114: "should be aligned"
     696                RenderText {#text} at (286,46) size 5x18
     697                  text run at (286,46) width 5: " "
     698                RenderImage {IMG} at (290,46) size 12x35
     699                RenderText {#text} at (301,46) size 5x18
     700                  text run at (301,46) width 5: " "
    701701                RenderInline {SPAN} at (0,0) size 188x37
    702                   RenderText {#text} at (306,46) size 188x37
    703                     text run at (306,46) width 188: "with the top of"
    704                 RenderText {#text} at (493,46) size 5x18
    705                   text run at (493,46) width 5: " "
    706                 RenderImage {IMG} at (497,46) size 16x50
    707                 RenderText {#text} at (512,46) size 5x18
    708                   text run at (512,46) width 5: " "
     702                  RenderText {#text} at (305,46) size 188x37
     703                    text run at (305,46) width 188: "with the top of"
     704                RenderText {#text} at (492,46) size 5x18
     705                  text run at (492,46) width 5: " "
     706                RenderImage {IMG} at (496,46) size 16x50
     707                RenderText {#text} at (511,46) size 5x18
     708                  text run at (511,46) width 5: " "
    709709                RenderInline {SPAN} at (0,0) size 134x18
    710                   RenderText {#text} at (516,46) size 134x18
    711                     text run at (516,46) width 134: "the tallest element in"
    712                 RenderText {#text} at (649,46) size 5x18
    713                   text run at (649,46) width 5: " "
    714                 RenderImage {IMG} at (653,46) size 6x15
     710                  RenderText {#text} at (515,46) size 134x18
     711                    text run at (515,46) width 134: "the tallest element in"
     712                RenderText {#text} at (648,46) size 5x18
     713                  text run at (648,46) width 5: " "
     714                RenderImage {IMG} at (652,46) size 6x15
    715715                RenderText {#text} at (0,0) size 0x0
    716716                RenderInline {BIG} at (0,0) size 301x24
  • trunk/LayoutTests/platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.txt

    r177774 r295701  
    1212      RenderBlock {DIV} at (0,34) size 800x152
    1313        RenderBlock {DIV} at (0,0) size 402x152 [border: (1px solid #DDDDDD)]
    14           RenderImage {IMG} at (155,1) size 92x100
     14          RenderImage {IMG} at (154,1) size 94x100
  • trunk/LayoutTests/platform/mac/fast/replaced/width100percent-image-expected.txt

    r282306 r295701  
    2929            RenderTableCell {TD} at (1,1) size 216x277 [r=0 c=0 rs=1 cs=1]
    3030              RenderImage {IMG} at (1,1) size 214x275
    31             RenderTableCell {TD} at (218,1) size 216x277 [r=0 c=1 rs=1 cs=1]
     31            RenderTableCell {TD} at (217,1) size 217x277 [r=0 c=1 rs=1 cs=1]
    3232              RenderImage {IMG} at (1,1) size 214x275
    33             RenderTableCell {TD} at (435,1) size 216x277 [r=0 c=2 rs=1 cs=1]
     33            RenderTableCell {TD} at (434,1) size 217x277 [r=0 c=2 rs=1 cs=1]
    3434              RenderImage {IMG} at (1,1) size 214x275
    35             RenderTableCell {TD} at (652,129) size 131x21 [r=0 c=3 rs=1 cs=1]
     35            RenderTableCell {TD} at (651,129) size 132x21 [r=0 c=3 rs=1 cs=1]
    3636              RenderText {#text} at (1,0) size 4x20
    3737                text run at (1,1) width 4: " "
  • trunk/LayoutTests/platform/mac/svg/wicd/test-rightsizing-b-expected.txt

    r269036 r295701  
    1212            text run at (0,0) width 137: "WICD Core 1.0 #20-2"
    1313        RenderBlock (anonymous) at (0,66) size 738x300
    14           RenderEmbeddedObject {object} at (0,0) size 296x295 [bgcolor=#FF0000]
     14          RenderEmbeddedObject {object} at (0,0) size 296x296 [bgcolor=#FF0000]
    1515            layer at (0,0) size 295x295
    1616              RenderView at (0,0) size 295x295
    … …  
    7676            text run at (0,48) width 398: "Beyond there is the same, only with PNG images instead of SVG."
    7777        RenderBlock (anonymous) at (0,437) size 738x300
    78           RenderImage {object} at (0,0) size 296x295 [bgcolor=#FF0000]
     78          RenderImage {object} at (0,0) size 296x296 [bgcolor=#FF0000]
    7979          RenderText {#text} at (295,281) size 5x17
    8080            text run at (295,281) width 5: " "
  • trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug14929-expected.txt

    r195740 r295701  
    2929            RenderTableRow {TR} at (0,2) size 638x22
    3030              RenderTableCell {TD} at (2,2) size 635x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
    31                 RenderImage {IMG} at (2,2) size 190x18
     31                RenderImage {IMG} at (2,2) size 190x19
    3232            RenderTableRow {TR} at (0,26) size 638x22
    3333              RenderTableCell {TD} at (2,26) size 127x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
  • trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug85016-expected.txt

    r195740 r295701  
    1313      RenderBlock {DIV} at (32,735) size 657x657 [border: (3px dotted #008000)]
    1414        RenderBlock {DIV} at (35,35) size 587x587 [border: (1px solid #FF0000)]
    15           RenderImage {IMG} at (1,1) size 860x585
     15          RenderImage {IMG} at (1,1) size 861x585
    1616          RenderText {#text} at (0,0) size 0x0
    1717      RenderBlock {P} at (0,1424) size 721x18
  • trunk/LayoutTests/svg/css/max-width-2-expected.html

    r123785 r295701  
    11<!DOCTYPE html>
    22<div style="outline: dashed lightblue; height: 300px; width: 400px;">
    3     <svg style="background-color: yellow;" width="400" height="133" viewBox="0 0 900 300">
     3    <svg style="background-color: yellow;" width="400" height="133.33" viewBox="0 0 900 300">
    44        <rect x="0" y="0" width="900" height="300" />
    55    </svg>
  • trunk/Source/WebCore/rendering/RenderReplaced.cpp

    r295630 r295701  
    554554{
    555555    if (boxSizing == BoxSizing::BorderBox)
    556         return LayoutUnit(round((logicalHeight + borderAndPaddingLogicalHeight) * aspectRatio)) - borderAndPaddingLogicalWidth;
    557     return LayoutUnit(round(logicalHeight * aspectRatio));
     556        return LayoutUnit((logicalHeight + borderAndPaddingLogicalHeight) * aspectRatio) - borderAndPaddingLogicalWidth;
     557    return LayoutUnit(logicalHeight * aspectRatio);
    558558}
    559559
    … …  
    588588        // width or height. There are also elements with intrinsic sizes but without intrinsic ratio (like an iframe).
    589589        if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalHeight() && hasIntrinsicSize(contentRenderer, hasIntrinsicWidth, hasIntrinsicHeight))
    590             return computeReplacedLogicalWidthRespectingMinMaxWidth(roundToInt(round(overridingContentLogicalHeight() * intrinsicRatio)), shouldComputePreferred);
     590            return computeReplacedLogicalWidthRespectingMinMaxWidth(overridingContentLogicalHeight() * intrinsicRatio, shouldComputePreferred);
    591591
    592592        // If 'height' and 'width' both have computed values of 'auto' and the element also has an intrinsic width, then that intrinsic width is the used value of 'width'.
    … …  
    633633{
    634634    if (boxSizing == BoxSizing::BorderBox)
    635         return LayoutUnit(round((logicalWidth + borderAndPaddingLogicalWidth) / aspectRatio)) - borderAndPaddingLogicalHeight;
    636     return LayoutUnit(round(logicalWidth / aspectRatio));
     635        return LayoutUnit((logicalWidth + borderAndPaddingLogicalWidth) / aspectRatio) - borderAndPaddingLogicalHeight;
     636    return LayoutUnit(logicalWidth / aspectRatio);
    637637}
    638638
    … …  
    656656    // See computeReplacedLogicalHeight() for a similar check for heights.
    657657    if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalWidth() && hasIntrinsicSize(contentRenderer, hasIntrinsicWidth, hasIntrinsicHeight))
    658         return computeReplacedLogicalHeightRespectingMinMaxHeight(roundToInt(round(overridingContentLogicalWidth() / intrinsicRatio)));
     658        return computeReplacedLogicalHeightRespectingMinMaxHeight(overridingContentLogicalWidth() / intrinsicRatio);
    659659
    660660    // If 'height' and 'width' both have computed values of 'auto' and the element also has an intrinsic height, then that intrinsic height is the used value of 'height'.
Note: See TracChangeset for help on using the changeset viewer.