Changeset 272049 in webkit

Timestamp:

Jan 29, 2021 12:04:55 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Fix logic error in shouldComputeLogicalHeightFromAspectRatio
​https://bugs.webkit.org/show_bug.cgi?id=220965

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

Source/WebCore:

Logical height that uses percentages should be computed through
aspect-ratio only if it is not resolvable.

Test: imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-005.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::shouldComputeLogicalHeightFromAspectRatio const):

LayoutTests:

percentage-resolution-005.html now passes.

• TestExpectations:

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-29  Rob Buis  <rbuis@igalia.com>
+
+        Fix logic error in shouldComputeLogicalHeightFromAspectRatio
+        https://bugs.webkit.org/show_bug.cgi?id=220965
+
+        Reviewed by Darin Adler.
+
+        percentage-resolution-005.html now passes.
+
+        * TestExpectations:
+
 2021-01-28  Jean-Yves Avenard  <jya@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -4450 +4450 @@
 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 ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-011.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/parsing/contain-intrinsic-size-invalid.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-005.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-030.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-031.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-29  Rob Buis  <rbuis@igalia.com>
+
+        Fix logic error in shouldComputeLogicalHeightFromAspectRatio
+        https://bugs.webkit.org/show_bug.cgi?id=220965
+
+        Reviewed by Darin Adler.
+
+        Logical height that uses percentages should be computed through
+        aspect-ratio only if it is not resolvable.
+
+        Test: imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-005.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::shouldComputeLogicalHeightFromAspectRatio const):
+
 2021-01-28  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -5079 +5079 @@
 
     auto h = style().logicalHeight();
-    return h.isAuto() || (!isOutOfFlowPositioned() && h.isPercentOrCalculated() && percentageLogicalHeightIsResolvable());
+    return h.isAuto() || (!isOutOfFlowPositioned() && h.isPercentOrCalculated() && !percentageLogicalHeightIsResolvable());
 }