Changeset 276465 in webkit

Timestamp:

Apr 22, 2021 3:07:02 PM (15 months ago)

Author:

graouts@webkit.org

Message:

Add discrete animation support for border-image-repeat
​https://bugs.webkit.org/show_bug.cgi?id=224923

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Mark 10 WPT progressions.

• web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt:
• web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt:
• web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt:

Source/WebCore:

• animation/CSSPropertyAnimation.cpp:

(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):

• rendering/style/NinePieceImage.cpp:

(WebCore::operator<<):

• rendering/style/NinePieceImage.h:
• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::setBorderImageHorizontalRule):
(WebCore::RenderStyle::setBorderImageVerticalRule):

• rendering/style/RenderStyle.h:

(WebCore::RenderStyle::borderImageHorizontalRule const):
(WebCore::RenderStyle::borderImageVerticalRule const):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/CSSPropertyAnimation.cpp (modified) (6 diffs)
• Source/WebCore/rendering/style/NinePieceImage.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/NinePieceImage.h (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-04-22  Antoine Quint  <graouts@webkit.org>
+
+        Add discrete animation support for border-image-repeat
+        https://bugs.webkit.org/show_bug.cgi?id=224923
+
+        Reviewed by Antti Koivisto.
+
+        Mark 10 WPT progressions.
+
+        * web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt:
+        * web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt:
+        * web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt:
+
 2021-04-22  Chris Lord  <clord@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt

@@ -45 +45 @@
 PASS border-collapse: "separate" onto "collapse"
 PASS border-collapse: "collapse" onto "separate"
+PASS border-image-repeat (type: discrete) has testAccumulation function
+PASS border-image-repeat: "round space" onto "stretch repeat"
+PASS border-image-repeat: "stretch repeat" onto "round space"
 PASS border-image-source (type: discrete) has testAccumulation function
 PASS border-image-source: "url("http://localhost/test-2")" onto "url("http://localhost/test-1")"

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt

@@ -45 +45 @@
 PASS border-collapse: "separate" onto "collapse"
 PASS border-collapse: "collapse" onto "separate"
+PASS border-image-repeat (type: discrete) has testAddition function
+PASS border-image-repeat: "round space" onto "stretch repeat"
+PASS border-image-repeat: "stretch repeat" onto "round space"
 PASS border-image-source (type: discrete) has testAddition function
 PASS border-image-source: "url("http://localhost/test-2")" onto "url("http://localhost/test-1")"

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt

@@ -54 +54 @@
 PASS border-collapse uses discrete animation when animating between "collapse" and "separate" with effect easing
 PASS border-collapse uses discrete animation when animating between "collapse" and "separate" with keyframe easing
+PASS border-image-repeat (type: discrete) has testInterpolation function
+PASS border-image-repeat uses discrete animation when animating between "stretch repeat" and "round space" with linear easing
+PASS border-image-repeat uses discrete animation when animating between "stretch repeat" and "round space" with effect easing
+PASS border-image-repeat uses discrete animation when animating between "stretch repeat" and "round space" with keyframe easing
 PASS border-image-source (type: discrete) has testInterpolation function
 FAIL border-image-source uses discrete animation when animating between "url("http://localhost/test-1")" and "url("http://localhost/test-2")" with linear easing assert_equals: The value should be url("http://localhost/test-1") at 499ms expected "url(\"http://localhost/test-1\")" but got "url(\"http://localhost/test-2\")"

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-22  Antoine Quint  <graouts@webkit.org>
+
+        Add discrete animation support for border-image-repeat
+        https://bugs.webkit.org/show_bug.cgi?id=224923
+
+        Reviewed by Antti Koivisto.
+
+        * animation/CSSPropertyAnimation.cpp:
+        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+        * rendering/style/NinePieceImage.cpp:
+        (WebCore::operator<<):
+        * rendering/style/NinePieceImage.h:
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::setBorderImageHorizontalRule):
+        (WebCore::RenderStyle::setBorderImageVerticalRule):
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyle::borderImageHorizontalRule const):
+        (WebCore::RenderStyle::borderImageVerticalRule const):
+
 2021-04-22  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp

@@ -621 +621 @@
     }
 
-private:
     bool equals(const RenderStyle& a, const RenderStyle& b) const override
     {
@@ -636 +635 @@
 #endif
 
+private:
     T (RenderStyle::*m_getter)() const;
 };
@@ -685 +685 @@
     }
 
-private:
-    bool canInterpolate(const RenderStyle&, const RenderStyle&) const final { return false; }
-
     void blend(RenderStyle& destination, const RenderStyle& from, const RenderStyle& to, const CSSPropertyBlendingContext& context) const final
     {
@@ -694 +691 @@
     }
 
+private:
+    bool canInterpolate(const RenderStyle&, const RenderStyle&) const final { return false; }
+
     void (RenderStyle::*m_setter)(T);
