Changeset 274415 in webkit

Timestamp:

Mar 15, 2021 6:00:06 AM (16 months ago)

Author:

commit-queue@webkit.org

Message:

CSS aspect-ratio interpolation
​https://bugs.webkit.org/show_bug.cgi?id=220848

Patch by Rob Buis <​rbuis@igalia.com> on 2021-03-15
Reviewed by Antoine Quint.

LayoutTests/imported/w3c:

Import relevant test.

• web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation-expected.txt: Added.
• web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html: Added.

Source/WebCore:

Implement CSS aspect-ratio interpolation as defined here:
​https://drafts.csswg.org/css-values/#combine-ratio

Test: imported/w3c/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html

• animation/CSSPropertyAnimation.cpp:

(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/CSSPropertyAnimation.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-03-15  Rob Buis  <rbuis@igalia.com>
+
+        CSS aspect-ratio interpolation
+        https://bugs.webkit.org/show_bug.cgi?id=220848
+
+        Reviewed by Antoine Quint.
+
+        Import relevant test.
+
+        * web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation-expected.txt: Added.
+        * web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html: Added.
+
 2021-03-10  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-15  Rob Buis  <rbuis@igalia.com>
+
+        CSS aspect-ratio interpolation
+        https://bugs.webkit.org/show_bug.cgi?id=220848
+
+        Reviewed by Antoine Quint.
+
+        Implement CSS aspect-ratio interpolation as defined here:
+        https://drafts.csswg.org/css-values/#combine-ratio
+
+        Test: imported/w3c/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html
+
+        * animation/CSSPropertyAnimation.cpp:
+        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+
 2021-03-15  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp

@@ -1853 +1853 @@
         else
             NonNegativeFloatPropertyWrapper::blend(client, destination, from, to, progress);
+    }
+};
+
+class PropertyWrapperAspectRatio final : public AnimationPropertyWrapperBase {
+    WTF_MAKE_FAST_ALLOCATED;
+public:
+    PropertyWrapperAspectRatio()
+        : AnimationPropertyWrapperBase(CSSPropertyAspectRatio)
+    {
+    }
+
+    bool equals(const RenderStyle* a, const RenderStyle* b) const final
+    {
+        if (a == b)
+            return true;
+        if (!a || !b)
+            return false;
+
+        return a->aspectRatioType() == b->aspectRatioType() && a->aspectRatioWidth() == b->aspectRatioWidth() && a->aspectRatioHeight() == b->aspectRatioHeight();
+    }
+
+    bool canInterpolate(const RenderStyle* from, const RenderStyle* to) const final
+    {
+        return (from->aspectRatioType() == AspectRatioType::Ratio && to->aspectRatioType() == AspectRatioType::Ratio) || (from->aspectRatioType() == AspectRatioType::AutoAndRatio && to->aspectRatioType() == AspectRatioType::AutoAndRatio);
+    }
+
+#if !LOG_DISABLED
+    void logBlend(const RenderStyle* from, const RenderStyle* to, const RenderStyle* result, double progress) const final
+    {
+        LOG_WITH_STREAM(Animations, stream << "  blending " << getPropertyName(property()) << " from " << from->logicalAspectRatio() << " to " << to->logicalAspectRatio() << " at " << TextStream::FormatNumberRespectingIntegers(progress) << " -> " << result->logicalAspectRatio());
+    }
+#endif
+
+    void blend(const CSSPropertyBlendingClient*, RenderStyle* destination, const RenderStyle* from, const RenderStyle* to, double progress) const final
+    {
+        destination->setAspectRatioType(progress < 0.5 ? from->aspectRatioType() : to->aspectRatioType());
+        if (canInterpolate(from, to)) {
+            auto aspectRatioDst = WebCore::blend(log(from->logicalAspectRatio()), log(to->logicalAspectRatio()), progress);
+            destination->setAspectRatio(exp(aspectRatioDst), 1);
+            return;
+        }
+        // For auto/auto-zero aspect-ratio we use discrete values, we can't use general
+        // logic since logicalAspectRatio asserts on aspect-ratio type.
+        ASSERT(!progress || progress == 1);
+        auto* applicableStyle = progress ? to : from;
+        destination->setAspectRatio(applicableStyle->aspectRatioWidth(), applicableStyle->aspectRatioHeight());
     }
 };
@@ -2154 +2200 @@
         new DiscretePropertyWrapper<BlendMode>(CSSPropertyMixBlendMode, &RenderStyle::blendMode, &RenderStyle::setBlendMode),
 #endif
+        new PropertyWrapperAspectRatio,
     };
     const unsigned animatableLonghandPropertiesCount = WTF_ARRAY_LENGTH(animatableLonghandPropertyWrappers);