Changeset 290122 in webkit

Timestamp:

Feb 18, 2022 7:35:59 AM (5 months ago)

Author:

graouts@webkit.org

Message:

[custom-effect] Animations associated with a custom effect should appear in document.getAnimations() result
​https://bugs.webkit.org/show_bug.cgi?id=236828

Reviewed by Dean Jackson.

Source/WebCore:

Test: webanimations/custom-effect/custom-effect-get-animations.html

• dom/Document.cpp:

(WebCore::Document::matchingAnimations):

LayoutTests:

• webanimations/custom-effect/custom-effect-get-animations-expected.txt: Added.
• webanimations/custom-effect/custom-effect-get-animations.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webanimations/custom-effect/custom-effect-get-animations-expected.txt (added)
• LayoutTests/webanimations/custom-effect/custom-effect-get-animations.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-02-18  Antoine Quint  <graouts@webkit.org>
+
+        [custom-effect] Animations associated with a custom effect should appear in document.getAnimations() result
+        https://bugs.webkit.org/show_bug.cgi?id=236828
+
+        Reviewed by Dean Jackson.
+
+        * webanimations/custom-effect/custom-effect-get-animations-expected.txt: Added.
+        * webanimations/custom-effect/custom-effect-get-animations.html: Added.
+
 2022-02-18  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-18  Antoine Quint  <graouts@webkit.org>
+
+        [custom-effect] Animations associated with a custom effect should appear in document.getAnimations() result
+        https://bugs.webkit.org/show_bug.cgi?id=236828
+
+        Reviewed by Dean Jackson.
+
+        Test: webanimations/custom-effect/custom-effect-get-animations.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::matchingAnimations):
+
 2022-02-18  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -54 +54 @@
 #include "ContentfulPaintChecker.h"
 #include "CookieJar.h"
+#include "CustomEffect.h"
 #include "CustomElementReactionQueue.h"
 #include "CustomElementRegistry.h"
@@ -8516 +8517 @@
 
     Vector<RefPtr<WebAnimation>> animations;
+
+    auto effectCanBeListed = [&](AnimationEffect* effect) {
+        if (is<CustomEffect>(effect))
+            return true;
+
+        if (auto* keyframeEffect = dynamicDowncast<KeyframeEffect>(effect)) {
+            auto* target = keyframeEffect->target();
+            return target && target->isConnected() && &target->document() == this && function(*target);
+        }
+
+        return false;
+    };
+
     for (auto* animation : WebAnimation::instances()) {
-        if (!animation->isRelevant() || !is<KeyframeEffect>(animation->effect()))
-            continue;
-
-        auto* target = downcast<KeyframeEffect>(*animation->effect()).target();
-        if (target && target->isConnected() && &target->document() == this && function(*target))
+        if (animation->isRelevant() && effectCanBeListed(animation->effect()))
             animations.append(animation);
     }