+};
+
+class BorderImageRepeatWrapper final : public AnimationPropertyWrapperBase {
+    WTF_MAKE_FAST_ALLOCATED;
+public:
+    BorderImageRepeatWrapper()
+        : AnimationPropertyWrapperBase(CSSPropertyBorderImageRepeat)
+        , m_horizontalWrapper(DiscretePropertyWrapper<NinePieceImageRule>(CSSPropertyBorderImageRepeat, &RenderStyle::borderImageHorizontalRule, &RenderStyle::setBorderImageHorizontalRule))
+        , m_verticalWrapper(DiscretePropertyWrapper<NinePieceImageRule>(CSSPropertyBorderImageRepeat, &RenderStyle::borderImageVerticalRule, &RenderStyle::setBorderImageVerticalRule))
+    {
+    }
+
+private:
+    bool canInterpolate(const RenderStyle&, const RenderStyle&) const final { return false; }
+
+    bool equals(const RenderStyle& a, const RenderStyle& b) const override
+    {
+        return m_horizontalWrapper.equals(a, b) && m_verticalWrapper.equals(a, b);
+    }
+
+    void blend(RenderStyle& destination, const RenderStyle& from, const RenderStyle& to, const CSSPropertyBlendingContext& context) const final
+    {
+        m_horizontalWrapper.blend(destination, from, to, context);
+        m_verticalWrapper.blend(destination, from, to, context);
+    }
+
+#if !LOG_DISABLED
+    void logBlend(const RenderStyle& from, const RenderStyle& to, const RenderStyle& destination, double progress) const final
+    {
+        m_horizontalWrapper.logBlend(from, to, destination, progress);
+        m_verticalWrapper.logBlend(from, to, destination, progress);
+    }
+#endif
+
+    DiscretePropertyWrapper<NinePieceImageRule> m_horizontalWrapper;
+    DiscretePropertyWrapper<NinePieceImageRule> m_verticalWrapper;
 };
 
@@ -2323 +2359 @@
 
         // FIXME: The following properties are currently not animatable but should be:
-        // background-blend-mode, border-image-repeat, clip-rule, color-interpolation,
+        // background-blend-mode, clip-rule, color-interpolation,
         // color-interpolation-filters, counter-increment, counter-reset, dominant-baseline,
         // fill-rule, font-family, font-feature-settings, font-kerning, font-language-override,
@@ -2343 +2379 @@
         new DiscretePropertyWrapper<BorderStyle>(CSSPropertyBorderBottomStyle, &RenderStyle::borderBottomStyle, &RenderStyle::setBorderBottomStyle),
         new DiscretePropertyWrapper<BorderCollapse>(CSSPropertyBorderCollapse, &RenderStyle::borderCollapse, &RenderStyle::setBorderCollapse),
+        new BorderImageRepeatWrapper,
         new DiscretePropertyWrapper<BorderStyle>(CSSPropertyBorderLeftStyle, &RenderStyle::borderLeftStyle, &RenderStyle::setBorderLeftStyle),
         new DiscretePropertyWrapper<BorderStyle>(CSSPropertyBorderRightStyle, &RenderStyle::borderRightStyle, &RenderStyle::setBorderRightStyle),

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

@@ -291 +291 @@
 }
 
-}
+TextStream& operator<<(TextStream& ts, NinePieceImageRule rule)
+{
+    switch (rule) {
+    case NinePieceImageRule::Stretch: ts << "stretch"; break;
+    case NinePieceImageRule::Round: ts << "round"; break;
+    case NinePieceImageRule::Space: ts << "space"; break;
+    case NinePieceImageRule::Repeat: ts << "repeat"; break;
+    }
+    return ts;
+}
+
+}

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

@@ -216 +216 @@
 
 WTF::TextStream& operator<<(WTF::TextStream&, const NinePieceImage&);
+WTF::TextStream& operator<<(WTF::TextStream&, NinePieceImageRule);
 
 } // namespace WebCore

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

@@ -2350 +2350 @@
 }
 
+void RenderStyle::setBorderImageHorizontalRule(NinePieceImageRule rule)
+{
+    if (m_surroundData->border.m_image.horizontalRule() == rule)
+        return;
+    m_surroundData.access().border.m_image.setHorizontalRule(rule);
+}
+
+void RenderStyle::setBorderImageVerticalRule(NinePieceImageRule rule)
+{
+    if (m_surroundData->border.m_image.verticalRule() == rule)
+        return;
+    m_surroundData.access().border.m_image.setVerticalRule(rule);
+}
+
 void RenderStyle::setColumnStylesFromPaginationMode(const Pagination::Mode& paginationMode)
 {

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

@@ -293 +293 @@
     const LengthBox& borderImageWidth() const { return m_surroundData->border.image().borderSlices(); }
     const LengthBox& borderImageOutset() const { return m_surroundData->border.image().outset(); }
+    NinePieceImageRule borderImageHorizontalRule() const { return m_surroundData->border.image().horizontalRule(); }
+    NinePieceImageRule borderImageVerticalRule() const { return m_surroundData->border.image().verticalRule(); }
 
     const LengthSize& borderTopLeftRadius() const { return m_surroundData->border.topLeftRadius(); }
@@ -903 +905 @@
     void setBorderImageWidth(LengthBox&&);
     void setBorderImageOutset(LengthBox&&);
+    void setBorderImageHorizontalRule(NinePieceImageRule);
+    void setBorderImageVerticalRule(NinePieceImageRule);
 
     void setBorderTopLeftRadius(LengthSize&& size) { SET_VAR(m_surroundData, border.m_topLeftRadius, WTFMove(size)); }