Changeset 274939 in webkit

Timestamp:

Mar 24, 2021 8:14:55 AM (16 months ago)

Author:

graouts@webkit.org

Message:

Support animation of the tab-size CSS property
​https://bugs.webkit.org/show_bug.cgi?id=223688

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Import the tab-size interpolation test with its 196 tests passing.

• web-platform-tests/css/css-text/animations/tab-size-interpolation-expected.txt: Added.
• web-platform-tests/css/css-text/animations/tab-size-interpolation.html: Added.

Source/WebCore:

Test: imported/w3c/web-platform-tests/css/css-text/animations/tab-size-interpolation.html

• animation/CSSPropertyAnimation.cpp:

(WebCore::blendFunc):
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):

• platform/graphics/TabSize.h:

(WebCore::TabSize::value const):
(WebCore::TabSize::operator bool const):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-text/animations/tab-size-interpolation-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-text/animations/tab-size-interpolation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/CSSPropertyAnimation.cpp (modified) (4 diffs)
• Source/WebCore/platform/graphics/TabSize.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-03-24  Antoine Quint  <graouts@webkit.org>
+
+        Support animation of the tab-size CSS property
+        https://bugs.webkit.org/show_bug.cgi?id=223688
+
+        Reviewed by Antti Koivisto.
+
+        Import the tab-size interpolation test with its 196 tests passing.
+
+        * web-platform-tests/css/css-text/animations/tab-size-interpolation-expected.txt: Added.
+        * web-platform-tests/css/css-text/animations/tab-size-interpolation.html: Added.
+
 2021-03-24  Chris Lord  <clord@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-24  Antoine Quint  <graouts@webkit.org>
+
+        Support animation of the tab-size CSS property
+        https://bugs.webkit.org/show_bug.cgi?id=223688
+
+        Reviewed by Antti Koivisto.
+
+        Test: imported/w3c/web-platform-tests/css/css-text/animations/tab-size-interpolation.html
+
+        * animation/CSSPropertyAnimation.cpp:
+        (WebCore::blendFunc):
+        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+        * platform/graphics/TabSize.h:
+        (WebCore::TabSize::value const):
+        (WebCore::TabSize::operator bool const):
+
 2021-03-24  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp

@@ -58 +58 @@
 #include "StylePropertyShorthand.h"
 #include "StyleResolver.h"
+#include "TabSize.h"
 #include <algorithm>
 #include <memory>
@@ -99 +100 @@
         return progress < 0.5 ? from : to;
     return blend(from.length(), to.length(), progress, ValueRangeNonNegative);
+}
+
+static inline TabSize blendFunc(const CSSPropertyBlendingClient*, const TabSize& from, const TabSize& to, double progress)
+{
+    auto blendedValue = blend(from.value(), to.value(), progress);
+    return { blendedValue < 0 ? 0 : blendedValue, from.isSpaces() ? SpaceValueType : LengthValueType };
 }
 
@@ -1856 +1863 @@
 };
 
+class TabSizePropertyWrapper final : public PropertyWrapper<const TabSize&> {
+    WTF_MAKE_FAST_ALLOCATED;
+public:
+    TabSizePropertyWrapper()
+        : PropertyWrapper<const TabSize&>(CSSPropertyTabSize, &RenderStyle::tabSize, &RenderStyle::setTabSize)
+    {
+    }
+
+private:
+    bool canInterpolate(const RenderStyle* from, const RenderStyle* to) const final
+    {
+        return value(from).isSpaces() == value(to).isSpaces();
+    }
+
+    void blend(const CSSPropertyBlendingClient* client, RenderStyle* destination, const RenderStyle* from, const RenderStyle* to, double progress) const final
+    {
+        if (!canInterpolate(from, to))
+            (destination->*m_setter)(progress ? value(to) : value(from));
+        else
+            PropertyWrapper::blend(client, destination, from, to, progress);
+    }
+};
+
 class PropertyWrapperAspectRatio final : public AnimationPropertyWrapperBase {
     WTF_MAKE_FAST_ALLOCATED;
@@ -2118 +2148 @@
         new NonNegativeFloatPropertyWrapper(CSSPropertyFlexShrink, &RenderStyle::flexShrink, &RenderStyle::setFlexShrink),
         new PropertyWrapper<int>(CSSPropertyOrder, &RenderStyle::order, &RenderStyle::setOrder),
+
+        new TabSizePropertyWrapper,
 
         // FIXME: The following properties are currently not animatable but should be:

trunk/Source/WebCore/platform/graphics/TabSize.h

@@ -54 +54 @@
     }
 
-    operator bool() const { return m_value; }
+    float value() const
+    {
+        return m_value;
+    }
+
+    operator bool() const { return value(); }
 
     float m_value;