Changeset 280471 in webkit

Timestamp:

Jul 30, 2021 2:09:44 AM (12 months ago)

Author:

commit-queue@webkit.org

Message:

[AspectRatio] Fix replaced-element-034.html
​https://bugs.webkit.org/show_bug.cgi?id=228223

Patch by Rob Buis <​rbuis@igalia.com> on 2021-07-30
Reviewed by Manuel Rego Casasnovas.

Source/WebCore:

Fix replaced-element-034.html by making hasReplacedLogicalHeight
return false for *-content when aspect-ratio is provided and relying
on computeReplacedLogicalHeight to take aspect-ratio into account.

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::hasReplacedLogicalHeight const):

LayoutTests:

• TestExpectations:

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-07-30  Rob Buis  <rbuis@igalia.com>
+
+        [AspectRatio] Fix replaced-element-034.html
+        https://bugs.webkit.org/show_bug.cgi?id=228223
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        * TestExpectations:
+
 2021-07-29  Tomoki Imai  <Tomoki.Imai@sony.com>
 

trunk/LayoutTests/TestExpectations

@@ -4714 +4714 @@
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-025.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-034.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-001.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-002.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-07-30  Rob Buis  <rbuis@igalia.com>
+
+        [AspectRatio] Fix replaced-element-034.html
+        https://bugs.webkit.org/show_bug.cgi?id=228223
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        Fix replaced-element-034.html by making hasReplacedLogicalHeight
+        return false for *-content when aspect-ratio is provided and relying
+        on computeReplacedLogicalHeight to take aspect-ratio into account.
+
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::hasReplacedLogicalHeight const):
+
 2021-07-29  Tomoki Imai  <Tomoki.Imai@sony.com>
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -364 +364 @@
 
     if (style().logicalHeight().isIntrinsic())
-        return true;
+        return !style().hasAspectRatio();
 
     return false;