Title: [271348] trunk
Revision
271348
Author
[email protected]
Date
2021-01-09 05:14:18 -0800 (Sat, 09 Jan 2021)

Log Message

play.google.com: App preview images are clipped
https://bugs.webkit.org/show_bug.cgi?id=220470
<rdar://problem/60258531>

Reviewed by Simon Fraser.

Source/WebCore:

"The baseline of an 'inline-block' is the baseline of its last line box in the normal flow, unless it has either no in-flow line boxes
or if its 'overflow' property has a computed value other than 'visible', in which case the baseline is the bottom margin edge."
https://www.w3.org/TR/CSS22/visudet.html#leading

Test: fast/inline/inline-block-baseline-with-overflow-not-visible.html

* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::inlineBlockBaseline const):

LayoutTests:

Progressions (matching FF and Chrome).

* fast/inline/inline-block-baseline-with-overflow-not-visible-expected.html: Added.
* fast/inline/inline-block-baseline-with-overflow-not-visible.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (271347 => 271348)


--- trunk/LayoutTests/ChangeLog	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/ChangeLog	2021-01-09 13:14:18 UTC (rev 271348)
@@ -1,3 +1,16 @@
+2021-01-09  Zalan Bujtas  <[email protected]>
+
+        play.google.com: App preview images are clipped
+        https://bugs.webkit.org/show_bug.cgi?id=220470
+        <rdar://problem/60258531>
+
+        Reviewed by Simon Fraser.
+
+        Progressions (matching FF and Chrome).
+
+        * fast/inline/inline-block-baseline-with-overflow-not-visible-expected.html: Added.
+        * fast/inline/inline-block-baseline-with-overflow-not-visible.html: Added.
+
 2021-01-08  Brady Eidson  <[email protected]>
 
         Removing broken test from r271337 until I can fix it.

Modified: trunk/LayoutTests/compositing/geometry/foreground-layer-expected.txt (271347 => 271348)


