Changeset 276745 in webkit

Timestamp:

Apr 28, 2021 6:00:26 PM (15 months ago)

Author:

commit-queue@webkit.org

Message:

[aspect-ratio] Treat border/padding correctly for box-sizing: border-box
​https://bugs.webkit.org/show_bug.cgi?id=225015

Patch by Rob Buis <​rbuis@igalia.com> on 2021-04-28
Reviewed by Darin Adler.

LayoutTests/imported/w3c:

Import WPT test for this.

• web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035-expected.xht: Added.
• web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035.html: Added.

Source/WebCore:

When computing logical height in aspect-ratio case, to compute the automatic
minimum size [1] for min-height: auto, the padding was always subtracted,
however it should only be subtracted in the box-sizing: content-box case.

Test: imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035.html

[1] ​https://www.w3.org/TR/css-sizing-4/#aspect-ratio-minimum

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeLogicalHeight const):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035-expected.xht (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-04-28  Rob Buis  <rbuis@igalia.com>
+
+        [aspect-ratio] Treat border/padding correctly for box-sizing: border-box
+        https://bugs.webkit.org/show_bug.cgi?id=225015
+
+        Reviewed by Darin Adler.
+
+        Import WPT test for this.
+
+        * web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035-expected.xht: Added.
+        * web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035.html: Added.
+
 2021-04-28  Ziran Sun  <zsun@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-28  Rob Buis  <rbuis@igalia.com>
+
+        [aspect-ratio] Treat border/padding correctly for box-sizing: border-box
+        https://bugs.webkit.org/show_bug.cgi?id=225015
+
+        Reviewed by Darin Adler.
+
+        When computing logical height in aspect-ratio case, to compute the automatic
+        minimum size [1] for min-height: auto, the padding was always subtracted,
+        however it should only be subtracted in the box-sizing: content-box case.
+
+        Test: imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035.html
+
+        [1] https://www.w3.org/TR/css-sizing-4/#aspect-ratio-minimum
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeLogicalHeight const):
+
 2021-04-28  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2943 +2943 @@
             Optional<LayoutUnit> intrinsicHeight;
             if (computedValues.m_extent != LayoutUnit::max())
-                intrinsicHeight = computedValues.m_extent - borderAndPaddingLogicalHeight();
-            if (shouldComputeLogicalHeightFromAspectRatio())
+                intrinsicHeight = computedValues.m_extent;
+            if (shouldComputeLogicalHeightFromAspectRatio()) {
+                if (intrinsicHeight && style().boxSizingForAspectRatio() == BoxSizing::ContentBox)
+                    *intrinsicHeight -= borderAndPaddingLogicalHeight();
                 heightResult = blockSizeFromAspectRatio(horizontalBorderAndPaddingExtent(), verticalBorderAndPaddingExtent(), LayoutUnit(style().logicalAspectRatio()), style().boxSizingForAspectRatio(), logicalWidth());
-            else
+            } else {
+                if (intrinsicHeight)
+                    *intrinsicHeight -= borderAndPaddingLogicalHeight();
                 heightResult = computeLogicalHeightUsing(MainOrPreferredSize, style().logicalHeight(), intrinsicHeight).valueOr(computedValues.m_extent);
+            }
             heightResult = constrainLogicalHeightByMinMax(heightResult, intrinsicHeight);
         } else {