Changeset 272360 in webkit

Timestamp:

Feb 3, 2021 11:59:45 PM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Handle aspect-ratio: auto m/n for replaced elements
​https://bugs.webkit.org/show_bug.cgi?id=221323

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

Source/WebCore:

In the aspect-ratio: auto m/n case, replaced elements with natural aspect ratio
should use that aspect-ratio instead of the provided aspect ratio [1].

[1] ​https://drafts.csswg.org/css-sizing-4/#ratios

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeLogicalWidthInFragment const):

LayoutTests:

replaced-element-030.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-02-03  Rob Buis  <rbuis@igalia.com>
+
+        Handle aspect-ratio: auto m/n for replaced elements
+        https://bugs.webkit.org/show_bug.cgi?id=221323
+
+        Reviewed by Simon Fraser.
+
+        replaced-element-030.html now passes.
+
+        * TestExpectations:
+
 2021-02-03  Peng Liu  <peng.liu6@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -4449 +4449 @@
 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/replaced-element-030.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-031.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-032.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-03  Rob Buis  <rbuis@igalia.com>
+
+        Handle aspect-ratio: auto m/n for replaced elements
+        https://bugs.webkit.org/show_bug.cgi?id=221323
+
+        Reviewed by Simon Fraser.
+
+        In the aspect-ratio: auto m/n case, replaced elements with natural aspect ratio
+        should use that aspect-ratio instead of the provided aspect ratio [1].
+
+        [1] https://drafts.csswg.org/css-sizing-4/#ratios
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeLogicalWidthInFragment const):
+
 2021-02-03  Peng Liu  <peng.liu6@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2549 +2549 @@
 
     // Width calculations
-    if (shouldComputeLogicalWidthFromAspectRatio() && style().logicalWidth().isAuto()) {
+    if (treatAsReplaced) {
+        computedValues.m_extent = logicalWidthLength.value() + borderAndPaddingLogicalWidth();
+    } else if (shouldComputeLogicalWidthFromAspectRatio() && style().logicalWidth().isAuto()) {
         computedValues.m_extent = computeLogicalWidthFromAspectRatio(fragment);
-    } else if (treatAsReplaced) {
-        computedValues.m_extent = logicalWidthLength.value() + borderAndPaddingLogicalWidth();
     } else {
         LayoutUnit preferredWidth = computeLogicalWidthInFragmentUsing(MainOrPreferredSize, styleToUse.logicalWidth(), containerWidthInInlineDirection, cb, fragment);