--- trunk/LayoutTests/compositing/geometry/foreground-layer-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/compositing/geometry/foreground-layer-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -9,7 +9,7 @@
       (children 2
         (GraphicsLayer
           (offsetFromRenderer width=-28 height=-28)
-          (position 10.00 10.00)
+          (position 10.00 80.00)
           (bounds 336.00 336.00)
           (drawsContent 1)
           (children 2

Added: trunk/LayoutTests/fast/inline/inline-block-baseline-with-overflow-not-visible-expected.html (0 => 271348)


--- trunk/LayoutTests/fast/inline/inline-block-baseline-with-overflow-not-visible-expected.html	                        (rev 0)
+++ trunk/LayoutTests/fast/inline/inline-block-baseline-with-overflow-not-visible-expected.html	2021-01-09 13:14:18 UTC (rev 271348)
@@ -0,0 +1,19 @@
+<style>
+.alignwiththis {
+  display:inline-block;
+  height: 200px;
+  width: 200px;
+  background-color: blue;
+}
+.overflowvisible {
+  display: inline-block;
+  height: 200px;
+  width: 200px;
+  background-color: green;
+}
+</style>
+PASS if the boxes below are aligned ("overflow: hidden" -> baseline is the bottom of the margin box).
+<div>
+  <div class=alignwiththis></div>
+  <div class=overflowvisible></div>
+</div>

Added: trunk/LayoutTests/fast/inline/inline-block-baseline-with-overflow-not-visible.html (0 => 271348)


--- trunk/LayoutTests/fast/inline/inline-block-baseline-with-overflow-not-visible.html	                        (rev 0)
+++ trunk/LayoutTests/fast/inline/inline-block-baseline-with-overflow-not-visible.html	2021-01-09 13:14:18 UTC (rev 271348)
@@ -0,0 +1,22 @@
+<style>
+.alignwiththis {
+  display:inline-block;
+  height: 200px;
+  width: 200px;
+  background-color: blue;
+}
+.overflownotvisible {
+  display: inline-block;
+  height: 200px;
+  width: 200px;
+  background-color: green;
+  overflow: hidden;
+}
+</style>
+PASS if the boxes below are aligned ("overflow: hidden" -> baseline is the bottom of the margin box).
+<div>
+  <div class=alignwiththis></div>
+  <div class=overflownotvisible>
+    <div><img src="" style="width: 0px; height: 0px;"></div>
+  </div>
+</div>

Modified: trunk/LayoutTests/fast/sub-pixel/ellipsis-zoom-expected.html (271347 => 271348)


--- trunk/LayoutTests/fast/sub-pixel/ellipsis-zoom-expected.html	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/fast/sub-pixel/ellipsis-zoom-expected.html	2021-01-09 13:14:18 UTC (rev 271348)
@@ -2,41 +2,34 @@
 <html>
     <head>
         <style>
+            .test { height: 40px; font-size: 18px; }
             .test > div { display: inline-block; white-space: nowrap; padding: 0 1px; }
         </style>
     </head>
     <body>
         <div class="test" style="zoom: 0.5;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 0.66;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 0.75;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 0.9;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 1.0;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 1.1;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 1.25;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 1.33;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <p>
             None of the lines above should be truncated.

Modified: trunk/LayoutTests/fast/sub-pixel/ellipsis-zoom.html (271347 => 271348)


--- trunk/LayoutTests/fast/sub-pixel/ellipsis-zoom.html	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/fast/sub-pixel/ellipsis-zoom.html	2021-01-09 13:14:18 UTC (rev 271348)
@@ -2,42 +2,35 @@
 <html>
     <head>
         <style>
-            .test > div { display: inline-block; overflow: hidden; white-space: nowrap; padding: 0 1px; }
+            .test { height: 40px; font-size: 18px; }
+            .test > div { display: inline-block; overflow: hidden; white-space: nowrap; padding: 0 1px;}
             .test > .ellipsis { text-overflow: ellipsis; }
         </style>
     </head>
     <body>
         <div class="test" style="zoom: 0.5;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 0.66;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 0.75;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 0.9;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 1.0;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 1.1;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 1.25;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <div class="test" style="zoom: 1.33;">
-            <div class="ellipsis">Should not be truncated</div><br>
-            <div class="expected">Should not be truncated</div>
+            <div class="ellipsis">Should not be truncated</div>
         </div>
         <p>
             None of the lines above should be truncated.

Modified: trunk/LayoutTests/platform/ios/compositing/geometry/clipping-foreground-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/ios/compositing/geometry/clipping-foreground-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/ios/compositing/geometry/clipping-foreground-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -6,29 +6,29 @@
       RenderBlock {P} at (0,0) size 784x20
         RenderText {#text} at (0,0) size 527x19
           text run at (0,0) width 527: "The layering and positions of the boxes should not be affected by oveflow:hidden."
-      RenderBlock (anonymous) at (0,36) size 784x320
-        RenderText {#text} at (320,150) size 4x19
-          text run at (320,150) width 4: " "
+      RenderBlock (anonymous) at (0,36) size 784x475
+        RenderText {#text} at (320,305) size 4x19
+          text run at (320,305) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-layer at (68,104) size 200x200 layerType: background only
-layer at (28,64) size 150x150
+layer at (68,259) size 200x200 layerType: background only
+layer at (28,219) size 150x150
   RenderBlock (positioned) zI: -1 {DIV} at (-40,-40) size 150x150 [color=#808080] [bgcolor=#C86464] [border: (2px solid #000000)]
     RenderText zI: -1 {#text} at (22,23) size 107x40
       text run at (22,23) width 107: "Behind"
     RenderText zI: -1 {#text} at (0,0) size 0x0
-layer at (50,146) size 100x100
+layer at (50,301) size 100x100
   RenderBlock (positioned) {DIV} at (22,82) size 100x100 [bgcolor=#008000] [border: (2px solid #000000)]
     RenderText {#text} at (22,22) size 56x43
       text run at (22,22) width 56: "Behind"
       text run at (22,44) width 54: "behind"
-layer at (68,104) size 200x200 layerType: foreground only
-  RenderBlock (relative positioned) {DIV} at (60,60) size 200x200 [color=#0000FF] [bgcolor=#FFFFFFCC] [border: (10px solid #000000)]
+layer at (68,259) size 200x200 layerType: foreground only
+  RenderBlock (relative positioned) {DIV} at (60,215) size 200x200 [color=#0000FF] [bgcolor=#FFFFFFCC] [border: (10px solid #000000)]
     RenderText {#text} at (30,31) size 125x82
       text run at (30,31) width 59: "Box"
       text run at (30,73) width 125: "contents"
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (158,194) size 150x150
+layer at (158,349) size 150x150
   RenderBlock (positioned) zI: 1 {DIV} at (90,90) size 150x150 [color=#808080] [bgcolor=#C8C880] [border: (2px solid #000000)]
     RenderText zI: 1 {#text} at (22,23) size 85x82
       text run at (22,23) width 34: "In"

Modified: trunk/LayoutTests/platform/ios/fast/clip/overflow-border-radius-combinations-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/ios/fast/clip/overflow-border-radius-combinations-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/ios/fast/clip/overflow-border-radius-combinations-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -6,13 +6,13 @@
       RenderText {#text} at (0,0) size 467x19
         text run at (0,0) width 467: "The white text and grey backgrounds should all clip to the border-radius."
       RenderBR {BR} at (466,0) size 1x19
-      RenderText {#text} at (240,40) size 4x19
-        text run at (240,40) width 4: " "
-      RenderText {#text} at (484,40) size 4x19
-        text run at (484,40) width 4: " "
+      RenderText {#text} at (240,145) size 4x19
+        text run at (240,145) width 4: " "
+      RenderText {#text} at (484,145) size 4x19
+        text run at (484,145) width 4: " "
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (240,180) size 0x19
+      RenderBR {BR} at (240,290) size 0x19
       RenderText {#text} at (0,0) size 0x0
 layer at (18,38) size 220x120 clip at (28,48) size 200x100
   RenderBlock {DIV} at (10,30) size 220x120 [border: (10px solid #000000)]
@@ -30,15 +30,15 @@
     RenderBlock {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
       RenderText {#text} at (0,0) size 99x19
         text run at (0,0) width 99: "relative > static"
-layer at (18,178) size 220x120 clip at (28,188) size 200x100
-  RenderBlock (relative positioned) {DIV} at (10,170) size 220x120 [border: (10px solid #000000)]
-layer at (28,188) size 200x100
+layer at (18,183) size 220x120 clip at (28,193) size 200x100
+  RenderBlock (relative positioned) {DIV} at (10,175) size 220x120 [border: (10px solid #000000)]
+layer at (28,193) size 200x100
   RenderBlock (relative positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 113x19
       text run at (0,0) width 113: "relative > relative"
-layer at (18,318) size 220x120 clip at (28,328) size 200x100
-  RenderBlock (relative positioned) {DIV} at (10,310) size 220x120 [border: (10px solid #000000)]
-layer at (28,328) size 200x100
+layer at (18,323) size 220x120 clip at (28,333) size 200x100
+  RenderBlock (relative positioned) {DIV} at (10,315) size 220x120 [border: (10px solid #000000)]
+layer at (28,333) size 200x100
   RenderBlock (positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 119x19
       text run at (0,0) width 119: "relative > absolute"

Modified: trunk/LayoutTests/platform/ios/fast/clip/overflow-border-radius-composited-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/ios/fast/clip/overflow-border-radius-composited-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/ios/fast/clip/overflow-border-radius-composited-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -6,13 +6,13 @@
       RenderText {#text} at (0,0) size 467x19
         text run at (0,0) width 467: "The white text and grey backgrounds should all clip to the border-radius."
       RenderBR {BR} at (466,0) size 1x19
-      RenderText {#text} at (240,40) size 4x19
-        text run at (240,40) width 4: " "
-      RenderText {#text} at (484,40) size 4x19
-        text run at (484,40) width 4: " "
+      RenderText {#text} at (240,145) size 4x19
+        text run at (240,145) width 4: " "
+      RenderText {#text} at (484,145) size 4x19
+        text run at (484,145) width 4: " "
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (240,180) size 0x19
+      RenderBR {BR} at (240,290) size 0x19
       RenderText {#text} at (0,0) size 0x0
 layer at (18,38) size 220x120 clip at (28,48) size 200x100 scrollWidth 206 scrollHeight 156
   RenderBlock {DIV} at (10,30) size 220x120 [border: (10px solid #000000)]
@@ -32,15 +32,15 @@
   RenderBlock {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 99x19
       text run at (0,0) width 99: "relative > static"
-layer at (18,178) size 220x120 clip at (28,188) size 200x100 scrollWidth 206 scrollHeight 156
-  RenderBlock (relative positioned) {DIV} at (10,170) size 220x120 [border: (10px solid #000000)]
-layer at (28,188) size 200x100
+layer at (18,183) size 220x120 clip at (28,193) size 200x100 scrollWidth 206 scrollHeight 156
+  RenderBlock (relative positioned) {DIV} at (10,175) size 220x120 [border: (10px solid #000000)]
+layer at (28,193) size 200x100
   RenderBlock (relative positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 113x19
       text run at (0,0) width 113: "relative > relative"
-layer at (18,318) size 220x120 clip at (28,328) size 200x100 scrollWidth 206 scrollHeight 156
-  RenderBlock (relative positioned) {DIV} at (10,310) size 220x120 [border: (10px solid #000000)]
-layer at (28,328) size 200x100
+layer at (18,323) size 220x120 clip at (28,333) size 200x100 scrollWidth 206 scrollHeight 156
+  RenderBlock (relative positioned) {DIV} at (10,315) size 220x120 [border: (10px solid #000000)]
+layer at (28,333) size 200x100
   RenderBlock (positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 119x19
       text run at (0,0) width 119: "relative > absolute"

Modified: trunk/LayoutTests/platform/ios/fast/clip/overflow-border-radius-transformed-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/ios/fast/clip/overflow-border-radius-transformed-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/ios/fast/clip/overflow-border-radius-transformed-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -6,13 +6,13 @@
       RenderText {#text} at (0,0) size 467x19
         text run at (0,0) width 467: "The white text and grey backgrounds should all clip to the border-radius."
       RenderBR {BR} at (466,0) size 1x19
-      RenderText {#text} at (240,40) size 4x19
-        text run at (240,40) width 4: " "
-      RenderText {#text} at (484,40) size 4x19
-        text run at (484,40) width 4: " "
+      RenderText {#text} at (240,145) size 4x19
+        text run at (240,145) width 4: " "
+      RenderText {#text} at (484,145) size 4x19
+        text run at (484,145) width 4: " "
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (240,180) size 0x19
+      RenderBR {BR} at (240,290) size 0x19
       RenderText {#text} at (0,0) size 0x0
 layer at (18,38) size 220x120 clip at (28,48) size 200x100 scrollWidth 206 scrollHeight 156
   RenderBlock {DIV} at (10,30) size 220x120 [border: (10px solid #000000)]
@@ -32,15 +32,15 @@
   RenderBlock {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 99x19
       text run at (0,0) width 99: "relative > static"
-layer at (18,178) size 220x120 clip at (28,188) size 200x100 scrollWidth 206 scrollHeight 156
-  RenderBlock (relative positioned) {DIV} at (10,170) size 220x120 [border: (10px solid #000000)]
-layer at (28,188) size 200x100
+layer at (18,183) size 220x120 clip at (28,193) size 200x100 scrollWidth 206 scrollHeight 156
+  RenderBlock (relative positioned) {DIV} at (10,175) size 220x120 [border: (10px solid #000000)]
+layer at (28,193) size 200x100
   RenderBlock (relative positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 113x19
       text run at (0,0) width 113: "relative > relative"
-layer at (18,318) size 220x120 clip at (28,328) size 200x100 scrollWidth 206 scrollHeight 156
-  RenderBlock (relative positioned) {DIV} at (10,310) size 220x120 [border: (10px solid #000000)]
-layer at (28,328) size 200x100
+layer at (18,323) size 220x120 clip at (28,333) size 200x100 scrollWidth 206 scrollHeight 156
+  RenderBlock (relative positioned) {DIV} at (10,315) size 220x120 [border: (10px solid #000000)]
+layer at (28,333) size 200x100
   RenderBlock (positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 119x19
       text run at (0,0) width 119: "relative > absolute"

Modified: trunk/LayoutTests/platform/ios/fast/forms/auto-fill-button/input-strong-password-auto-fill-button-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/ios/fast/forms/auto-fill-button/input-strong-password-auto-fill-button-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/ios/fast/forms/auto-fill-button/input-strong-password-auto-fill-button-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -1,88 +1,88 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x214
-  RenderBlock {HTML} at (0,0) size 800x214
-    RenderBody {BODY} at (8,16) size 784x190
+layer at (0,0) size 800x220
+  RenderBlock {HTML} at (0,0) size 800x220
+    RenderBody {BODY} at (8,16) size 784x196
       RenderBlock {P} at (0,0) size 784x20
         RenderText {#text} at (0,0) size 758x19
           text run at (0,0) width 758: "This tests that the Strong Password AutoFill button renders in an auto-filled input. It can only be tested in the test tool."
-      RenderBlock {DIV} at (0,36) size 784x154
-        RenderTextControl {INPUT} at (2,14) size 153x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-        RenderText {#text} at (157,13) size 4x19
-          text run at (157,13) width 4: " "
-        RenderTextControl {INPUT} at (163,14) size 153x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-        RenderText {#text} at (318,13) size 4x19
-          text run at (318,13) width 4: " "
-        RenderTextControl {INPUT} at (322,14) size 313x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-        RenderText {#text} at (635,13) size 4x19
-          text run at (635,13) width 4: " "
+      RenderBlock {DIV} at (0,36) size 784x160
+        RenderTextControl {INPUT} at (2,17) size 153x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
+        RenderText {#text} at (157,16) size 4x19
+          text run at (157,16) width 4: " "
+        RenderTextControl {INPUT} at (163,17) size 153x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
+        RenderText {#text} at (318,16) size 4x19
+          text run at (318,16) width 4: " "
+        RenderTextControl {INPUT} at (322,17) size 313x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
+        RenderText {#text} at (635,16) size 4x19
+          text run at (635,16) width 4: " "
         RenderTextControl {INPUT} at (639,2) size 33x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
         RenderText {#text} at (0,0) size 0x0
-        RenderTextControl {INPUT} at (2,47) size 153x108 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-        RenderText {#text} at (157,90) size 4x19
-          text run at (157,90) width 4: " "
-        RenderTextControl {INPUT} at (161,35) size 33x108 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-        RenderText {#text} at (194,90) size 4x19
-          text run at (194,90) width 4: " "
-        RenderTextControl {INPUT} at (200,91) size 153x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-layer at (17,69) size 140x12 scrollHeight 14
+        RenderTextControl {INPUT} at (2,53) size 153x108 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
+        RenderText {#text} at (157,96) size 4x19
+          text run at (157,96) width 4: " "
+        RenderTextControl {INPUT} at (161,38) size 33x108 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
+        RenderText {#text} at (194,96) size 4x19
+          text run at (194,96) width 4: " "
+        RenderTextControl {INPUT} at (200,97) size 153x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
+layer at (17,72) size 140x12 scrollHeight 15
   RenderFlexibleBox {DIV} at (6,3) size 141x13
-    RenderBlock {DIV} at (45,0) size 95x14 [color=#000000CC]
+    RenderBlock {DIV} at (45,0) size 95x15 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x14
         text run at (6,0) width 89: "Strong Password"
-layer at (17,70) size 46x12 backgroundClip at (17,70) size 45x11 clip at (17,70) size 45x11
-  RenderBlock {DIV} at (0,1) size 46x12
-layer at (178,69) size 140x12 scrollHeight 14
+layer at (17,72) size 46x15 backgroundClip at (17,72) size 45x12 clip at (17,72) size 45x12
+  RenderBlock {DIV} at (0,0) size 46x15
+layer at (178,72) size 140x12 scrollHeight 15
   RenderFlexibleBox {DIV} at (6,3) size 141x13
-    RenderBlock {DIV} at (45,0) size 95x14 [color=#000000CC]
+    RenderBlock {DIV} at (45,0) size 95x15 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x14
         text run at (6,0) width 89: "Strong Password"
-layer at (178,70) size 46x12 backgroundClip at (178,70) size 45x11 clip at (178,70) size 45x11
-  RenderBlock {DIV} at (0,1) size 46x12
-layer at (337,69) size 300x12 scrollHeight 14
+layer at (178,72) size 46x15 backgroundClip at (178,72) size 45x12 clip at (178,72) size 45x12
+  RenderBlock {DIV} at (0,0) size 46x15
+layer at (337,72) size 300x12 scrollHeight 15
   RenderFlexibleBox {DIV} at (6,3) size 301x13
-    RenderBlock {DIV} at (205,0) size 95x14 [color=#000000CC]
+    RenderBlock {DIV} at (205,0) size 95x15 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x14
         text run at (6,0) width 89: "Strong Password"
-layer at (337,70) size 206x12 backgroundClip at (337,70) size 205x11 clip at (337,70) size 205x11
-  RenderBlock {DIV} at (0,1) size 206x12
-layer at (654,57) size 20x12 scrollWidth 94 scrollHeight 26
+layer at (337,72) size 206x15 backgroundClip at (337,72) size 205x12 clip at (337,72) size 205x12
+  RenderBlock {DIV} at (0,0) size 206x15
+layer at (654,57) size 20x12 scrollWidth 94 scrollHeight 29
   RenderFlexibleBox {DIV} at (6,3) size 21x13
-    RenderBlock {DIV} at (0,12) size 95x14 [color=#000000CC]
+    RenderBlock {DIV} at (0,15) size 95x14 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x14
         text run at (6,0) width 89: "Strong Password"
-layer at (654,57) size 20x12
-  RenderBlock {DIV} at (0,0) size 20x12
-layer at (17,146) size 140x12 scrollHeight 14
+layer at (654,57) size 20x15 backgroundClip at (654,57) size 20x12 clip at (654,57) size 20x12
+  RenderBlock {DIV} at (0,0) size 20x15
+layer at (17,152) size 140x12 scrollHeight 15
   RenderFlexibleBox {DIV} at (6,47) size 141x13
-    RenderBlock {DIV} at (45,0) size 95x14 [color=#000000CC]
+    RenderBlock {DIV} at (45,0) size 95x15 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x14
         text run at (6,0) width 89: "Strong Password"
-layer at (17,147) size 46x12 backgroundClip at (17,147) size 45x11 clip at (17,147) size 45x11
-  RenderBlock {DIV} at (0,1) size 46x12
-layer at (176,134) size 20x12 scrollWidth 94 scrollHeight 26
+layer at (17,152) size 46x15 backgroundClip at (17,152) size 45x12 clip at (17,152) size 45x12
+  RenderBlock {DIV} at (0,0) size 46x15
+layer at (176,137) size 20x12 scrollWidth 94 scrollHeight 29
   RenderFlexibleBox {DIV} at (6,47) size 21x13
-    RenderBlock {DIV} at (0,12) size 95x14 [color=#000000CC]
+    RenderBlock {DIV} at (0,15) size 95x14 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x14
         text run at (6,0) width 89: "Strong Password"
-layer at (176,134) size 20x12
-  RenderBlock {DIV} at (0,0) size 20x12
-layer at (215,146) size 140x12 scrollHeight 14
+layer at (176,137) size 20x15 backgroundClip at (176,137) size 20x12 clip at (176,137) size 20x12
+  RenderBlock {DIV} at (0,0) size 20x15
+layer at (215,152) size 140x12 scrollHeight 15
   RenderFlexibleBox {DIV} at (6,3) size 141x13
-    RenderBlock {DIV} at (45,0) size 95x14 [color=#000000CC]
+    RenderBlock {DIV} at (45,0) size 95x15 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x14
         text run at (6,0) width 89: "Strong Password"
-layer at (215,147) size 46x12 backgroundClip at (215,147) size 45x11 clip at (215,147) size 45x11
-  RenderBlock {DIV} at (0,1) size 46x12
-layer at (17,70) size 46x12 backgroundClip at (17,70) size 45x11 clip at (17,70) size 45x11 scrollWidth 284
+layer at (215,152) size 46x15 backgroundClip at (215,152) size 45x12 clip at (215,152) size 45x12
+  RenderBlock {DIV} at (0,0) size 46x15
+layer at (17,72) size 46x12 backgroundClip at (17,72) size 45x12 clip at (17,72) size 45x12 scrollWidth 284
   RenderBlock {DIV} at (0,0) size 46x12 [color=#00000099]
     RenderText {#text} at (0,0) size 284x12
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (178,70) size 46x12 backgroundClip at (178,70) size 45x11 clip at (178,70) size 45x11 scrollWidth 284
+layer at (178,72) size 46x12 backgroundClip at (178,72) size 45x12 clip at (178,72) size 45x12 scrollWidth 284
   RenderBlock {DIV} at (0,0) size 46x12 [color=#00000099]
     RenderText {#text} at (0,0) size 284x12
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (337,70) size 206x12 backgroundClip at (337,70) size 205x11 clip at (337,70) size 205x11 scrollWidth 284
+layer at (337,72) size 206x12 backgroundClip at (337,72) size 205x12 clip at (337,72) size 205x12 scrollWidth 284
   RenderBlock {DIV} at (0,0) size 206x12 [color=#00000099]
     RenderText {#text} at (0,0) size 284x12
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
@@ -90,11 +90,11 @@
   RenderBlock {DIV} at (0,0) size 20x12 [color=#00000099]
     RenderText {#text} at (0,0) size 284x12
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (17,147) size 46x12 backgroundClip at (17,147) size 45x11 clip at (17,147) size 45x11 scrollWidth 284
+layer at (17,152) size 46x12 backgroundClip at (17,152) size 45x12 clip at (17,152) size 45x12 scrollWidth 284
   RenderBlock {DIV} at (0,0) size 46x12 [color=#00000099]
     RenderText {#text} at (0,0) size 284x12
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (176,134) size 20x12 scrollWidth 284
+layer at (176,137) size 20x12 scrollWidth 284
   RenderBlock {DIV} at (0,0) size 20x12 [color=#00000099]
     RenderText {#text} at (0,0) size 284x12
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."

Modified: trunk/LayoutTests/platform/ios/fast/forms/linebox-overflow-in-textarea-padding-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/ios/fast/forms/linebox-overflow-in-textarea-padding-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/ios/fast/forms/linebox-overflow-in-textarea-padding-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -3,11 +3,11 @@
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock (anonymous) at (0,0) size 784x75
+      RenderBlock (anonymous) at (0,0) size 784x55
         RenderText {#text} at (300,35) size 4x19
           text run at (300,35) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,91) size 784x40
+      RenderBlock {P} at (0,71) size 784x40
         RenderText {#text} at (0,0) size 771x39
           text run at (0,0) width 771: "This is a pixel test that tests the linebox overflow in the padding on textareas. The div on the right is styled to look like a"
           text run at (0,20) width 55: "textarea."
@@ -18,8 +18,8 @@
         text run at (0,-16) width 163: "ggggggggg"
         text run at (162,-16) width 19: " "
         text run at (0,-16) width 163: "ggggggggg"
-layer at (312,33) size 300x50 clip at (315,36) size 294x44
-  RenderBlock {DIV} at (304,25) size 300x50 [color=#0000FF] [border: (3px solid #FFFF00)]
+layer at (312,8) size 300x50 clip at (315,11) size 294x44
+  RenderBlock {DIV} at (304,0) size 300x50 [color=#0000FF] [border: (3px solid #FFFF00)]
     RenderBlock {DIV} at (18,18) size 264x0
       RenderText {#text} at (0,-16) size 163x31
         text run at (0,-16) width 163: "ggggggggg"

Modified: trunk/LayoutTests/platform/ios/fast/inline-block/tricky-baseline-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/ios/fast/inline-block/tricky-baseline-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/ios/fast/inline-block/tricky-baseline-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -7,11 +7,11 @@
         text run at (0,0) width 750: "It is not clear what the right behavior is here. The CSS2.1 draft is currently ambiguous about how to handle overflow"
         text run at (0,20) width 46: "blocks."
       RenderBR {BR} at (45,20) size 1x19
-      RenderText {#text} at (104,282) size 4x19
-        text run at (104,282) width 4: " "
+      RenderText {#text} at (104,429) size 4x19
+        text run at (104,429) width 4: " "
       RenderText {#text} at (0,0) size 0x0
-layer at (8,101) size 104x204 clip at (10,103) size 85x200 scrollHeight 520
-  RenderBlock {DIV} at (0,93) size 104x204 [border: (2px solid #800080)]
+layer at (8,248) size 104x204 clip at (10,250) size 85x200 scrollHeight 520
+  RenderBlock {DIV} at (0,240) size 104x204 [border: (2px solid #800080)]
     RenderText {#text} at (2,2) size 81x39
       text run at (2,2) width 81: "This is some"
       text run at (2,22) width 28: "text."

Modified: trunk/LayoutTests/platform/mac/compositing/geometry/clipping-foreground-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/mac/compositing/geometry/clipping-foreground-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/mac/compositing/geometry/clipping-foreground-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -6,29 +6,29 @@
       RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 526x18
           text run at (0,0) width 526: "The layering and positions of the boxes should not be affected by oveflow:hidden."
-      RenderBlock (anonymous) at (0,34) size 784x320
-        RenderText {#text} at (320,147) size 4x18
-          text run at (320,147) width 4: " "
+      RenderBlock (anonymous) at (0,34) size 784x479
+        RenderText {#text} at (320,306) size 4x18
+          text run at (320,306) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-layer at (68,102) size 200x200 layerType: background only
-layer at (28,62) size 150x150
+layer at (68,261) size 200x200 layerType: background only
+layer at (28,221) size 150x150
   RenderBlock (positioned) zI: -1 {DIV} at (-40,-40) size 150x150 [color=#808080] [bgcolor=#C86464] [border: (2px solid #000000)]
     RenderText zI: -1 {#text} at (22,22) size 107x40
       text run at (22,22) width 107: "Behind"
     RenderText zI: -1 {#text} at (0,0) size 0x0
-layer at (50,144) size 100x100
+layer at (50,303) size 100x100
   RenderBlock (positioned) {DIV} at (22,82) size 100x100 [bgcolor=#008000] [border: (2px solid #000000)]
     RenderText {#text} at (22,22) size 56x44
       text run at (22,22) width 56: "Behind"
       text run at (22,44) width 54: "behind"
-layer at (68,102) size 200x200 layerType: foreground only
-  RenderBlock (relative positioned) {DIV} at (60,60) size 200x200 [color=#0000FF] [bgcolor=#FFFFFFCC] [border: (10px solid #000000)]
+layer at (68,261) size 200x200 layerType: foreground only
+  RenderBlock (relative positioned) {DIV} at (60,219) size 200x200 [color=#0000FF] [bgcolor=#FFFFFFCC] [border: (10px solid #000000)]
     RenderText {#text} at (30,30) size 125x80
       text run at (30,30) width 59: "Box"
       text run at (30,70) width 125: "contents"
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (158,192) size 150x150
+layer at (158,351) size 150x150
   RenderBlock (positioned) zI: 1 {DIV} at (90,90) size 150x150 [color=#808080] [bgcolor=#C8C880] [border: (2px solid #000000)]
     RenderText zI: 1 {#text} at (22,22) size 85x80
       text run at (22,22) width 34: "In"

Modified: trunk/LayoutTests/platform/mac/fast/clip/overflow-border-radius-combinations-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/mac/fast/clip/overflow-border-radius-combinations-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/mac/fast/clip/overflow-border-radius-combinations-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -6,13 +6,13 @@
       RenderText {#text} at (0,0) size 467x18
         text run at (0,0) width 467: "The white text and grey backgrounds should all clip to the border-radius."
       RenderBR {BR} at (466,0) size 1x18
-      RenderText {#text} at (240,38) size 4x18
-        text run at (240,38) width 4: " "
-      RenderText {#text} at (484,38) size 4x18
-        text run at (484,38) width 4: " "
+      RenderText {#text} at (240,144) size 4x18
+        text run at (240,144) width 4: " "
+      RenderText {#text} at (484,144) size 4x18
+        text run at (484,144) width 4: " "
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (240,178) size 0x18
+      RenderBR {BR} at (240,288) size 0x18
       RenderText {#text} at (0,0) size 0x0
 layer at (18,36) size 220x120 clip at (28,46) size 200x100
   RenderBlock {DIV} at (10,28) size 220x120 [border: (10px solid #000000)]
@@ -30,15 +30,15 @@
     RenderBlock {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
       RenderText {#text} at (0,0) size 99x18
         text run at (0,0) width 99: "relative > static"
-layer at (18,176) size 220x120 clip at (28,186) size 200x100
-  RenderBlock (relative positioned) {DIV} at (10,168) size 220x120 [border: (10px solid #000000)]
-layer at (28,186) size 200x100
+layer at (18,180) size 220x120 clip at (28,190) size 200x100
+  RenderBlock (relative positioned) {DIV} at (10,172) size 220x120 [border: (10px solid #000000)]
+layer at (28,190) size 200x100
   RenderBlock (relative positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 113x18
       text run at (0,0) width 113: "relative > relative"
-layer at (18,316) size 220x120 clip at (28,326) size 200x100
-  RenderBlock (relative positioned) {DIV} at (10,308) size 220x120 [border: (10px solid #000000)]
-layer at (28,326) size 200x100
+layer at (18,320) size 220x120 clip at (28,330) size 200x100
+  RenderBlock (relative positioned) {DIV} at (10,312) size 220x120 [border: (10px solid #000000)]
+layer at (28,330) size 200x100
   RenderBlock (positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 119x18
       text run at (0,0) width 119: "relative > absolute"

Modified: trunk/LayoutTests/platform/mac/fast/clip/overflow-border-radius-composited-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/mac/fast/clip/overflow-border-radius-composited-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/mac/fast/clip/overflow-border-radius-composited-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -6,13 +6,13 @@
       RenderText {#text} at (0,0) size 467x18
         text run at (0,0) width 467: "The white text and grey backgrounds should all clip to the border-radius."
       RenderBR {BR} at (466,0) size 1x18
-      RenderText {#text} at (240,38) size 4x18
-        text run at (240,38) width 4: " "
-      RenderText {#text} at (484,38) size 4x18
-        text run at (484,38) width 4: " "
+      RenderText {#text} at (240,144) size 4x18
+        text run at (240,144) width 4: " "
+      RenderText {#text} at (484,144) size 4x18
+        text run at (484,144) width 4: " "
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (240,178) size 0x18
+      RenderBR {BR} at (240,288) size 0x18
       RenderText {#text} at (0,0) size 0x0
 layer at (18,36) size 220x120 clip at (28,46) size 200x100 scrollWidth 206 scrollHeight 156
   RenderBlock {DIV} at (10,28) size 220x120 [border: (10px solid #000000)]
@@ -32,15 +32,15 @@
   RenderBlock {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 99x18
       text run at (0,0) width 99: "relative > static"
-layer at (18,176) size 220x120 clip at (28,186) size 200x100 scrollWidth 206 scrollHeight 156
-  RenderBlock (relative positioned) {DIV} at (10,168) size 220x120 [border: (10px solid #000000)]
-layer at (28,186) size 200x100
+layer at (18,180) size 220x120 clip at (28,190) size 200x100 scrollWidth 206 scrollHeight 156
+  RenderBlock (relative positioned) {DIV} at (10,172) size 220x120 [border: (10px solid #000000)]
+layer at (28,190) size 200x100
   RenderBlock (relative positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 113x18
       text run at (0,0) width 113: "relative > relative"
-layer at (18,316) size 220x120 clip at (28,326) size 200x100 scrollWidth 206 scrollHeight 156
-  RenderBlock (relative positioned) {DIV} at (10,308) size 220x120 [border: (10px solid #000000)]
-layer at (28,326) size 200x100
+layer at (18,320) size 220x120 clip at (28,330) size 200x100 scrollWidth 206 scrollHeight 156
+  RenderBlock (relative positioned) {DIV} at (10,312) size 220x120 [border: (10px solid #000000)]
+layer at (28,330) size 200x100
   RenderBlock (positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 119x18
       text run at (0,0) width 119: "relative > absolute"

Modified: trunk/LayoutTests/platform/mac/fast/clip/overflow-border-radius-transformed-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/mac/fast/clip/overflow-border-radius-transformed-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/mac/fast/clip/overflow-border-radius-transformed-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -6,13 +6,13 @@
       RenderText {#text} at (0,0) size 467x18
         text run at (0,0) width 467: "The white text and grey backgrounds should all clip to the border-radius."
       RenderBR {BR} at (466,0) size 1x18
-      RenderText {#text} at (240,38) size 4x18
-        text run at (240,38) width 4: " "
-      RenderText {#text} at (484,38) size 4x18
-        text run at (484,38) width 4: " "
+      RenderText {#text} at (240,144) size 4x18
+        text run at (240,144) width 4: " "
+      RenderText {#text} at (484,144) size 4x18
+        text run at (484,144) width 4: " "
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
-      RenderBR {BR} at (240,178) size 0x18
+      RenderBR {BR} at (240,288) size 0x18
       RenderText {#text} at (0,0) size 0x0
 layer at (18,36) size 220x120 clip at (28,46) size 200x100 scrollWidth 206 scrollHeight 156
   RenderBlock {DIV} at (10,28) size 220x120 [border: (10px solid #000000)]
@@ -32,15 +32,15 @@
   RenderBlock {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 99x18
       text run at (0,0) width 99: "relative > static"
-layer at (18,176) size 220x120 clip at (28,186) size 200x100 scrollWidth 206 scrollHeight 156
-  RenderBlock (relative positioned) {DIV} at (10,168) size 220x120 [border: (10px solid #000000)]
-layer at (28,186) size 200x100
+layer at (18,180) size 220x120 clip at (28,190) size 200x100 scrollWidth 206 scrollHeight 156
+  RenderBlock (relative positioned) {DIV} at (10,172) size 220x120 [border: (10px solid #000000)]
+layer at (28,190) size 200x100
   RenderBlock (relative positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 113x18
       text run at (0,0) width 113: "relative > relative"
-layer at (18,316) size 220x120 clip at (28,326) size 200x100 scrollWidth 206 scrollHeight 156
-  RenderBlock (relative positioned) {DIV} at (10,308) size 220x120 [border: (10px solid #000000)]
-layer at (28,326) size 200x100
+layer at (18,320) size 220x120 clip at (28,330) size 200x100 scrollWidth 206 scrollHeight 156
+  RenderBlock (relative positioned) {DIV} at (10,312) size 220x120 [border: (10px solid #000000)]
+layer at (28,330) size 200x100
   RenderBlock (positioned) {DIV} at (10,10) size 200x100 [color=#FFFFFF] [bgcolor=#808080]
     RenderText {#text} at (0,0) size 119x18
       text run at (0,0) width 119: "relative > absolute"

Modified: trunk/LayoutTests/platform/mac/fast/forms/auto-fill-button/input-strong-password-auto-fill-button-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/mac/fast/forms/auto-fill-button/input-strong-password-auto-fill-button-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/mac/fast/forms/auto-fill-button/input-strong-password-auto-fill-button-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -1,88 +1,88 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x213
-  RenderBlock {HTML} at (0,0) size 800x213
-    RenderBody {BODY} at (8,16) size 784x189
+layer at (0,0) size 800x217
+  RenderBlock {HTML} at (0,0) size 800x217
+    RenderBody {BODY} at (8,16) size 784x193
       RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 757x18
           text run at (0,0) width 757: "This tests that the Strong Password AutoFill button renders in an auto-filled input. It can only be tested in the test tool."
-      RenderBlock {DIV} at (0,34) size 784x155
-        RenderTextControl {INPUT} at (2,15) size 158x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-        RenderText {#text} at (162,15) size 4x18
-          text run at (162,15) width 4: " "
-        RenderTextControl {INPUT} at (168,15) size 158x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-        RenderText {#text} at (328,15) size 4x18
-          text run at (328,15) width 4: " "
-        RenderTextControl {INPUT} at (332,15) size 306x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-        RenderText {#text} at (638,15) size 4x18
-          text run at (638,15) width 4: " "
+      RenderBlock {DIV} at (0,34) size 784x159
+        RenderTextControl {INPUT} at (2,17) size 158x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
+        RenderText {#text} at (162,18) size 4x18
+          text run at (162,18) width 4: " "
+        RenderTextControl {INPUT} at (168,17) size 158x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
+        RenderText {#text} at (328,18) size 4x18
+          text run at (328,18) width 4: " "
+        RenderTextControl {INPUT} at (332,17) size 306x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
+        RenderText {#text} at (638,18) size 4x18
+          text run at (638,18) width 4: " "
         RenderTextControl {INPUT} at (642,2) size 26x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
         RenderText {#text} at (0,0) size 0x0
-        RenderTextControl {INPUT} at (2,49) size 158x106 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-        RenderText {#text} at (162,92) size 4x18
-          text run at (162,92) width 4: " "
-        RenderTextControl {INPUT} at (166,36) size 26x106 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-        RenderText {#text} at (192,92) size 4x18
-          text run at (192,92) width 4: " "
-        RenderTextControl {INPUT} at (198,92) size 158x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-layer at (13,68) size 152x13
+        RenderTextControl {INPUT} at (2,53) size 158x106 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
+        RenderText {#text} at (162,97) size 4x18
+          text run at (162,97) width 4: " "
+        RenderTextControl {INPUT} at (166,38) size 26x106 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
+        RenderText {#text} at (192,97) size 4x18
+          text run at (192,97) width 4: " "
+        RenderTextControl {INPUT} at (198,96) size 158x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
+layer at (13,70) size 152x13 scrollHeight 16
   RenderFlexibleBox {DIV} at (3,3) size 152x13
-    RenderBlock {DIV} at (57,0) size 95x13 [color=#000000CC]
+    RenderBlock {DIV} at (57,1) size 95x14 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x13
         text run at (6,0) width 89: "Strong Password"
-layer at (13,68) size 58x13
-  RenderBlock {DIV} at (0,0) size 58x13
-layer at (179,68) size 152x13
+layer at (13,70) size 58x16 backgroundClip at (13,70) size 58x13 clip at (13,70) size 58x13
+  RenderBlock {DIV} at (0,0) size 58x16
+layer at (179,70) size 152x13 scrollHeight 16
   RenderFlexibleBox {DIV} at (3,3) size 152x13
-    RenderBlock {DIV} at (57,0) size 95x13 [color=#000000CC]
+    RenderBlock {DIV} at (57,1) size 95x14 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x13
         text run at (6,0) width 89: "Strong Password"
-layer at (179,68) size 58x13
-  RenderBlock {DIV} at (0,0) size 58x13
-layer at (343,68) size 300x13
+layer at (179,70) size 58x16 backgroundClip at (179,70) size 58x13 clip at (179,70) size 58x13
+  RenderBlock {DIV} at (0,0) size 58x16
+layer at (343,70) size 300x13 scrollHeight 16
   RenderFlexibleBox {DIV} at (3,3) size 300x13
-    RenderBlock {DIV} at (205,0) size 95x13 [color=#000000CC]
+    RenderBlock {DIV} at (205,1) size 95x14 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x13
         text run at (6,0) width 89: "Strong Password"
-layer at (343,68) size 206x13
-  RenderBlock {DIV} at (0,0) size 206x13
-layer at (653,55) size 20x13 scrollWidth 94 scrollHeight 26
+layer at (343,70) size 206x16 backgroundClip at (343,70) size 206x13 clip at (343,70) size 206x13
+  RenderBlock {DIV} at (0,0) size 206x16
+layer at (653,55) size 20x13 scrollWidth 94 scrollHeight 29
   RenderFlexibleBox {DIV} at (3,3) size 20x13
-    RenderBlock {DIV} at (0,13) size 95x13 [color=#000000CC]
+    RenderBlock {DIV} at (0,16) size 95x13 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x13
         text run at (6,0) width 89: "Strong Password"
-layer at (653,55) size 20x13
-  RenderBlock {DIV} at (0,0) size 20x13
-layer at (13,102) size 152x100
-  RenderFlexibleBox {DIV} at (3,3) size 152x100
-    RenderBlock {DIV} at (57,43) size 95x14 [color=#000000CC]
+layer at (653,55) size 20x16 backgroundClip at (653,55) size 20x13 clip at (653,55) size 20x13
+  RenderBlock {DIV} at (0,0) size 20x16
+layer at (13,150) size 152x13 scrollHeight 16
+  RenderFlexibleBox {DIV} at (3,46) size 152x14
+    RenderBlock {DIV} at (57,1) size 95x14 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x13
         text run at (6,0) width 89: "Strong Password"
-layer at (13,146) size 58x13
-  RenderBlock {DIV} at (0,43) size 58x14
-layer at (177,133) size 20x13 scrollWidth 94 scrollHeight 26
+layer at (13,150) size 58x16 backgroundClip at (13,150) size 58x13 clip at (13,150) size 58x13
+  RenderBlock {DIV} at (0,0) size 58x16
+layer at (177,135) size 20x13 scrollWidth 94 scrollHeight 29
   RenderFlexibleBox {DIV} at (3,46) size 20x14
-    RenderBlock {DIV} at (0,13) size 95x13 [color=#000000CC]
+    RenderBlock {DIV} at (0,16) size 95x13 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x13
         text run at (6,0) width 89: "Strong Password"
-layer at (177,133) size 20x13
-  RenderBlock {DIV} at (0,0) size 20x13
-layer at (209,145) size 152x13
+layer at (177,135) size 20x16 backgroundClip at (177,135) size 20x13 clip at (177,135) size 20x13
+  RenderBlock {DIV} at (0,0) size 20x16
+layer at (209,149) size 152x13 scrollHeight 16
   RenderFlexibleBox {DIV} at (3,3) size 152x13
-    RenderBlock {DIV} at (57,0) size 95x13 [color=#000000CC]
+    RenderBlock {DIV} at (57,1) size 95x14 [color=#000000CC]
       RenderText {#text} at (6,0) size 89x13
         text run at (6,0) width 89: "Strong Password"
-layer at (209,145) size 58x13
-  RenderBlock {DIV} at (0,0) size 58x13
-layer at (13,68) size 58x13 scrollWidth 284
+layer at (209,149) size 58x16 backgroundClip at (209,149) size 58x13 clip at (209,149) size 58x13
+  RenderBlock {DIV} at (0,0) size 58x16
+layer at (13,70) size 58x13 scrollWidth 284
   RenderBlock {DIV} at (0,0) size 58x13 [color=#00000099]
     RenderText {#text} at (0,0) size 284x13
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (179,68) size 58x13 scrollWidth 284
+layer at (179,70) size 58x13 scrollWidth 284
   RenderBlock {DIV} at (0,0) size 58x13 [color=#00000099]
     RenderText {#text} at (0,0) size 284x13
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (343,68) size 206x13 scrollWidth 284
+layer at (343,70) size 206x13 scrollWidth 284
   RenderBlock {DIV} at (0,0) size 206x13 [color=#00000099]
     RenderText {#text} at (0,0) size 284x13
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
@@ -90,11 +90,11 @@
   RenderBlock {DIV} at (0,0) size 20x13 [color=#00000099]
     RenderText {#text} at (0,0) size 284x13
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (13,146) size 58x13 scrollWidth 284
+layer at (13,150) size 58x13 scrollWidth 284
   RenderBlock {DIV} at (0,0) size 58x13 [color=#00000099]
     RenderText {#text} at (0,0) size 284x13
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (177,133) size 20x13 scrollWidth 284
+layer at (177,135) size 20x13 scrollWidth 284
   RenderBlock {DIV} at (0,0) size 20x13 [color=#00000099]
     RenderText {#text} at (0,0) size 284x13
       text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."

Modified: trunk/LayoutTests/platform/mac/fast/forms/linebox-overflow-in-textarea-padding-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/mac/fast/forms/linebox-overflow-in-textarea-padding-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/mac/fast/forms/linebox-overflow-in-textarea-padding-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -3,11 +3,11 @@
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock (anonymous) at (0,0) size 784x72
+      RenderBlock (anonymous) at (0,0) size 784x54
         RenderText {#text} at (300,36) size 4x18
           text run at (300,36) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,88) size 784x36
+      RenderBlock {P} at (0,70) size 784x36
         RenderText {#text} at (0,0) size 770x36
           text run at (0,0) width 770: "This is a pixel test that tests the linebox overflow in the padding on textareas. The div on the right is styled to look like a"
           text run at (0,18) width 55: "textarea."
@@ -18,8 +18,8 @@
         text run at (0,-18) width 163: "ggggggggg"
         text run at (162,-18) width 19: " "
         text run at (0,-18) width 163: "ggggggggg"
-layer at (312,30) size 300x50 clip at (315,33) size 294x44
-  RenderBlock {DIV} at (304,22) size 300x50 [color=#0000FF] [border: (3px solid #FFFF00)]
+layer at (312,8) size 300x50 clip at (315,11) size 294x44
+  RenderBlock {DIV} at (304,0) size 300x50 [color=#0000FF] [border: (3px solid #FFFF00)]
     RenderBlock {DIV} at (18,18) size 264x0
       RenderText {#text} at (0,-18) size 163x35
         text run at (0,-18) width 163: "ggggggggg"

Modified: trunk/LayoutTests/platform/mac/fast/inline-block/tricky-baseline-expected.txt (271347 => 271348)


--- trunk/LayoutTests/platform/mac/fast/inline-block/tricky-baseline-expected.txt	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/LayoutTests/platform/mac/fast/inline-block/tricky-baseline-expected.txt	2021-01-09 13:14:18 UTC (rev 271348)
@@ -7,11 +7,11 @@
         text run at (0,0) width 749: "It is not clear what the right behavior is here. The CSS2.1 draft is currently ambiguous about how to handle overflow"
         text run at (0,18) width 46: "blocks."
       RenderBR {BR} at (45,18) size 1x18
-      RenderText {#text} at (104,254) size 4x18
-        text run at (104,254) width 4: " "
+      RenderText {#text} at (104,426) size 4x18
+        text run at (104,426) width 4: " "
       RenderText {#text} at (0,0) size 0x0
-layer at (8,72) size 104x204 clip at (10,74) size 85x200 scrollHeight 468
-  RenderBlock {DIV} at (0,64) size 104x204 [border: (2px solid #800080)]
+layer at (8,244) size 104x204 clip at (10,246) size 85x200 scrollHeight 468
+  RenderBlock {DIV} at (0,236) size 104x204 [border: (2px solid #800080)]
     RenderText {#text} at (2,2) size 81x36
       text run at (2,2) width 81: "This is some"
       text run at (2,20) width 28: "text."

Modified: trunk/Source/WebCore/ChangeLog (271347 => 271348)


--- trunk/Source/WebCore/ChangeLog	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/Source/WebCore/ChangeLog	2021-01-09 13:14:18 UTC (rev 271348)
@@ -1,5 +1,22 @@
 2021-01-09  Zalan Bujtas  <[email protected]>
 
+        play.google.com: App preview images are clipped
+        https://bugs.webkit.org/show_bug.cgi?id=220470
+        <rdar://problem/60258531>
+
+        Reviewed by Simon Fraser.
+
+        "The baseline of an 'inline-block' is the baseline of its last line box in the normal flow, unless it has either no in-flow line boxes
+        or if its 'overflow' property has a computed value other than 'visible', in which case the baseline is the bottom margin edge."
+        https://www.w3.org/TR/CSS22/visudet.html#leading
+
+        Test: fast/inline/inline-block-baseline-with-overflow-not-visible.html
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::inlineBlockBaseline const):
+
+2021-01-09  Zalan Bujtas  <[email protected]>
+
         [LFC][IFC] Use the bottom margin edge as the baseline for inline-block when overflow is not visible
         https://bugs.webkit.org/show_bug.cgi?id=220481
 

Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (271347 => 271348)


--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp	2021-01-09 12:31:53 UTC (rev 271347)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp	2021-01-09 13:14:18 UTC (rev 271348)
@@ -3135,6 +3135,13 @@
     if (isWritingModeRoot() && !isRubyRun())
         return WTF::nullopt;
 
+    if (style().display() == DisplayType::InlineBlock) {
+        // The baseline of an 'inline-block' is the baseline of its last line box in the normal flow, unless it has either no in-flow line boxes or if its 'overflow'
+        // property has a computed value other than 'visible'. see https://www.w3.org/TR/CSS22/visudet.html
+        auto shouldSynthesizeBaseline = !style().isOverflowVisible() && !is<HTMLFormControlElement>(element());
+        if (shouldSynthesizeBaseline)
+            return WTF::nullopt;
+    }
     // Note that here we only take the left and bottom into consideration. Our caller takes the right and top into consideration.
     float boxHeight = lineDirection == HorizontalLine ? height() + m_marginBox.bottom() : width() + m_marginBox.left();
     float lastBaseline = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to