Changeset 271948 in webkit

Timestamp:

Jan 27, 2021 6:13:56 AM (18 months ago)

Author:

commit-queue@webkit.org

Message:

Handle zero aspect-ratio width/height
​https://bugs.webkit.org/show_bug.cgi?id=220970

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

Source/WebCore:

Treat aspect-ratio with zero width and/or height internally
as auto, but when serializing maintain the original input.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

• rendering/style/RenderStyleConstants.cpp:

(WebCore::operator<<):

• rendering/style/RenderStyleConstants.h:
• style/StyleBuilderCustom.h:

(WebCore::Style::BuilderCustom::applyValueAspectRatio):

LayoutTests:

Enable some tests that pass now.

• TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)
• Source/WebCore/rendering/style/RenderStyleConstants.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyleConstants.h (modified) (1 diff)
• Source/WebCore/style/StyleBuilderCustom.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-27  Rob Buis  <rbuis@igalia.com>
+
+        Handle zero aspect-ratio width/height
+        https://bugs.webkit.org/show_bug.cgi?id=220970
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        Enable some tests that pass now.
+
+        * TestExpectations:
+
 2021-01-27  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -4459 +4459 @@
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-032.html [ ImageOnlyFailure ]
 webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/table-element-001.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-001.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-002.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-004.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-006.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-007.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-008.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-009.html [ ImageOnlyFailure ]
-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-010.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-01-27  Rob Buis  <rbuis@igalia.com>
+
+        Handle zero aspect-ratio width/height
+        https://bugs.webkit.org/show_bug.cgi?id=220970
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        Treat aspect-ratio with zero width and/or height internally
+        as auto, but when serializing maintain the original input.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
+        * rendering/style/RenderStyleConstants.cpp:
+        (WebCore::operator<<):
+        * rendering/style/RenderStyleConstants.h:
+        * style/StyleBuilderCustom.h:
+        (WebCore::Style::BuilderCustom::applyValueAspectRatio):
+
 2021-01-27  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -3473 +3473 @@
             case AspectRatioType::Auto:
                 return cssValuePool.createIdentifierValue(CSSValueAuto);
+            case AspectRatioType::AutoZero:
             case AspectRatioType::AutoAndRatio:
             case AspectRatioType::Ratio: {
@@ -3478 +3479 @@
                 ratioList->append(cssValuePool.createValue(style.aspectRatioWidth(), CSSUnitType::CSS_NUMBER));
                 ratioList->append(cssValuePool.createValue(style.aspectRatioHeight(), CSSUnitType::CSS_NUMBER));
-                if (style.aspectRatioType() == AspectRatioType::Ratio)
+                if (style.aspectRatioType() != AspectRatioType::AutoAndRatio)
                     return ratioList;
                 auto list = CSSValueList::createSpaceSeparated();

trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp

@@ -94 +94 @@
     case AspectRatioType::Ratio: ts << "ratio"; break;
     case AspectRatioType::AutoAndRatio: ts << "autoandratio"; break;
+    case AspectRatioType::AutoZero: ts << "autozero"; break;
     }
     return ts;

trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

@@ -520 +520 @@
     Auto,
     Ratio,
-    AutoAndRatio
+    AutoAndRatio,
+    AutoZero
 };
 

trunk/Source/WebCore/style/StyleBuilderCustom.h

@@ -1180 +1180 @@
     }
 
-    builderState.style().setAspectRatioType(AspectRatioType::Ratio);
     ASSERT(list.length() == 2);
-    builderState.style().setAspectRatio(downcast<CSSPrimitiveValue>(list.item(0))->doubleValue(), downcast<CSSPrimitiveValue>(list.item(1))->doubleValue());
+    auto width = downcast<CSSPrimitiveValue>(list.item(0))->doubleValue();
+    auto height = downcast<CSSPrimitiveValue>(list.item(1))->doubleValue();
+    if (!width || !height)
+        builderState.style().setAspectRatioType(AspectRatioType::AutoZero);
+    else
+        builderState.style().setAspectRatioType(AspectRatioType::Ratio);
+    builderState.style().setAspectRatio(width, height);
 }