Diff
Modified: trunk/LayoutTests/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt (295700 => 295701)
--- trunk/LayoutTests/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -7,6 +7,6 @@
RenderBlock (positioned) {DIV} at (50,100) size 700x400 [border: (1px solid #808080)]
layer at (51,141) size 560x320
RenderBlock (positioned) {DIV} at (1,40) size 561x322 [border: (1px solid #FF0000)]
- RenderImage {IMG} at (1,1) size 393x319
+ RenderImage {IMG} at (1,1) size 394x319
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/fast/writing-mode/block-level-images-expected.txt (295700 => 295701)
--- trunk/LayoutTests/fast/writing-mode/block-level-images-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/fast/writing-mode/block-level-images-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -3,13 +3,13 @@
layer at (0,0) size 800x316
RenderBlock {HTML} at (0,0) size 800x316
RenderBody {BODY} at (8,8) size 784x0
- RenderBlock (floating) {DIV} at (2,2) size 264x304 [border: (2px solid #000000)]
+ RenderBlock (floating) {DIV} at (2,2) size 265x304 [border: (2px solid #000000)]
RenderBlock {DIV} at (2,2) size 25x300 [bgcolor=#008000]
RenderImage {IMG} at (27,2) size 154x156 [border: (1px solid #800080) (2px solid #800000) (5px dashed #808080) (2px solid #800000)]
- RenderImage {IMG} at (181,42) size 56x50
- RenderBlock {DIV} at (237,2) size 25x300 [bgcolor=#008000]
- RenderBlock (floating) {DIV} at (270,2) size 264x304 [border: (2px solid #000000)]
+ RenderImage {IMG} at (181,42) size 57x50
+ RenderBlock {DIV} at (237,2) size 26x300 [bgcolor=#008000]
+ RenderBlock (floating) {DIV} at (270,2) size 265x304 [border: (2px solid #000000)]
RenderBlock {DIV} at (2,2) size 25x300 [bgcolor=#008000]
RenderImage {IMG} at (27,146) size 154x156 [border: (5px dashed #808080) (2px solid #800000) (1px solid #800080) (2px solid #800000)]
- RenderImage {IMG} at (181,212) size 56x50
- RenderBlock {DIV} at (237,2) size 25x300 [bgcolor=#008000]
+ RenderImage {IMG} at (181,212) size 57x50
+ RenderBlock {DIV} at (237,2) size 26x300 [bgcolor=#008000]
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio-expected.txt (295700 => 295701)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -1,11 +1,11 @@
CONSOLE MESSAGE: ReferenceError: Can't find variable: checkLayout
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x130
- RenderBlock {HTML} at (0,0) size 800x130
+layer at (0,0) size 800x129
+ RenderBlock {HTML} at (0,0) size 800x129
RenderBody {BODY} at (8,8) size 784x0
layer at (8,8) size 203x0
RenderBlock (relative positioned) {DIV} at (0,0) size 204x0
RenderHTMLCanvas {CANVAS} at (0,0) size 61x61 [bgcolor=#008000]
RenderHTMLCanvas {CANVAS} at (60,0) size 62x61 [bgcolor=#008000]
- RenderHTMLCanvas {CANVAS} at (0,61) size 122x61 [bgcolor=#008000]
+ RenderHTMLCanvas {CANVAS} at (0,60) size 122x61 [bgcolor=#008000]
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt (295700 => 295701)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -40,5 +40,5 @@
PASS Loaded images test: <img> with width, height and empty src attributes
PASS Loaded images test: Error image with width and height attributes
PASS Loaded images test: Error image with width, height and alt attributes
-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
+PASS Loaded images test: <img> with width and height attributes, but not equal to the original aspect ratio
Modified: trunk/LayoutTests/platform/glib/TestExpectations (295700 => 295701)
--- trunk/LayoutTests/platform/glib/TestExpectations 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/glib/TestExpectations 2022-06-21 23:28:41 UTC (rev 295701)
@@ -697,6 +697,8 @@
webkit.org/b/241568 imported/w3c/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-003.html [ ImageOnlyFailure ]
+# Changes to logical height/width computations (https://bugs.webkit.org/show_bug.cgi?id=241601)
+webkit.org/b/241601 css2.1/t090501-c414-flt-03-b-g.html [ Failure ]
#////////////////////////////////////////////////////////////////////////////////////////
# End of CSS-related bugs
Modified: trunk/LayoutTests/platform/glib/css2.1/t090501-c414-flt-03-b-g-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/glib/css2.1/t090501-c414-flt-03-b-g-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/glib/css2.1/t090501-c414-flt-03-b-g-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -7,12 +7,12 @@
RenderText {#text} at (0,2) size 396x17
text run at (0,2) width 246: "In the following test, the purple square "
text run at (246,2) width 150: "should be on the left (\x{21E6}"
- RenderImage {IMG} at (396,0) size 19x20
- RenderText {#text} at (415,2) size 215x17
- text run at (415,2) width 215: "), and the teal square on the right ("
- RenderImage {IMG} at (630,0) size 19x20
- RenderText {#text} at (649,2) size 738x35
- text run at (649,2) width 89: "\x{21E8}) of the blue"
+ RenderImage {IMG} at (396,0) size 20x20
+ RenderText {#text} at (415,2) size 216x17
+ text run at (415,2) width 216: "), and the teal square on the right ("
+ RenderImage {IMG} at (630,0) size 20x20
+ RenderText {#text} at (649,2) size 739x35
+ text run at (649,2) width 90: "\x{21E8}) of the blue"
text run at (0,20) width 61: "rectangle."
RenderBlock {DIV} at (0,54) size 784x70
RenderBlock {DIV} at (16,0) size 752x70 [color=#0000FF] [bgcolor=#000080]
@@ -22,4 +22,4 @@
text run at (168,8) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
text run at (168,26) width 198: "Blue rectangle. Blue rectangle. "
text run at (366,26) width 194: "Blue rectangle. Blue rectangle."
- text run at (168,44) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
+ text run at (168,44) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
\ No newline at end of file
Modified: trunk/LayoutTests/platform/glib/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/glib/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/glib/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -7,6 +7,6 @@
RenderBlock (positioned) {div} at (50,100) size 700x400 [border: (1px solid #808080)]
layer at (51,141) size 560x320
RenderBlock (positioned) {div} at (1,40) size 561x322 [border: (1px solid #FF0000)]
- RenderImage {img} at (1,1) size 393x319
+ RenderImage {img} at (1,1) size 394x319
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/glib/tables/mozilla_expected_failures/bugs/bug85016-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/glib/tables/mozilla_expected_failures/bugs/bug85016-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/glib/tables/mozilla_expected_failures/bugs/bug85016-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -12,7 +12,7 @@
text run at (0,0) width 541: "percentage height images in DIV with no height (red) in a DIV with no height (green)"
RenderBlock {DIV} at (32,735) size 657x657 [border: (3px dotted #008000)]
RenderBlock {DIV} at (35,35) size 587x587 [border: (1px solid #FF0000)]
- RenderImage {IMG} at (1,1) size 860x585
+ RenderImage {IMG} at (1,1) size 861x585
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,1424) size 721x18
RenderText {#text} at (0,0) size 471x17
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (295700 => 295701)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2022-06-21 23:28:41 UTC (rev 295701)
@@ -909,6 +909,10 @@
# Requires support for xHE-HAAC audio codec
webkit.org/b/239750 media/media-source/media-mp4-xhe-aac.html [ Skip ]
+# Changes to logical height/width computations (https://bugs.webkit.org/show_bug.cgi?id=241601)
+webkit.org/b/241601 svg/wicd/rightsizing-grid.xhtml [ Failure ]
+webkit.org/b/241601 svg/wicd/test-rightsizing-b.xhtml [ Failure ]
+
#////////////////////////////////////////////////////////////////////////////////////////
# End of Expected failures.
#////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/LayoutTests/platform/gtk/css1/box_properties/width-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/gtk/css1/box_properties/width-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/gtk/css1/box_properties/width-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -59,7 +59,7 @@
RenderText {#text} at (0,0) size 287x17
text run at (0,0) width 287: "The square above should be fifty pixels wide."
RenderBlock (anonymous) at (4,104) size 363x181
- RenderImage {IMG} at (0,0) size 182x181
+ RenderImage {IMG} at (0,0) size 182x182
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (4,301) size 363x36
RenderText {#text} at (0,0) size 348x35
Modified: trunk/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x2341
+layer at (0,0) size 785x2339
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x2341
- RenderBlock {HTML} at (0,0) size 785x2341
- RenderBody {BODY} at (8,8) size 769x2325 [bgcolor=#CCCCCC]
+layer at (0,0) size 785x2339
+ RenderBlock {HTML} at (0,0) size 785x2339
+ RenderBody {BODY} at (8,8) size 769x2323 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 769x18
RenderText {#text} at (0,0) size 355x17
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
@@ -38,29 +38,29 @@
RenderText {#text} at (0,0) size 400x17
text run at (0,0) width 400: "The above image should be a 15px square aligned at the center."
RenderImage {IMG} at (192,350) size 385x385
- RenderBlock {P} at (0,751) size 769x36
+ RenderBlock {P} at (0,750) size 769x37
RenderText {#text} at (0,0) size 766x35
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"
text run at (0,18) width 123: "the parent element: "
text run at (123,18) width 395: "the document body in the first half, and the table in the second."
- RenderImage {IMG} at (384,803) size 385x385
- RenderBlock {P} at (0,1204) size 769x36
+ RenderImage {IMG} at (384,802) size 385x385
+ RenderBlock {P} at (0,1203) size 769x36
RenderText {#text} at (0,0) size 758x35
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"
text run at (0,18) width 100: "parent element: "
text run at (100,18) width 395: "the document body in the first half, and the table in the second."
- RenderTable {TABLE} at (0,1256) size 769x1069 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 767x1067
+ RenderTable {TABLE} at (0,1255) size 769x1068 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 767x1066
RenderTableRow {TR} at (0,0) size 767x26
RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderInline {STRONG} at (0,0) size 161x17
RenderText {#text} at (4,4) size 161x17
text run at (4,4) width 161: "TABLE Testing Section"
- RenderTableRow {TR} at (0,26) size 767x1041
- RenderTableCell {TD} at (0,533) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
- RenderText {#text} at (4,3) size 4x19
+ RenderTableRow {TR} at (0,26) size 767x1040
+ RenderTableCell {TD} at (0,533) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 4x17
text run at (4,4) width 4: " "
- RenderTableCell {TD} at (12,26) size 755x1041 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (12,26) size 755x1040 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderBlock {P} at (4,4) size 747x19
RenderImage {IMG} at (0,0) size 15x15
RenderText {#text} at (15,1) size 434x17
@@ -74,13 +74,13 @@
RenderText {#text} at (0,0) size 400x17
text run at (0,0) width 400: "The above image should be a 15px square aligned at the center."
RenderImage {IMG} at (190,169) size 375x374
- RenderBlock {P} at (4,559) size 747x36
+ RenderBlock {P} at (4,558) size 747x37
RenderText {#text} at (0,0) size 722x35
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"
text run at (0,18) width 167: "within the parent element: "
text run at (167,18) width 395: "the document body in the first half, and the table in the second."
- RenderImage {IMG} at (377,611) size 374x374
- RenderBlock {P} at (4,1001) size 747x36
+ RenderImage {IMG} at (377,610) size 374x374
+ RenderBlock {P} at (4,1000) size 747x36
RenderText {#text} at (0,0) size 735x35
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"
text run at (0,18) width 123: "the parent element: "
Modified: trunk/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -173,25 +173,25 @@
RenderText {#text} at (80,122) size 101x21
text run at (80,122) width 101: " all of which "
RenderImage {IMG} at (181,122) size 20x65
- RenderText {#text} at (201,122) size 5x21
- text run at (201,122) width 5: " "
- RenderInline {SPAN} at (0,0) size 262x41
- RenderText {#text} at (206,106) size 262x41
- text run at (206,106) width 262: "should be aligned"
- RenderText {#text} at (468,122) size 5x21
- text run at (468,122) width 5: " "
- RenderImage {IMG} at (473,122) size 11x35
- RenderText {#text} at (484,122) size 123x21
- text run at (484,122) width 123: " with the top of "
- RenderImage {IMG} at (607,122) size 9x30
- RenderText {#text} at (616,122) size 5x21
- text run at (616,122) width 5: " "
- RenderInline {SPAN} at (0,0) size 733x142
- RenderText {#text} at (621,114) size 19x31
- text run at (621,114) width 19: "a "
- RenderInline {SPAN} at (0,0) size 733x188
- RenderText {#text} at (640,77) size 733x188
- text run at (640,77) width 93: "14-"
+ RenderText {#text} at (200,122) size 6x21
+ text run at (200,122) width 6: " "
+ RenderInline {SPAN} at (0,0) size 263x41
+ RenderText {#text} at (205,106) size 263x41
+ text run at (205,106) width 263: "should be aligned"
+ RenderText {#text} at (467,122) size 6x21
+ text run at (467,122) width 6: " "
+ RenderImage {IMG} at (472,122) size 11x35
+ RenderText {#text} at (483,122) size 123x21
+ text run at (483,122) width 123: " with the top of "
+ RenderImage {IMG} at (606,122) size 9x30
+ RenderText {#text} at (615,122) size 5x21
+ text run at (615,122) width 5: " "
+ RenderInline {SPAN} at (0,0) size 732x142
+ RenderText {#text} at (620,114) size 19x31
+ text run at (620,114) width 19: "a "
+ RenderInline {SPAN} at (0,0) size 732x188
+ RenderText {#text} at (639,77) size 732x188
+ text run at (639,77) width 93: "14-"
text run at (0,188) width 143: "point"
RenderText {#text} at (143,225) size 144x31
text run at (143,225) width 144: " text element"
@@ -206,11 +206,11 @@
RenderText {#text} at (501,233) size 5x21
text run at (501,233) width 5: " "
RenderImage {IMG} at (506,233) size 5x15
- RenderText {#text} at (511,233) size 5x21
- text run at (511,233) width 5: " "
- RenderInline {BIG} at (0,0) size 155x24
- RenderText {#text} at (516,231) size 155x24
- text run at (516,231) width 155: "the images appear."
+ RenderText {#text} at (510,233) size 6x21
+ text run at (510,233) width 6: " "
+ RenderInline {BIG} at (0,0) size 156x24
+ RenderText {#text} at (515,231) size 156x24
+ text run at (515,231) width 156: "the images appear."
RenderText {#text} at (670,233) size 6x21
text run at (670,233) width 6: " "
RenderImage {IMG} at (675,233) size 28x90
@@ -246,27 +246,27 @@
text run at (696,23) width 36: " all of"
text run at (0,98) width 43: "which "
RenderImage {IMG} at (43,76) size 20x66
- RenderText {#text} at (63,98) size 119x18
- text run at (63,98) width 119: " should be aligned "
- RenderImage {IMG} at (182,91) size 11x36
- RenderText {#text} at (193,98) size 4x18
- text run at (193,98) width 4: " "
+ RenderText {#text} at (62,98) size 120x18
+ text run at (62,98) width 120: " should be aligned "
+ RenderImage {IMG} at (181,91) size 11x36
+ RenderText {#text} at (192,98) size 4x18
+ text run at (192,98) width 4: " "
RenderInline {SPAN} at (0,0) size 236x37
- RenderText {#text} at (197,83) size 236x37
- text run at (197,83) width 236: "with the middle of"
- RenderText {#text} at (433,98) size 4x18
- text run at (433,98) width 4: " "
- RenderImage {IMG} at (437,83) size 15x51
- RenderText {#text} at (452,98) size 4x18
- text run at (452,98) width 4: " "
- RenderInline {SPAN} at (0,0) size 720x105
- RenderText {#text} at (456,91) size 17x27
- text run at (456,91) width 17: "a "
+ RenderText {#text} at (196,83) size 236x37
+ text run at (196,83) width 236: "with the middle of"
+ RenderText {#text} at (432,98) size 4x18
+ text run at (432,98) width 4: " "
+ RenderImage {IMG} at (436,83) size 15x51
+ RenderText {#text} at (451,98) size 4x18
+ text run at (451,98) width 4: " "
+ RenderInline {SPAN} at (0,0) size 719x105
+ RenderText {#text} at (455,91) size 17x27
+ text run at (455,91) width 17: "a "
RenderInline {SPAN} at (0,0) size 204x67
- RenderText {#text} at (473,59) size 204x67
- text run at (473,59) width 204: "14-point"
- RenderText {#text} at (677,91) size 720x105
- text run at (677,91) width 43: " text"
+ RenderText {#text} at (472,59) size 204x67
+ text run at (472,59) width 204: "14-point"
+ RenderText {#text} at (676,91) size 719x105
+ text run at (676,91) width 43: " text"
text run at (0,169) width 78: "element"
RenderText {#text} at (77,176) size 5x18
text run at (77,176) width 5: " "
@@ -348,28 +348,28 @@
text run at (173,47) width 112: "should be aligned"
RenderText {#text} at (284,47) size 5x17
text run at (284,47) width 5: " "
- RenderImage {IMG} at (288,47) size 12x35
- RenderText {#text} at (299,47) size 5x17
- text run at (299,47) width 5: " "
+ RenderImage {IMG} at (288,47) size 11x35
+ RenderText {#text} at (298,47) size 5x17
+ text run at (298,47) width 5: " "
RenderInline {SPAN} at (0,0) size 189x36
- RenderText {#text} at (303,47) size 189x36
- text run at (303,47) width 189: "with the top of"
- RenderText {#text} at (491,47) size 5x17
- text run at (491,47) width 5: " "
- RenderImage {IMG} at (495,47) size 16x50
- RenderText {#text} at (510,47) size 5x17
- text run at (510,47) width 5: " "
+ RenderText {#text} at (302,47) size 189x36
+ text run at (302,47) width 189: "with the top of"
+ RenderText {#text} at (490,47) size 5x17
+ text run at (490,47) width 5: " "
+ RenderImage {IMG} at (494,47) size 16x50
+ RenderText {#text} at (509,47) size 5x17
+ text run at (509,47) width 5: " "
RenderInline {SPAN} at (0,0) size 129x17
- RenderText {#text} at (514,47) size 129x17
- text run at (514,47) width 129: "the tallest element in"
- RenderText {#text} at (642,47) size 5x17
- text run at (642,47) width 5: " "
- RenderImage {IMG} at (646,47) size 6x15
- RenderText {#text} at (651,47) size 5x17
- text run at (651,47) width 5: " "
- RenderInline {BIG} at (0,0) size 744x89
- RenderText {#text} at (655,47) size 744x89
- text run at (655,47) width 89: "whichever"
+ RenderText {#text} at (513,47) size 129x17
+ text run at (513,47) width 129: "the tallest element in"
+ RenderText {#text} at (641,47) size 5x17
+ text run at (641,47) width 5: " "
+ RenderImage {IMG} at (645,47) size 6x15
+ RenderText {#text} at (650,47) size 5x17
+ text run at (650,47) width 5: " "
+ RenderInline {BIG} at (0,0) size 743x89
+ RenderText {#text} at (654,47) size 743x89
+ text run at (654,47) width 89: "whichever"
text run at (0,112) width 207: "line the elements appear."
RenderText {#text} at (206,112) size 5x17
text run at (206,112) width 5: " "
@@ -517,25 +517,25 @@
RenderText {#text} at (80,122) size 101x21
text run at (80,122) width 101: " all of which "
RenderImage {IMG} at (181,122) size 20x65
- RenderText {#text} at (201,122) size 5x21
- text run at (201,122) width 5: " "
- RenderInline {SPAN} at (0,0) size 262x41
- RenderText {#text} at (206,106) size 262x41
- text run at (206,106) width 262: "should be aligned"
- RenderText {#text} at (468,122) size 5x21
- text run at (468,122) width 5: " "
- RenderImage {IMG} at (473,122) size 11x35
- RenderText {#text} at (484,122) size 123x21
- text run at (484,122) width 123: " with the top of "
- RenderImage {IMG} at (607,122) size 9x30
- RenderText {#text} at (616,122) size 5x21
- text run at (616,122) width 5: " "
- RenderInline {SPAN} at (0,0) size 733x142
- RenderText {#text} at (621,114) size 19x31
- text run at (621,114) width 19: "a "
- RenderInline {SPAN} at (0,0) size 733x188
- RenderText {#text} at (640,77) size 733x188
- text run at (640,77) width 93: "14-"
+ RenderText {#text} at (200,122) size 6x21
+ text run at (200,122) width 6: " "
+ RenderInline {SPAN} at (0,0) size 263x41
+ RenderText {#text} at (205,106) size 263x41
+ text run at (205,106) width 263: "should be aligned"
+ RenderText {#text} at (467,122) size 6x21
+ text run at (467,122) width 6: " "
+ RenderImage {IMG} at (472,122) size 11x35
+ RenderText {#text} at (483,122) size 123x21
+ text run at (483,122) width 123: " with the top of "
+ RenderImage {IMG} at (606,122) size 9x30
+ RenderText {#text} at (615,122) size 5x21
+ text run at (615,122) width 5: " "
+ RenderInline {SPAN} at (0,0) size 732x142
+ RenderText {#text} at (620,114) size 19x31
+ text run at (620,114) width 19: "a "
+ RenderInline {SPAN} at (0,0) size 732x188
+ RenderText {#text} at (639,77) size 732x188
+ text run at (639,77) width 93: "14-"
text run at (0,188) width 143: "point"
RenderText {#text} at (143,225) size 144x31
text run at (143,225) width 144: " text element"
@@ -550,11 +550,11 @@
RenderText {#text} at (501,233) size 5x21
text run at (501,233) width 5: " "
RenderImage {IMG} at (506,233) size 5x15
- RenderText {#text} at (511,233) size 5x21
- text run at (511,233) width 5: " "
- RenderInline {BIG} at (0,0) size 155x24
- RenderText {#text} at (516,231) size 155x24
- text run at (516,231) width 155: "the images appear."
+ RenderText {#text} at (510,233) size 6x21
+ text run at (510,233) width 6: " "
+ RenderInline {BIG} at (0,0) size 156x24
+ RenderText {#text} at (515,231) size 156x24
+ text run at (515,231) width 156: "the images appear."
RenderText {#text} at (670,233) size 6x21
text run at (670,233) width 6: " "
RenderImage {IMG} at (675,233) size 28x90
@@ -590,27 +590,27 @@
text run at (696,23) width 36: " all of"
text run at (0,98) width 43: "which "
RenderImage {IMG} at (43,76) size 20x66
- RenderText {#text} at (63,98) size 119x18
- text run at (63,98) width 119: " should be aligned "
- RenderImage {IMG} at (182,91) size 11x36
- RenderText {#text} at (193,98) size 4x18
- text run at (193,98) width 4: " "
+ RenderText {#text} at (62,98) size 120x18
+ text run at (62,98) width 120: " should be aligned "
+ RenderImage {IMG} at (181,91) size 11x36
+ RenderText {#text} at (192,98) size 4x18
+ text run at (192,98) width 4: " "
RenderInline {SPAN} at (0,0) size 236x37
- RenderText {#text} at (197,83) size 236x37
- text run at (197,83) width 236: "with the middle of"
- RenderText {#text} at (433,98) size 4x18
- text run at (433,98) width 4: " "
- RenderImage {IMG} at (437,83) size 15x51
- RenderText {#text} at (452,98) size 4x18
- text run at (452,98) width 4: " "
- RenderInline {SPAN} at (0,0) size 720x105
- RenderText {#text} at (456,91) size 17x27
- text run at (456,91) width 17: "a "
+ RenderText {#text} at (196,83) size 236x37
+ text run at (196,83) width 236: "with the middle of"
+ RenderText {#text} at (432,98) size 4x18
+ text run at (432,98) width 4: " "
+ RenderImage {IMG} at (436,83) size 15x51
+ RenderText {#text} at (451,98) size 4x18
+ text run at (451,98) width 4: " "
+ RenderInline {SPAN} at (0,0) size 719x105
+ RenderText {#text} at (455,91) size 17x27
+ text run at (455,91) width 17: "a "
RenderInline {SPAN} at (0,0) size 204x67
- RenderText {#text} at (473,59) size 204x67
- text run at (473,59) width 204: "14-point"
- RenderText {#text} at (677,91) size 720x105
- text run at (677,91) width 43: " text"
+ RenderText {#text} at (472,59) size 204x67
+ text run at (472,59) width 204: "14-point"
+ RenderText {#text} at (676,91) size 719x105
+ text run at (676,91) width 43: " text"
text run at (0,169) width 78: "element"
RenderText {#text} at (77,176) size 5x18
text run at (77,176) width 5: " "
@@ -692,28 +692,28 @@
text run at (173,47) width 112: "should be aligned"
RenderText {#text} at (284,47) size 5x17
text run at (284,47) width 5: " "
- RenderImage {IMG} at (288,47) size 12x35
- RenderText {#text} at (299,47) size 5x17
- text run at (299,47) width 5: " "
+ RenderImage {IMG} at (288,47) size 11x35
+ RenderText {#text} at (298,47) size 5x17
+ text run at (298,47) width 5: " "
RenderInline {SPAN} at (0,0) size 189x36
- RenderText {#text} at (303,47) size 189x36
- text run at (303,47) width 189: "with the top of"
- RenderText {#text} at (491,47) size 5x17
- text run at (491,47) width 5: " "
- RenderImage {IMG} at (495,47) size 16x50
- RenderText {#text} at (510,47) size 5x17
- text run at (510,47) width 5: " "
+ RenderText {#text} at (302,47) size 189x36
+ text run at (302,47) width 189: "with the top of"
+ RenderText {#text} at (490,47) size 5x17
+ text run at (490,47) width 5: " "
+ RenderImage {IMG} at (494,47) size 16x50
+ RenderText {#text} at (509,47) size 5x17
+ text run at (509,47) width 5: " "
RenderInline {SPAN} at (0,0) size 129x17
- RenderText {#text} at (514,47) size 129x17
- text run at (514,47) width 129: "the tallest element in"
- RenderText {#text} at (642,47) size 5x17
- text run at (642,47) width 5: " "
- RenderImage {IMG} at (646,47) size 6x15
- RenderText {#text} at (651,47) size 5x17
- text run at (651,47) width 5: " "
- RenderInline {BIG} at (0,0) size 744x89
- RenderText {#text} at (655,47) size 744x89
- text run at (655,47) width 89: "whichever"
+ RenderText {#text} at (513,47) size 129x17
+ text run at (513,47) width 129: "the tallest element in"
+ RenderText {#text} at (641,47) size 5x17
+ text run at (641,47) width 5: " "
+ RenderImage {IMG} at (645,47) size 6x15
+ RenderText {#text} at (650,47) size 5x17
+ text run at (650,47) width 5: " "
+ RenderInline {BIG} at (0,0) size 743x89
+ RenderText {#text} at (654,47) size 743x89
+ text run at (654,47) width 89: "whichever"
text run at (0,112) width 207: "line the elements appear."
RenderText {#text} at (206,112) size 5x17
text run at (206,112) width 5: " "
Modified: trunk/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-03-b-g-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -11,4 +11,4 @@
text run at (220,0) width 305: "https://bugs.webkit.org/show_bug.cgi?id=40142"
RenderBlock {DIV} at (0,34) size 800x152
RenderBlock {DIV} at (0,0) size 402x152 [border: (1px solid #DDDDDD)]
- RenderImage {IMG} at (155,1) size 92x100
+ RenderImage {IMG} at (154,1) size 94x100
Modified: trunk/LayoutTests/platform/gtk/fast/replaced/width100percent-image-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/gtk/fast/replaced/width100percent-image-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/gtk/fast/replaced/width100percent-image-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -28,10 +28,10 @@
RenderTableRow {TR} at (0,1) size 784x277
RenderTableCell {TD} at (1,1) size 216x277 [r=0 c=0 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (218,1) size 216x277 [r=0 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (217,1) size 217x277 [r=0 c=1 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (435,1) size 216x277 [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (434,1) size 217x277 [r=0 c=2 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (652,129) size 131x21 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (651,129) size 132x21 [r=0 c=3 rs=1 cs=1]
RenderText {#text} at (1,0) size 4x19
text run at (1,1) width 4: " "
Modified: trunk/LayoutTests/platform/gtk/tables/mozilla/bugs/bug14929-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/gtk/tables/mozilla/bugs/bug14929-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/gtk/tables/mozilla/bugs/bug14929-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -28,7 +28,7 @@
RenderTableSection {TBODY} at (1,1) size 638x50
RenderTableRow {TR} at (0,2) size 638x22
RenderTableCell {TD} at (2,2) size 635x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
- RenderImage {IMG} at (2,2) size 190x18
+ RenderImage {IMG} at (2,2) size 190x19
RenderTableRow {TR} at (0,26) size 638x22
RenderTableCell {TD} at (2,26) size 127x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 58x17
Modified: trunk/LayoutTests/platform/ios/css1/text_properties/vertical_align-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/ios/css1/text_properties/vertical_align-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/ios/css1/text_properties/vertical_align-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -175,25 +175,25 @@
RenderText {#text} at (53,123) size 101x22
text run at (53,123) width 101: " all of which "
RenderImage {IMG} at (153,123) size 21x65
- RenderText {#text} at (173,123) size 6x22
- text run at (173,123) width 6: " "
+ RenderText {#text} at (173,123) size 5x22
+ text run at (173,123) width 5: " "
RenderInline {SPAN} at (0,0) size 262x42
- RenderText {#text} at (178,107) size 262x42
- text run at (178,107) width 262: "should be aligned"
- RenderText {#text} at (439,123) size 6x22
- text run at (439,123) width 6: " "
- RenderImage {IMG} at (444,123) size 12x35
- RenderText {#text} at (455,123) size 122x22
- text run at (455,123) width 122: " with the top of "
- RenderImage {IMG} at (576,123) size 10x30
- RenderText {#text} at (585,123) size 5x22
- text run at (585,123) width 5: " "
- RenderInline {SPAN} at (0,0) size 703x144
- RenderText {#text} at (589,115) size 21x32
- text run at (589,115) width 21: "a "
- RenderInline {SPAN} at (0,0) size 703x191
- RenderText {#text} at (609,77) size 703x191
- text run at (609,77) width 94: "14-"
+ RenderText {#text} at (177,107) size 262x42
+ text run at (177,107) width 262: "should be aligned"
+ RenderText {#text} at (438,123) size 6x22
+ text run at (438,123) width 6: " "
+ RenderImage {IMG} at (443,123) size 12x35
+ RenderText {#text} at (454,123) size 122x22
+ text run at (454,123) width 122: " with the top of "
+ RenderImage {IMG} at (575,123) size 10x30
+ RenderText {#text} at (584,123) size 5x22
+ text run at (584,123) width 5: " "
+ RenderInline {SPAN} at (0,0) size 702x144
+ RenderText {#text} at (588,115) size 21x32
+ text run at (588,115) width 21: "a "
+ RenderInline {SPAN} at (0,0) size 702x191
+ RenderText {#text} at (608,77) size 702x191
+ text run at (608,77) width 94: "14-"
text run at (0,189) width 144: "point"
RenderText {#text} at (143,227) size 146x32
text run at (143,227) width 146: " text element"
@@ -207,15 +207,15 @@
text run at (313,237) width 194: "regardless of the line in which"
RenderText {#text} at (506,235) size 6x22
text run at (506,235) width 6: " "
- RenderImage {IMG} at (511,235) size 6x15
- RenderText {#text} at (516,235) size 5x22
- text run at (516,235) width 5: " "
- RenderInline {BIG} at (0,0) size 157x24
- RenderText {#text} at (520,233) size 157x24
- text run at (520,233) width 157: "the images appear."
- RenderText {#text} at (676,235) size 6x22
- text run at (676,235) width 6: " "
- RenderImage {IMG} at (681,235) size 28x90
+ RenderImage {IMG} at (511,235) size 5x15
+ RenderText {#text} at (515,235) size 6x22
+ text run at (515,235) width 6: " "
+ RenderInline {BIG} at (0,0) size 156x24
+ RenderText {#text} at (520,233) size 156x24
+ text run at (520,233) width 156: "the images appear."
+ RenderText {#text} at (675,235) size 6x22
+ text run at (675,235) width 6: " "
+ RenderImage {IMG} at (680,235) size 28x90
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,1797) size 784x41
RenderText {#text} at (0,0) size 765x39
@@ -247,30 +247,30 @@
RenderText {#text} at (699,22) size 81x19
text run at (699,22) width 81: " all of which"
RenderImage {IMG} at (0,77) size 20x66
- RenderText {#text} at (20,98) size 121x20
- text run at (20,98) width 121: " should be aligned "
- RenderImage {IMG} at (140,92) size 12x36
- RenderText {#text} at (151,98) size 5x20
- text run at (151,98) width 5: " "
+ RenderText {#text} at (19,98) size 122x20
+ text run at (19,98) width 122: " should be aligned "
+ RenderImage {IMG} at (140,92) size 11x36
+ RenderText {#text} at (150,98) size 5x20
+ text run at (150,98) width 5: " "
RenderInline {SPAN} at (0,0) size 237x37
- RenderText {#text} at (155,84) size 237x37
- text run at (155,84) width 237: "with the middle of"
- RenderText {#text} at (391,98) size 5x20
- text run at (391,98) width 5: " "
- RenderImage {IMG} at (395,84) size 16x51
- RenderText {#text} at (410,98) size 5x20
- text run at (410,98) width 5: " "
+ RenderText {#text} at (154,84) size 237x37
+ text run at (154,84) width 237: "with the middle of"
+ RenderText {#text} at (390,98) size 5x20
+ text run at (390,98) width 5: " "
+ RenderImage {IMG} at (394,84) size 16x51
+ RenderText {#text} at (409,98) size 5x20
+ text run at (409,98) width 5: " "
RenderInline {SPAN} at (0,0) size 345x29
- RenderText {#text} at (414,91) size 18x29
- text run at (414,91) width 18: "a "
+ RenderText {#text} at (413,91) size 18x29
+ text run at (413,91) width 18: "a "
RenderInline {SPAN} at (0,0) size 204x68
- RenderText {#text} at (431,59) size 204x68
- text run at (431,59) width 204: "14-point"
- RenderText {#text} at (634,91) size 125x29
- text run at (634,91) width 125: " text element"
- RenderText {#text} at (758,98) size 5x20
- text run at (758,98) width 5: " "
- RenderImage {IMG} at (762,84) size 16x51
+ RenderText {#text} at (430,59) size 204x68
+ text run at (430,59) width 204: "14-point"
+ RenderText {#text} at (633,91) size 125x29
+ text run at (633,91) width 125: " text element"
+ RenderText {#text} at (757,98) size 5x20
+ text run at (757,98) width 5: " "
+ RenderImage {IMG} at (761,84) size 16x51
RenderText {#text} at (0,0) size 0x0
RenderInline {SMALL} at (0,0) size 194x20
RenderText {#text} at (0,176) size 194x20
@@ -277,12 +277,12 @@
text run at (0,176) width 194: "regardless of the line in which"
RenderText {#text} at (193,176) size 5x20
text run at (193,176) width 5: " "
- RenderImage {IMG} at (197,180) size 6x16
- RenderText {#text} at (202,176) size 5x20
- text run at (202,176) width 5: " "
- RenderInline {BIG} at (0,0) size 156x25
- RenderText {#text} at (206,172) size 156x25
- text run at (206,172) width 156: "the images appear."
+ RenderImage {IMG} at (197,180) size 5x16
+ RenderText {#text} at (201,176) size 5x20
+ text run at (201,176) width 5: " "
+ RenderInline {BIG} at (0,0) size 157x25
+ RenderText {#text} at (205,172) size 157x25
+ text run at (205,172) width 157: "the images appear."
RenderText {#text} at (361,176) size 5x20
text run at (361,176) width 5: " "
RenderImage {IMG} at (365,142) size 28x91
@@ -339,36 +339,36 @@
text run at (70,47) width 77: "all of which"
RenderText {#text} at (146,47) size 5x19
text run at (146,47) width 5: " "
- RenderImage {IMG} at (150,47) size 21x65
- RenderText {#text} at (170,47) size 5x19
- text run at (170,47) width 5: " "
+ RenderImage {IMG} at (150,47) size 20x65
+ RenderText {#text} at (169,47) size 5x19
+ text run at (169,47) width 5: " "
RenderInline {SPAN} at (0,0) size 114x19
- RenderText {#text} at (174,47) size 114x19
- text run at (174,47) width 114: "should be aligned"
- RenderText {#text} at (287,47) size 5x19
- text run at (287,47) width 5: " "
- RenderImage {IMG} at (291,47) size 12x35
- RenderText {#text} at (302,47) size 5x19
- text run at (302,47) width 5: " "
+ RenderText {#text} at (173,47) size 114x19
+ text run at (173,47) width 114: "should be aligned"
+ RenderText {#text} at (286,47) size 5x19
+ text run at (286,47) width 5: " "
+ RenderImage {IMG} at (290,47) size 12x35
+ RenderText {#text} at (301,47) size 5x19
+ text run at (301,47) width 5: " "
RenderInline {SPAN} at (0,0) size 188x36
- RenderText {#text} at (306,48) size 188x36
- text run at (306,48) width 188: "with the top of"
- RenderText {#text} at (493,47) size 5x19
- text run at (493,47) width 5: " "
- RenderImage {IMG} at (497,47) size 16x50
- RenderText {#text} at (512,47) size 5x19
- text run at (512,47) width 5: " "
+ RenderText {#text} at (305,48) size 188x36
+ text run at (305,48) width 188: "with the top of"
+ RenderText {#text} at (492,47) size 5x19
+ text run at (492,47) width 5: " "
+ RenderImage {IMG} at (496,47) size 16x50
+ RenderText {#text} at (511,47) size 5x19
+ text run at (511,47) width 5: " "
RenderInline {SPAN} at (0,0) size 134x19
- RenderText {#text} at (516,47) size 134x19
- text run at (516,47) width 134: "the tallest element in"
- RenderText {#text} at (649,47) size 5x19
- text run at (649,47) width 5: " "
- RenderImage {IMG} at (653,47) size 6x15
- RenderText {#text} at (658,47) size 5x19
- text run at (658,47) width 5: " "
- RenderInline {BIG} at (0,0) size 751x89
- RenderText {#text} at (662,47) size 751x89
- text run at (662,47) width 89: "whichever"
+ RenderText {#text} at (515,47) size 134x19
+ text run at (515,47) width 134: "the tallest element in"
+ RenderText {#text} at (648,47) size 5x19
+ text run at (648,47) width 5: " "
+ RenderImage {IMG} at (652,47) size 6x15
+ RenderText {#text} at (657,47) size 5x19
+ text run at (657,47) width 5: " "
+ RenderInline {BIG} at (0,0) size 749x89
+ RenderText {#text} at (661,47) size 749x89
+ text run at (661,47) width 88: "whichever"
text run at (0,112) width 208: "line the elements appear."
RenderText {#text} at (207,112) size 5x19
text run at (207,112) width 5: " "
@@ -521,20 +521,20 @@
RenderInline {SPAN} at (0,0) size 262x42
RenderText {#text} at (205,107) size 262x42
text run at (205,107) width 262: "should be aligned"
- RenderText {#text} at (466,123) size 6x22
- text run at (466,123) width 6: " "
- RenderImage {IMG} at (471,123) size 12x35
- RenderText {#text} at (482,123) size 122x22
- text run at (482,123) width 122: " with the top of "
- RenderImage {IMG} at (603,123) size 10x30
- RenderText {#text} at (612,123) size 5x22
- text run at (612,123) width 5: " "
- RenderInline {SPAN} at (0,0) size 730x144
- RenderText {#text} at (616,115) size 21x32
- text run at (616,115) width 21: "a "
- RenderInline {SPAN} at (0,0) size 730x191
- RenderText {#text} at (636,77) size 730x191
- text run at (636,77) width 94: "14-"
+ RenderText {#text} at (466,123) size 5x22
+ text run at (466,123) width 5: " "
+ RenderImage {IMG} at (470,123) size 12x35
+ RenderText {#text} at (481,123) size 122x22
+ text run at (481,123) width 122: " with the top of "
+ RenderImage {IMG} at (602,123) size 10x30
+ RenderText {#text} at (611,123) size 5x22
+ text run at (611,123) width 5: " "
+ RenderInline {SPAN} at (0,0) size 729x144
+ RenderText {#text} at (615,115) size 21x32
+ text run at (615,115) width 21: "a "
+ RenderInline {SPAN} at (0,0) size 729x191
+ RenderText {#text} at (635,77) size 729x191
+ text run at (635,77) width 94: "14-"
text run at (0,189) width 144: "point"
RenderText {#text} at (143,227) size 146x32
text run at (143,227) width 146: " text element"
@@ -548,15 +548,15 @@
text run at (313,237) width 194: "regardless of the line in which"
RenderText {#text} at (506,235) size 6x22
text run at (506,235) width 6: " "
- RenderImage {IMG} at (511,235) size 6x15
- RenderText {#text} at (516,235) size 5x22
- text run at (516,235) width 5: " "
- RenderInline {BIG} at (0,0) size 157x24
- RenderText {#text} at (520,233) size 157x24
- text run at (520,233) width 157: "the images appear."
- RenderText {#text} at (676,235) size 6x22
- text run at (676,235) width 6: " "
- RenderImage {IMG} at (681,235) size 28x90
+ RenderImage {IMG} at (511,235) size 5x15
+ RenderText {#text} at (515,235) size 6x22
+ text run at (515,235) width 6: " "
+ RenderInline {BIG} at (0,0) size 156x24
+ RenderText {#text} at (520,233) size 156x24
+ text run at (520,233) width 156: "the images appear."
+ RenderText {#text} at (675,235) size 6x22
+ text run at (675,235) width 6: " "
+ RenderImage {IMG} at (680,235) size 28x90
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (4,1482) size 762x41
RenderText {#text} at (0,0) size 746x39
@@ -588,28 +588,28 @@
RenderText {#text} at (699,22) size 737x96
text run at (699,22) width 38: " all of"
text run at (0,98) width 44: "which "
- RenderImage {IMG} at (43,77) size 21x66
- RenderText {#text} at (63,98) size 121x20
- text run at (63,98) width 121: " should be aligned "
- RenderImage {IMG} at (183,92) size 12x36
- RenderText {#text} at (194,98) size 5x20
- text run at (194,98) width 5: " "
+ RenderImage {IMG} at (43,77) size 20x66
+ RenderText {#text} at (62,98) size 122x20
+ text run at (62,98) width 122: " should be aligned "
+ RenderImage {IMG} at (183,92) size 11x36
+ RenderText {#text} at (193,98) size 5x20
+ text run at (193,98) width 5: " "
RenderInline {SPAN} at (0,0) size 237x37
- RenderText {#text} at (198,84) size 237x37
- text run at (198,84) width 237: "with the middle of"
- RenderText {#text} at (434,98) size 5x20
- text run at (434,98) width 5: " "
- RenderImage {IMG} at (438,84) size 16x51
- RenderText {#text} at (453,98) size 5x20
- text run at (453,98) width 5: " "
- RenderInline {SPAN} at (0,0) size 720x107
- RenderText {#text} at (457,91) size 18x29
- text run at (457,91) width 18: "a "
+ RenderText {#text} at (197,84) size 237x37
+ text run at (197,84) width 237: "with the middle of"
+ RenderText {#text} at (433,98) size 5x20
+ text run at (433,98) width 5: " "
+ RenderImage {IMG} at (437,84) size 16x51
+ RenderText {#text} at (452,98) size 5x20
+ text run at (452,98) width 5: " "
+ RenderInline {SPAN} at (0,0) size 719x107
+ RenderText {#text} at (456,91) size 18x29
+ text run at (456,91) width 18: "a "
RenderInline {SPAN} at (0,0) size 204x68
- RenderText {#text} at (474,59) size 204x68
- text run at (474,59) width 204: "14-point"
- RenderText {#text} at (677,91) size 720x107
- text run at (677,91) width 43: " text"
+ RenderText {#text} at (473,59) size 204x68
+ text run at (473,59) width 204: "14-point"
+ RenderText {#text} at (676,91) size 719x107
+ text run at (676,91) width 43: " text"
text run at (0,169) width 76: "element"
RenderText {#text} at (75,176) size 5x20
text run at (75,176) width 5: " "
@@ -621,12 +621,12 @@
text run at (98,176) width 195: "regardless of the line in which"
RenderText {#text} at (292,176) size 5x20
text run at (292,176) width 5: " "
- RenderImage {IMG} at (296,180) size 6x16
- RenderText {#text} at (301,176) size 5x20
- text run at (301,176) width 5: " "
- RenderInline {BIG} at (0,0) size 156x25
- RenderText {#text} at (305,172) size 156x25
- text run at (305,172) width 156: "the images appear."
+ RenderImage {IMG} at (296,180) size 5x16
+ RenderText {#text} at (300,176) size 5x20
+ text run at (300,176) width 5: " "
+ RenderInline {BIG} at (0,0) size 157x25
+ RenderText {#text} at (304,172) size 157x25
+ text run at (304,172) width 157: "the images appear."
RenderText {#text} at (460,176) size 5x20
text run at (460,176) width 5: " "
RenderImage {IMG} at (464,142) size 28x91
@@ -683,36 +683,36 @@
text run at (70,47) width 77: "all of which"
RenderText {#text} at (146,47) size 5x19
text run at (146,47) width 5: " "
- RenderImage {IMG} at (150,47) size 21x65
- RenderText {#text} at (170,47) size 5x19
- text run at (170,47) width 5: " "
+ RenderImage {IMG} at (150,47) size 20x65
+ RenderText {#text} at (169,47) size 5x19
+ text run at (169,47) width 5: " "
RenderInline {SPAN} at (0,0) size 114x19
- RenderText {#text} at (174,47) size 114x19
- text run at (174,47) width 114: "should be aligned"
- RenderText {#text} at (287,47) size 5x19
- text run at (287,47) width 5: " "
- RenderImage {IMG} at (291,47) size 12x35
- RenderText {#text} at (302,47) size 5x19
- text run at (302,47) width 5: " "
+ RenderText {#text} at (173,47) size 114x19
+ text run at (173,47) width 114: "should be aligned"
+ RenderText {#text} at (286,47) size 5x19
+ text run at (286,47) width 5: " "
+ RenderImage {IMG} at (290,47) size 12x35
+ RenderText {#text} at (301,47) size 5x19
+ text run at (301,47) width 5: " "
RenderInline {SPAN} at (0,0) size 188x36
- RenderText {#text} at (306,48) size 188x36
- text run at (306,48) width 188: "with the top of"
- RenderText {#text} at (493,47) size 5x19
- text run at (493,47) width 5: " "
- RenderImage {IMG} at (497,47) size 16x50
- RenderText {#text} at (512,47) size 5x19
- text run at (512,47) width 5: " "
+ RenderText {#text} at (305,48) size 188x36
+ text run at (305,48) width 188: "with the top of"
+ RenderText {#text} at (492,47) size 5x19
+ text run at (492,47) width 5: " "
+ RenderImage {IMG} at (496,47) size 16x50
+ RenderText {#text} at (511,47) size 5x19
+ text run at (511,47) width 5: " "
RenderInline {SPAN} at (0,0) size 134x19
- RenderText {#text} at (516,47) size 134x19
- text run at (516,47) width 134: "the tallest element in"
- RenderText {#text} at (649,47) size 5x19
- text run at (649,47) width 5: " "
- RenderImage {IMG} at (653,47) size 6x15
- RenderText {#text} at (658,47) size 5x19
- text run at (658,47) width 5: " "
- RenderInline {BIG} at (0,0) size 751x89
- RenderText {#text} at (662,47) size 751x89
- text run at (662,47) width 89: "whichever"
+ RenderText {#text} at (515,47) size 134x19
+ text run at (515,47) width 134: "the tallest element in"
+ RenderText {#text} at (648,47) size 5x19
+ text run at (648,47) width 5: " "
+ RenderImage {IMG} at (652,47) size 6x15
+ RenderText {#text} at (657,47) size 5x19
+ text run at (657,47) width 5: " "
+ RenderInline {BIG} at (0,0) size 749x89
+ RenderText {#text} at (661,47) size 749x89
+ text run at (661,47) width 88: "whichever"
text run at (0,112) width 208: "line the elements appear."
RenderText {#text} at (207,112) size 5x19
text run at (207,112) width 5: " "
Modified: trunk/LayoutTests/platform/ios/fast/replaced/width100percent-image-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/ios/fast/replaced/width100percent-image-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/ios/fast/replaced/width100percent-image-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -28,10 +28,10 @@
RenderTableRow {TR} at (0,1) size 784x277
RenderTableCell {TD} at (1,1) size 216x277 [r=0 c=0 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (218,1) size 216x277 [r=0 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (217,1) size 217x277 [r=0 c=1 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (435,1) size 216x277 [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (434,1) size 217x277 [r=0 c=2 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (652,128) size 131x23 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (651,128) size 132x23 [r=0 c=3 rs=1 cs=1]
RenderText {#text} at (1,0) size 4x21
text run at (1,1) width 4: " "
Modified: trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug14929-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug14929-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/ios/tables/mozilla/bugs/bug14929-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -28,7 +28,7 @@
RenderTableSection {TBODY} at (1,1) size 638x52
RenderTableRow {TR} at (0,2) size 638x22
RenderTableCell {TD} at (2,2) size 635x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
- RenderImage {IMG} at (2,2) size 190x18
+ RenderImage {IMG} at (2,2) size 190x19
RenderTableRow {TR} at (0,26) size 638x24
RenderTableCell {TD} at (2,26) size 127x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 58x19
Modified: trunk/LayoutTests/platform/ios/tables/mozilla_expected_failures/bugs/bug85016-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/ios/tables/mozilla_expected_failures/bugs/bug85016-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/ios/tables/mozilla_expected_failures/bugs/bug85016-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -12,7 +12,7 @@
text run at (0,0) width 550: "percentage height images in DIV with no height (red) in a DIV with no height (green)"
RenderBlock {DIV} at (32,752) size 672x672 [border: (3px dotted #008000)]
RenderBlock {DIV} at (35,35) size 602x602 [border: (1px solid #FF0000)]
- RenderImage {IMG} at (1,1) size 882x600
+ RenderImage {IMG} at (1,1) size 883x600
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,1456) size 736x20
RenderText {#text} at (0,0) size 481x19
Modified: trunk/LayoutTests/platform/mac/css1/box_properties/width-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/mac/css1/box_properties/width-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/mac/css1/box_properties/width-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -59,7 +59,7 @@
RenderText {#text} at (0,0) size 291x18
text run at (0,0) width 291: "The square above should be fifty pixels wide."
RenderBlock (anonymous) at (4,104) size 363x181
- RenderImage {IMG} at (0,0) size 182x181
+ RenderImage {IMG} at (0,0) size 182x182
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (4,301) size 363x36
RenderText {#text} at (0,0) size 353x36
Modified: trunk/LayoutTests/platform/mac/css1/formatting_model/replaced_elements-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/mac/css1/formatting_model/replaced_elements-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/mac/css1/formatting_model/replaced_elements-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x2341
+layer at (0,0) size 785x2339
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x2341
- RenderBlock {HTML} at (0,0) size 785x2341
- RenderBody {BODY} at (8,8) size 769x2325 [bgcolor=#CCCCCC]
+layer at (0,0) size 785x2339
+ RenderBlock {HTML} at (0,0) size 785x2339
+ RenderBody {BODY} at (8,8) size 769x2323 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 769x18
RenderText {#text} at (0,0) size 363x18
text run at (0,0) width 363: "The style declarations which apply to the text below are:"
@@ -38,29 +38,29 @@
RenderText {#text} at (0,0) size 406x18
text run at (0,0) width 406: "The above image should be a 15px square aligned at the center."
RenderImage {IMG} at (192,350) size 385x385
- RenderBlock {P} at (0,751) size 769x36
+ RenderBlock {P} at (0,750) size 769x37
RenderText {#text} at (0,0) size 738x36
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"
text run at (0,18) width 172: "within the parent element: "
text run at (171,18) width 404: "the document body in the first half, and the table in the second."
- RenderImage {IMG} at (384,803) size 385x385
- RenderBlock {P} at (0,1204) size 769x36
+ RenderImage {IMG} at (384,802) size 385x385
+ RenderBlock {P} at (0,1203) size 769x36
RenderText {#text} at (0,0) size 750x36
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"
text run at (0,18) width 127: "the parent element: "
text run at (126,18) width 404: "the document body in the first half, and the table in the second."
- RenderTable {TABLE} at (0,1256) size 769x1069 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 767x1067
+ RenderTable {TABLE} at (0,1255) size 769x1068 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 767x1066
RenderTableRow {TR} at (0,0) size 767x26
RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderInline {STRONG} at (0,0) size 161x18
RenderText {#text} at (4,4) size 161x18
text run at (4,4) width 161: "TABLE Testing Section"
- RenderTableRow {TR} at (0,26) size 767x1041
- RenderTableCell {TD} at (0,533) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
- RenderText {#text} at (4,3) size 4x20
+ RenderTableRow {TR} at (0,26) size 767x1040
+ RenderTableCell {TD} at (0,533) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 4x18
text run at (4,4) width 4: " "
- RenderTableCell {TD} at (12,26) size 755x1041 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (12,26) size 755x1040 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderBlock {P} at (4,4) size 747x19
RenderImage {IMG} at (0,0) size 15x15
RenderText {#text} at (15,1) size 442x18
@@ -74,13 +74,13 @@
RenderText {#text} at (0,0) size 406x18
text run at (0,0) width 406: "The above image should be a 15px square aligned at the center."
RenderImage {IMG} at (190,169) size 375x374
- RenderBlock {P} at (4,559) size 747x36
+ RenderBlock {P} at (4,558) size 747x37
RenderText {#text} at (0,0) size 738x36
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"
text run at (0,18) width 172: "within the parent element: "
text run at (171,18) width 404: "the document body in the first half, and the table in the second."
- RenderImage {IMG} at (377,611) size 374x374
- RenderBlock {P} at (4,1001) size 747x36
+ RenderImage {IMG} at (377,610) size 374x374
+ RenderBlock {P} at (4,1000) size 747x36
RenderText {#text} at (0,0) size 733x36
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"
text run at (0,18) width 144: "of the parent element: "
Modified: trunk/LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -175,25 +175,25 @@
RenderText {#text} at (53,122) size 101x22
text run at (53,122) width 101: " all of which "
RenderImage {IMG} at (153,122) size 21x65
- RenderText {#text} at (173,122) size 6x22
- text run at (173,122) width 6: " "
+ RenderText {#text} at (173,122) size 5x22
+ text run at (173,122) width 5: " "
RenderInline {SPAN} at (0,0) size 262x43
- RenderText {#text} at (178,105) size 262x43
- text run at (178,105) width 262: "should be aligned"
- RenderText {#text} at (439,122) size 6x22
- text run at (439,122) width 6: " "
- RenderImage {IMG} at (444,122) size 12x35
- RenderText {#text} at (455,122) size 122x22
- text run at (455,122) width 122: " with the top of "
- RenderImage {IMG} at (576,122) size 10x30
- RenderText {#text} at (585,122) size 5x22
- text run at (585,122) width 5: " "
- RenderInline {SPAN} at (0,0) size 703x144
- RenderText {#text} at (589,114) size 21x32
- text run at (589,114) width 21: "a "
- RenderInline {SPAN} at (0,0) size 703x194
- RenderText {#text} at (609,75) size 703x194
- text run at (609,75) width 94: "14-"
+ RenderText {#text} at (177,105) size 262x43
+ text run at (177,105) width 262: "should be aligned"
+ RenderText {#text} at (438,122) size 6x22
+ text run at (438,122) width 6: " "
+ RenderImage {IMG} at (443,122) size 12x35
+ RenderText {#text} at (454,122) size 122x22
+ text run at (454,122) width 122: " with the top of "
+ RenderImage {IMG} at (575,122) size 10x30
+ RenderText {#text} at (584,122) size 5x22
+ text run at (584,122) width 5: " "
+ RenderInline {SPAN} at (0,0) size 702x144
+ RenderText {#text} at (588,114) size 21x32
+ text run at (588,114) width 21: "a "
+ RenderInline {SPAN} at (0,0) size 702x194
+ RenderText {#text} at (608,75) size 702x194
+ text run at (608,75) width 94: "14-"
text run at (0,187) width 144: "point"
RenderText {#text} at (143,226) size 146x32
text run at (143,226) width 146: " text element"
@@ -207,15 +207,15 @@
text run at (313,237) width 194: "regardless of the line in which"
RenderText {#text} at (506,234) size 6x22
text run at (506,234) width 6: " "
- RenderImage {IMG} at (511,234) size 6x15
- RenderText {#text} at (516,234) size 5x22
- text run at (516,234) width 5: " "
- RenderInline {BIG} at (0,0) size 157x24
- RenderText {#text} at (520,232) size 157x24
- text run at (520,232) width 157: "the images appear."
- RenderText {#text} at (676,234) size 6x22
- text run at (676,234) width 6: " "
- RenderImage {IMG} at (681,234) size 28x90
+ RenderImage {IMG} at (511,234) size 5x15
+ RenderText {#text} at (515,234) size 6x22
+ text run at (515,234) width 6: " "
+ RenderInline {BIG} at (0,0) size 156x24
+ RenderText {#text} at (520,232) size 156x24
+ text run at (520,232) width 156: "the images appear."
+ RenderText {#text} at (675,234) size 6x22
+ text run at (675,234) width 6: " "
+ RenderImage {IMG} at (680,234) size 28x90
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,1785) size 769x37
RenderText {#text} at (0,0) size 765x36
@@ -247,28 +247,28 @@
RenderText {#text} at (699,22) size 737x94
text run at (699,22) width 38: " all of"
text run at (0,97) width 44: "which "
- RenderImage {IMG} at (43,75) size 21x66
- RenderText {#text} at (63,97) size 121x19
- text run at (63,97) width 121: " should be aligned "
- RenderImage {IMG} at (183,90) size 12x36
- RenderText {#text} at (194,97) size 5x19
- text run at (194,97) width 5: " "
+ RenderImage {IMG} at (43,75) size 20x66
+ RenderText {#text} at (62,97) size 122x19
+ text run at (62,97) width 122: " should be aligned "
+ RenderImage {IMG} at (183,90) size 11x36
+ RenderText {#text} at (193,97) size 5x19
+ text run at (193,97) width 5: " "
RenderInline {SPAN} at (0,0) size 237x38
- RenderText {#text} at (198,82) size 237x38
- text run at (198,82) width 237: "with the middle of"
- RenderText {#text} at (434,97) size 5x19
- text run at (434,97) width 5: " "
- RenderImage {IMG} at (438,82) size 16x51
- RenderText {#text} at (453,97) size 5x19
- text run at (453,97) width 5: " "
- RenderInline {SPAN} at (0,0) size 720x107
- RenderText {#text} at (457,89) size 18x29
- text run at (457,89) width 18: "a "
+ RenderText {#text} at (197,82) size 237x38
+ text run at (197,82) width 237: "with the middle of"
+ RenderText {#text} at (433,97) size 5x19
+ text run at (433,97) width 5: " "
+ RenderImage {IMG} at (437,82) size 16x51
+ RenderText {#text} at (452,97) size 5x19
+ text run at (452,97) width 5: " "
+ RenderInline {SPAN} at (0,0) size 719x107
+ RenderText {#text} at (456,89) size 18x29
+ text run at (456,89) width 18: "a "
RenderInline {SPAN} at (0,0) size 204x70
- RenderText {#text} at (474,57) size 204x70
- text run at (474,57) width 204: "14-point"
- RenderText {#text} at (677,89) size 720x107
- text run at (677,89) width 43: " text"
+ RenderText {#text} at (473,57) size 204x70
+ text run at (473,57) width 204: "14-point"
+ RenderText {#text} at (676,89) size 719x107
+ text run at (676,89) width 43: " text"
text run at (0,167) width 76: "element"
RenderText {#text} at (75,175) size 5x19
text run at (75,175) width 5: " "
@@ -280,12 +280,12 @@
text run at (98,175) width 195: "regardless of the line in which"
RenderText {#text} at (292,175) size 5x19
text run at (292,175) width 5: " "
- RenderImage {IMG} at (296,178) size 6x16
- RenderText {#text} at (301,175) size 5x19
- text run at (301,175) width 5: " "
- RenderInline {BIG} at (0,0) size 156x25
- RenderText {#text} at (305,170) size 156x25
- text run at (305,170) width 156: "the images appear."
+ RenderImage {IMG} at (296,178) size 5x16
+ RenderText {#text} at (300,175) size 5x19
+ text run at (300,175) width 5: " "
+ RenderInline {BIG} at (0,0) size 157x25
+ RenderText {#text} at (304,170) size 157x25
+ text run at (304,170) width 157: "the images appear."
RenderText {#text} at (460,175) size 5x19
text run at (460,175) width 5: " "
RenderImage {IMG} at (464,140) size 28x91
@@ -342,36 +342,36 @@
text run at (70,46) width 77: "all of which"
RenderText {#text} at (146,46) size 5x18
text run at (146,46) width 5: " "
- RenderImage {IMG} at (150,46) size 21x65
- RenderText {#text} at (170,46) size 5x18
- text run at (170,46) width 5: " "
+ RenderImage {IMG} at (150,46) size 20x65
+ RenderText {#text} at (169,46) size 5x18
+ text run at (169,46) width 5: " "
RenderInline {SPAN} at (0,0) size 114x18
- RenderText {#text} at (174,46) size 114x18
- text run at (174,46) width 114: "should be aligned"
- RenderText {#text} at (287,46) size 5x18
- text run at (287,46) width 5: " "
- RenderImage {IMG} at (291,46) size 12x35
- RenderText {#text} at (302,46) size 5x18
- text run at (302,46) width 5: " "
+ RenderText {#text} at (173,46) size 114x18
+ text run at (173,46) width 114: "should be aligned"
+ RenderText {#text} at (286,46) size 5x18
+ text run at (286,46) width 5: " "
+ RenderImage {IMG} at (290,46) size 12x35
+ RenderText {#text} at (301,46) size 5x18
+ text run at (301,46) width 5: " "
RenderInline {SPAN} at (0,0) size 188x37
- RenderText {#text} at (306,46) size 188x37
- text run at (306,46) width 188: "with the top of"
- RenderText {#text} at (493,46) size 5x18
- text run at (493,46) width 5: " "
- RenderImage {IMG} at (497,46) size 16x50
- RenderText {#text} at (512,46) size 5x18
- text run at (512,46) width 5: " "
+ RenderText {#text} at (305,46) size 188x37
+ text run at (305,46) width 188: "with the top of"
+ RenderText {#text} at (492,46) size 5x18
+ text run at (492,46) width 5: " "
+ RenderImage {IMG} at (496,46) size 16x50
+ RenderText {#text} at (511,46) size 5x18
+ text run at (511,46) width 5: " "
RenderInline {SPAN} at (0,0) size 134x18
- RenderText {#text} at (516,46) size 134x18
- text run at (516,46) width 134: "the tallest element in"
- RenderText {#text} at (649,46) size 5x18
- text run at (649,46) width 5: " "
- RenderImage {IMG} at (653,46) size 6x15
- RenderText {#text} at (658,46) size 5x18
- text run at (658,46) width 5: " "
- RenderInline {BIG} at (0,0) size 751x89
- RenderText {#text} at (662,46) size 751x89
- text run at (662,46) width 89: "whichever"
+ RenderText {#text} at (515,46) size 134x18
+ text run at (515,46) width 134: "the tallest element in"
+ RenderText {#text} at (648,46) size 5x18
+ text run at (648,46) width 5: " "
+ RenderImage {IMG} at (652,46) size 6x15
+ RenderText {#text} at (657,46) size 5x18
+ text run at (657,46) width 5: " "
+ RenderInline {BIG} at (0,0) size 749x89
+ RenderText {#text} at (661,46) size 749x89
+ text run at (661,46) width 88: "whichever"
text run at (0,111) width 208: "line the elements appear."
RenderText {#text} at (207,111) size 5x18
text run at (207,111) width 5: " "
@@ -524,20 +524,20 @@
RenderInline {SPAN} at (0,0) size 262x43
RenderText {#text} at (205,105) size 262x43
text run at (205,105) width 262: "should be aligned"
- RenderText {#text} at (466,122) size 6x22
- text run at (466,122) width 6: " "
- RenderImage {IMG} at (471,122) size 12x35
- RenderText {#text} at (482,122) size 122x22
- text run at (482,122) width 122: " with the top of "
- RenderImage {IMG} at (603,122) size 10x30
- RenderText {#text} at (612,122) size 5x22
- text run at (612,122) width 5: " "
- RenderInline {SPAN} at (0,0) size 730x144
- RenderText {#text} at (616,114) size 21x32
- text run at (616,114) width 21: "a "
- RenderInline {SPAN} at (0,0) size 730x194
- RenderText {#text} at (636,75) size 730x194
- text run at (636,75) width 94: "14-"
+ RenderText {#text} at (466,122) size 5x22
+ text run at (466,122) width 5: " "
+ RenderImage {IMG} at (470,122) size 12x35
+ RenderText {#text} at (481,122) size 122x22
+ text run at (481,122) width 122: " with the top of "
+ RenderImage {IMG} at (602,122) size 10x30
+ RenderText {#text} at (611,122) size 5x22
+ text run at (611,122) width 5: " "
+ RenderInline {SPAN} at (0,0) size 729x144
+ RenderText {#text} at (615,114) size 21x32
+ text run at (615,114) width 21: "a "
+ RenderInline {SPAN} at (0,0) size 729x194
+ RenderText {#text} at (635,75) size 729x194
+ text run at (635,75) width 94: "14-"
text run at (0,187) width 144: "point"
RenderText {#text} at (143,226) size 146x32
text run at (143,226) width 146: " text element"
@@ -551,15 +551,15 @@
text run at (313,237) width 194: "regardless of the line in which"
RenderText {#text} at (506,234) size 6x22
text run at (506,234) width 6: " "
- RenderImage {IMG} at (511,234) size 6x15
- RenderText {#text} at (516,234) size 5x22
- text run at (516,234) width 5: " "
- RenderInline {BIG} at (0,0) size 157x24
- RenderText {#text} at (520,232) size 157x24
- text run at (520,232) width 157: "the images appear."
- RenderText {#text} at (676,234) size 6x22
- text run at (676,234) width 6: " "
- RenderImage {IMG} at (681,234) size 28x90
+ RenderImage {IMG} at (511,234) size 5x15
+ RenderText {#text} at (515,234) size 6x22
+ text run at (515,234) width 6: " "
+ RenderInline {BIG} at (0,0) size 156x24
+ RenderText {#text} at (520,232) size 156x24
+ text run at (520,232) width 156: "the images appear."
+ RenderText {#text} at (675,234) size 6x22
+ text run at (675,234) width 6: " "
+ RenderImage {IMG} at (680,234) size 28x90
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (4,1454) size 747x37
RenderText {#text} at (0,0) size 746x36
@@ -591,28 +591,28 @@
RenderText {#text} at (699,22) size 737x94
text run at (699,22) width 38: " all of"
text run at (0,97) width 44: "which "
- RenderImage {IMG} at (43,75) size 21x66
- RenderText {#text} at (63,97) size 121x19
- text run at (63,97) width 121: " should be aligned "
- RenderImage {IMG} at (183,90) size 12x36
- RenderText {#text} at (194,97) size 5x19
- text run at (194,97) width 5: " "
+ RenderImage {IMG} at (43,75) size 20x66
+ RenderText {#text} at (62,97) size 122x19
+ text run at (62,97) width 122: " should be aligned "
+ RenderImage {IMG} at (183,90) size 11x36
+ RenderText {#text} at (193,97) size 5x19
+ text run at (193,97) width 5: " "
RenderInline {SPAN} at (0,0) size 237x38
- RenderText {#text} at (198,82) size 237x38
- text run at (198,82) width 237: "with the middle of"
- RenderText {#text} at (434,97) size 5x19
- text run at (434,97) width 5: " "
- RenderImage {IMG} at (438,82) size 16x51
- RenderText {#text} at (453,97) size 5x19
- text run at (453,97) width 5: " "
- RenderInline {SPAN} at (0,0) size 720x107
- RenderText {#text} at (457,89) size 18x29
- text run at (457,89) width 18: "a "
+ RenderText {#text} at (197,82) size 237x38
+ text run at (197,82) width 237: "with the middle of"
+ RenderText {#text} at (433,97) size 5x19
+ text run at (433,97) width 5: " "
+ RenderImage {IMG} at (437,82) size 16x51
+ RenderText {#text} at (452,97) size 5x19
+ text run at (452,97) width 5: " "
+ RenderInline {SPAN} at (0,0) size 719x107
+ RenderText {#text} at (456,89) size 18x29
+ text run at (456,89) width 18: "a "
RenderInline {SPAN} at (0,0) size 204x70
- RenderText {#text} at (474,57) size 204x70
- text run at (474,57) width 204: "14-point"
- RenderText {#text} at (677,89) size 720x107
- text run at (677,89) width 43: " text"
+ RenderText {#text} at (473,57) size 204x70
+ text run at (473,57) width 204: "14-point"
+ RenderText {#text} at (676,89) size 719x107
+ text run at (676,89) width 43: " text"
text run at (0,167) width 76: "element"
RenderText {#text} at (75,175) size 5x19
text run at (75,175) width 5: " "
@@ -624,12 +624,12 @@
text run at (98,175) width 195: "regardless of the line in which"
RenderText {#text} at (292,175) size 5x19
text run at (292,175) width 5: " "
- RenderImage {IMG} at (296,178) size 6x16
- RenderText {#text} at (301,175) size 5x19
- text run at (301,175) width 5: " "
- RenderInline {BIG} at (0,0) size 156x25
- RenderText {#text} at (305,170) size 156x25
- text run at (305,170) width 156: "the images appear."
+ RenderImage {IMG} at (296,178) size 5x16
+ RenderText {#text} at (300,175) size 5x19
+ text run at (300,175) width 5: " "
+ RenderInline {BIG} at (0,0) size 157x25
+ RenderText {#text} at (304,170) size 157x25
+ text run at (304,170) width 157: "the images appear."
RenderText {#text} at (460,175) size 5x19
text run at (460,175) width 5: " "
RenderImage {IMG} at (464,140) size 28x91
@@ -687,31 +687,31 @@
text run at (70,46) width 77: "all of which"
RenderText {#text} at (146,46) size 5x18
text run at (146,46) width 5: " "
- RenderImage {IMG} at (150,46) size 21x65
- RenderText {#text} at (170,46) size 5x18
- text run at (170,46) width 5: " "
+ RenderImage {IMG} at (150,46) size 20x65
+ RenderText {#text} at (169,46) size 5x18
+ text run at (169,46) width 5: " "
RenderInline {SPAN} at (0,0) size 114x18
- RenderText {#text} at (174,46) size 114x18
- text run at (174,46) width 114: "should be aligned"
- RenderText {#text} at (287,46) size 5x18
- text run at (287,46) width 5: " "
- RenderImage {IMG} at (291,46) size 12x35
- RenderText {#text} at (302,46) size 5x18
- text run at (302,46) width 5: " "
+ RenderText {#text} at (173,46) size 114x18
+ text run at (173,46) width 114: "should be aligned"
+ RenderText {#text} at (286,46) size 5x18
+ text run at (286,46) width 5: " "
+ RenderImage {IMG} at (290,46) size 12x35
+ RenderText {#text} at (301,46) size 5x18
+ text run at (301,46) width 5: " "
RenderInline {SPAN} at (0,0) size 188x37
- RenderText {#text} at (306,46) size 188x37
- text run at (306,46) width 188: "with the top of"
- RenderText {#text} at (493,46) size 5x18
- text run at (493,46) width 5: " "
- RenderImage {IMG} at (497,46) size 16x50
- RenderText {#text} at (512,46) size 5x18
- text run at (512,46) width 5: " "
+ RenderText {#text} at (305,46) size 188x37
+ text run at (305,46) width 188: "with the top of"
+ RenderText {#text} at (492,46) size 5x18
+ text run at (492,46) width 5: " "
+ RenderImage {IMG} at (496,46) size 16x50
+ RenderText {#text} at (511,46) size 5x18
+ text run at (511,46) width 5: " "
RenderInline {SPAN} at (0,0) size 134x18
- RenderText {#text} at (516,46) size 134x18
- text run at (516,46) width 134: "the tallest element in"
- RenderText {#text} at (649,46) size 5x18
- text run at (649,46) width 5: " "
- RenderImage {IMG} at (653,46) size 6x15
+ RenderText {#text} at (515,46) size 134x18
+ text run at (515,46) width 134: "the tallest element in"
+ RenderText {#text} at (648,46) size 5x18
+ text run at (648,46) width 5: " "
+ RenderImage {IMG} at (652,46) size 6x15
RenderText {#text} at (0,0) size 0x0
RenderInline {BIG} at (0,0) size 301x24
RenderText {#text} at (0,111) size 301x24
Modified: trunk/LayoutTests/platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -11,4 +11,4 @@
text run at (226,0) width 310: "https://bugs.webkit.org/show_bug.cgi?id=40142"
RenderBlock {DIV} at (0,34) size 800x152
RenderBlock {DIV} at (0,0) size 402x152 [border: (1px solid #DDDDDD)]
- RenderImage {IMG} at (155,1) size 92x100
+ RenderImage {IMG} at (154,1) size 94x100
Modified: trunk/LayoutTests/platform/mac/fast/replaced/width100percent-image-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/mac/fast/replaced/width100percent-image-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/mac/fast/replaced/width100percent-image-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -28,10 +28,10 @@
RenderTableRow {TR} at (0,1) size 784x277
RenderTableCell {TD} at (1,1) size 216x277 [r=0 c=0 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (218,1) size 216x277 [r=0 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (217,1) size 217x277 [r=0 c=1 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (435,1) size 216x277 [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (434,1) size 217x277 [r=0 c=2 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (652,129) size 131x21 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (651,129) size 132x21 [r=0 c=3 rs=1 cs=1]
RenderText {#text} at (1,0) size 4x20
text run at (1,1) width 4: " "
Modified: trunk/LayoutTests/platform/mac/svg/wicd/test-rightsizing-b-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/mac/svg/wicd/test-rightsizing-b-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/mac/svg/wicd/test-rightsizing-b-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -11,7 +11,7 @@
RenderText {#text} at (0,0) size 137x16
text run at (0,0) width 137: "WICD Core 1.0 #20-2"
RenderBlock (anonymous) at (0,66) size 738x300
- RenderEmbeddedObject {object} at (0,0) size 296x295 [bgcolor=#FF0000]
+ RenderEmbeddedObject {object} at (0,0) size 296x296 [bgcolor=#FF0000]
layer at (0,0) size 295x295
RenderView at (0,0) size 295x295
layer at (0,0) size 295x295
@@ -75,7 +75,7 @@
RenderText {#text} at (0,48) size 398x16
text run at (0,48) width 398: "Beyond there is the same, only with PNG images instead of SVG."
RenderBlock (anonymous) at (0,437) size 738x300
- RenderImage {object} at (0,0) size 296x295 [bgcolor=#FF0000]
+ RenderImage {object} at (0,0) size 296x296 [bgcolor=#FF0000]
RenderText {#text} at (295,281) size 5x17
text run at (295,281) width 5: " "
RenderImage {object} at (299,147) size 149x148 [bgcolor=#FF0000]
Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug14929-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug14929-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug14929-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -28,7 +28,7 @@
RenderTableSection {TBODY} at (1,1) size 638x50
RenderTableRow {TR} at (0,2) size 638x22
RenderTableCell {TD} at (2,2) size 635x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
- RenderImage {IMG} at (2,2) size 190x18
+ RenderImage {IMG} at (2,2) size 190x19
RenderTableRow {TR} at (0,26) size 638x22
RenderTableCell {TD} at (2,26) size 127x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 58x18
Modified: trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug85016-expected.txt (295700 => 295701)
--- trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug85016-expected.txt 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug85016-expected.txt 2022-06-21 23:28:41 UTC (rev 295701)
@@ -12,7 +12,7 @@
text run at (0,0) width 550: "percentage height images in DIV with no height (red) in a DIV with no height (green)"
RenderBlock {DIV} at (32,735) size 657x657 [border: (3px dotted #008000)]
RenderBlock {DIV} at (35,35) size 587x587 [border: (1px solid #FF0000)]
- RenderImage {IMG} at (1,1) size 860x585
+ RenderImage {IMG} at (1,1) size 861x585
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,1424) size 721x18
RenderText {#text} at (0,0) size 481x18
Modified: trunk/LayoutTests/svg/css/max-width-2-expected.html (295700 => 295701)
--- trunk/LayoutTests/svg/css/max-width-2-expected.html 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/LayoutTests/svg/css/max-width-2-expected.html 2022-06-21 23:28:41 UTC (rev 295701)
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<div style="outline: dashed lightblue; height: 300px; width: 400px;">
- <svg style="background-color: yellow;" width="400" height="133" viewBox="0 0 900 300">
+ <svg style="background-color: yellow;" width="400" height="133.33" viewBox="0 0 900 300">
<rect x="0" y="0" width="900" height="300" />
</svg>
</div>
Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (295700 => 295701)
--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2022-06-21 23:25:32 UTC (rev 295700)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2022-06-21 23:28:41 UTC (rev 295701)
@@ -553,8 +553,8 @@
static inline LayoutUnit resolveWidthForRatio(LayoutUnit borderAndPaddingLogicalHeight, LayoutUnit borderAndPaddingLogicalWidth, LayoutUnit logicalHeight, double aspectRatio, BoxSizing boxSizing)
{
if (boxSizing == BoxSizing::BorderBox)
- return LayoutUnit(round((logicalHeight + borderAndPaddingLogicalHeight) * aspectRatio)) - borderAndPaddingLogicalWidth;
- return LayoutUnit(round(logicalHeight * aspectRatio));
+ return LayoutUnit((logicalHeight + borderAndPaddingLogicalHeight) * aspectRatio) - borderAndPaddingLogicalWidth;
+ return LayoutUnit(logicalHeight * aspectRatio);
}
static inline bool hasIntrinsicSize(RenderBox*contentRenderer, bool hasIntrinsicWidth, bool hasIntrinsicHeight )
@@ -587,7 +587,7 @@
// grid item has an intrinsic size. It is possible (indeed, common) for an SVG graphic to have an intrinsic aspect ratio but not to have an intrinsic
// width or height. There are also elements with intrinsic sizes but without intrinsic ratio (like an iframe).
if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalHeight() && hasIntrinsicSize(contentRenderer, hasIntrinsicWidth, hasIntrinsicHeight))
- return computeReplacedLogicalWidthRespectingMinMaxWidth(roundToInt(round(overridingContentLogicalHeight() * intrinsicRatio)), shouldComputePreferred);
+ return computeReplacedLogicalWidthRespectingMinMaxWidth(overridingContentLogicalHeight() * intrinsicRatio, shouldComputePreferred);
// 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'.
if (computedHeightIsAuto && hasIntrinsicWidth)
@@ -632,8 +632,8 @@
static inline LayoutUnit resolveHeightForRatio(LayoutUnit borderAndPaddingLogicalWidth, LayoutUnit borderAndPaddingLogicalHeight, LayoutUnit logicalWidth, double aspectRatio, BoxSizing boxSizing)
{
if (boxSizing == BoxSizing::BorderBox)
- return LayoutUnit(round((logicalWidth + borderAndPaddingLogicalWidth) / aspectRatio)) - borderAndPaddingLogicalHeight;
- return LayoutUnit(round(logicalWidth / aspectRatio));
+ return LayoutUnit((logicalWidth + borderAndPaddingLogicalWidth) / aspectRatio) - borderAndPaddingLogicalHeight;
+ return LayoutUnit(logicalWidth / aspectRatio);
}
LayoutUnit RenderReplaced::computeReplacedLogicalHeight(std::optional<LayoutUnit> estimatedUsedWidth) const
@@ -655,7 +655,7 @@
// See computeReplacedLogicalHeight() for a similar check for heights.
if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalWidth() && hasIntrinsicSize(contentRenderer, hasIntrinsicWidth, hasIntrinsicHeight))
- return computeReplacedLogicalHeightRespectingMinMaxHeight(roundToInt(round(overridingContentLogicalWidth() / intrinsicRatio)));
+ return computeReplacedLogicalHeightRespectingMinMaxHeight(overridingContentLogicalWidth() / intrinsicRatio);
// 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'.
if (widthIsAuto && hasIntrinsicHeight)
