Changeset 272992 in webkit

Timestamp:

Feb 17, 2021 2:37:55 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Improve percentage height in shouldComputeLogicalWidthFromAspectRatio
​https://bugs.webkit.org/show_bug.cgi?id=221405

Patch by Rob Buis <​rbuis@igalia.com> on 2021-02-17
Reviewed by Simon Fraser.

Source/WebCore:

When checking whether the percentage logical height can be used to
calculate the logical width, we need to also check that it is resolvable.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::shouldComputeLogicalWidthFromAspectRatio const):

LayoutTests:

Enable some tests that pass now.

• TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-02-17  Rob Buis  <rbuis@igalia.com>
+
+        Improve percentage height in shouldComputeLogicalWidthFromAspectRatio
+        https://bugs.webkit.org/show_bug.cgi?id=221405
+
+        Reviewed by Simon Fraser.
+
+        Enable some tests that pass now.
+
+        * TestExpectations:
+
 2021-02-16  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -4560 +4560 @@
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-024.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-028.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-030.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-001.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-002.html [ ImageOnlyFailure ]
@@ -4584 +4583 @@
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-005.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-006.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-007.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-008.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-010.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-17  Rob Buis  <rbuis@igalia.com>
+
+        Improve percentage height in shouldComputeLogicalWidthFromAspectRatio
+        https://bugs.webkit.org/show_bug.cgi?id=221405
+
+        Reviewed by Simon Fraser.
+
+        When checking whether the percentage logical height can be used to
+        calculate the logical width, we need to also check that it is resolvable.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::shouldComputeLogicalWidthFromAspectRatio const):
+
 2021-02-16  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -5101 +5101 @@
         return false;
 
-    if (!shouldComputeLogicalWidthFromAspectRatioAndInsets() && !style().logicalHeight().isFixed() && !style().logicalHeight().isPercentOrCalculated())
+    auto isResolvablePercentageHeight = [this] () {
+        return style().logicalHeight().isPercentOrCalculated() && (isOutOfFlowPositioned() || percentageLogicalHeightIsResolvable());
+    };
+    if (!shouldComputeLogicalWidthFromAspectRatioAndInsets() && !style().logicalHeight().isFixed() && !isResolvablePercentageHeight())
         return false;