Title: [290741] trunk
Revision
290741
Author
[email protected]
Date
2022-03-02 11:21:07 -0800 (Wed, 02 Mar 2022)

Log Message

[web-animations] setting the composite property on a keyframe effect should invalidate the target style
https://bugs.webkit.org/show_bug.cgi?id=237356

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

* web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling-expected.txt:

Source/WebCore:

* animation/KeyframeEffect.cpp:
(WebCore::KeyframeEffect::setComposite):
* animation/KeyframeEffect.h:
(WebCore::KeyframeEffect::setComposite): Deleted.

Modified Paths

Diff

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (290740 => 290741)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2022-03-02 19:06:52 UTC (rev 290740)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2022-03-02 19:21:07 UTC (rev 290741)
@@ -1,5 +1,14 @@
 2022-03-02  Antoine Quint  <[email protected]>
 
+        [web-animations] setting the composite property on a keyframe effect should invalidate the target style
+        https://bugs.webkit.org/show_bug.cgi?id=237356
+
+        Reviewed by Dean Jackson.
+
+        * web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling-expected.txt:
+
+2022-03-02  Antoine Quint  <[email protected]>
+
         [web-animations] changes to font-size should recompute keyframes
         https://bugs.webkit.org/show_bug.cgi?id=237357
 

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling-expected.txt (290740 => 290741)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling-expected.txt	2022-03-02 19:06:52 UTC (rev 290740)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling-expected.txt	2022-03-02 19:21:07 UTC (rev 290741)
@@ -4,7 +4,7 @@
 FAIL Filling effect values reflect changes to variables on element assert_equals: Effect value after updating variable expected "200px" but got "100px"
 FAIL Filling effect values reflect changes to variables on parent element assert_equals: Effect value after updating variable expected "400px" but got "200px"
 PASS Filling effect values reflect changes to the the animation's keyframes
-FAIL Filling effect values reflect changes to the the animation's composite mode assert_equals: Effect value after updating the composite mode expected "300px" but got "200px"
+PASS Filling effect values reflect changes to the the animation's composite mode
 FAIL Filling effect values reflect changes to the the animation's iteration composite mode assert_equals: Effect value after updating the iteration composite mode expected "200px" but got "100px"
 PASS Filling effect values reflect changes to the base value when using additive animation
 PASS Filling effect values reflect changes to the base value when using additive animation on a single keyframe

Modified: trunk/Source/WebCore/ChangeLog (290740 => 290741)


--- trunk/Source/WebCore/ChangeLog	2022-03-02 19:06:52 UTC (rev 290740)
+++ trunk/Source/WebCore/ChangeLog	2022-03-02 19:21:07 UTC (rev 290741)
@@ -1,3 +1,15 @@
+2022-03-02  Antoine Quint  <[email protected]>
+
+        [web-animations] setting the composite property on a keyframe effect should invalidate the target style
+        https://bugs.webkit.org/show_bug.cgi?id=237356
+
+        Reviewed by Dean Jackson.
+
+        * animation/KeyframeEffect.cpp:
+        (WebCore::KeyframeEffect::setComposite):
+        * animation/KeyframeEffect.h:
+        (WebCore::KeyframeEffect::setComposite): Deleted.
+
 2022-03-02  Tyler Wilcock  <[email protected]>
 
         AX: Handle null FileList in RenderFileUploadControl::fileTextValue()

Modified: trunk/Source/WebCore/animation/KeyframeEffect.cpp (290740 => 290741)


--- trunk/Source/WebCore/animation/KeyframeEffect.cpp	2022-03-02 19:06:52 UTC (rev 290740)
+++ trunk/Source/WebCore/animation/KeyframeEffect.cpp	2022-03-02 19:21:07 UTC (rev 290741)
@@ -2125,6 +2125,15 @@
     return AnimationEffect::timeToNextTick(timing);
 }
 
+void KeyframeEffect::setComposite(CompositeOperation compositeOperation)
+{
+    if (m_compositeOperation == compositeOperation)
+        return;
+
+    m_compositeOperation = compositeOperation;
+    invalidate();
+}
+
 CompositeOperation KeyframeEffect::bindingsComposite() const
 {
     if (is<DeclarativeAnimation>(animation()))

Modified: trunk/Source/WebCore/animation/KeyframeEffect.h (290740 => 290741)


--- trunk/Source/WebCore/animation/KeyframeEffect.h	2022-03-02 19:06:52 UTC (rev 290740)
+++ trunk/Source/WebCore/animation/KeyframeEffect.h	2022-03-02 19:21:07 UTC (rev 290741)
@@ -116,7 +116,7 @@
     IterationCompositeOperation iterationComposite() const { return m_iterationCompositeOperation; }
     void setIterationComposite(IterationCompositeOperation iterationCompositeOperation) { m_iterationCompositeOperation = iterationCompositeOperation; }
     CompositeOperation composite() const { return m_compositeOperation; }
-    void setComposite(CompositeOperation compositeOperation) { m_compositeOperation = compositeOperation; }
+    void setComposite(CompositeOperation);
     CompositeOperation bindingsComposite() const;
     void setBindingsComposite(CompositeOperation);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to