Changeset 261488 in webkit

Timestamp:

May 11, 2020 12:37:24 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[Web Animations] Document.getAnimations() should only consider document connection and not timeline association
​https://bugs.webkit.org/show_bug.cgi?id=211697

Patch by Antoine Quint <Antoine Quint> on 2020-05-11
Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Mark two additional WPT tests as PASS.

• web-platform-tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations-expected.txt:

Source/WebCore:

The Document.getAnimations() function should return any animation running for an element that is a child of the
target Document. We now consider all current animations, regardless of which timeline they might be associated
with. This lets us pass the final two WPT Document.getAnimations() tests.

• dom/Document.cpp:

(WebCore::Document::matchingAnimations):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-05-11  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Document.getAnimations() should only consider document connection and not timeline association
+        https://bugs.webkit.org/show_bug.cgi?id=211697
+
+        Reviewed by Dean Jackson.
+
+        Mark two additional WPT tests as PASS.
+
+        * web-platform-tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations-expected.txt:
+
 2020-05-10  Rob Buis  <rbuis@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations-expected.txt

@@ -5 +5 @@
 PASS Document.getAnimations() does not return a disconnected node 
 PASS Document.getAnimations() does not return an animation with a null target 
-FAIL Document.getAnimations() returns animations on elements inside same-origin iframes assert_equals: expected 1 but got 0
-FAIL iframe.contentDocument.getAnimations() returns animations on elements inside same-origin Document assert_equals: expected 1 but got 0
+PASS Document.getAnimations() returns animations on elements inside same-origin iframes 
+PASS iframe.contentDocument.getAnimations() returns animations on elements inside same-origin Document 
 PASS ShadowRoot.getAnimations() return all animations in the shadow tree 
 PASS Document.getAnimations() does NOT return animations in shadow trees 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-11  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Document.getAnimations() should only consider document connection and not timeline association
+        https://bugs.webkit.org/show_bug.cgi?id=211697
+
+        Reviewed by Dean Jackson.
+
+        The Document.getAnimations() function should return any animation running for an element that is a child of the
+        target Document. We now consider all current animations, regardless of which timeline they might be associated
+        with. This lets us pass the final two WPT Document.getAnimations() tests.
+
+        * dom/Document.cpp:
+        (WebCore::Document::matchingAnimations):
+
 2020-05-11  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -8130 +8130 @@
     updateStyleIfNeeded();
 
-    if (!m_timeline)
-        return { };
-
     Vector<RefPtr<WebAnimation>> animations;
-    for (auto& animation : m_timeline->relevantAnimations()) {
+    for (auto* animation : WebAnimation::instances()) {
         if (!animation || !animation->isRelevant() || !is<KeyframeEffect>(animation->effect()))
             continue;
 
         auto* target = downcast<KeyframeEffect>(*animation->effect()).targetElementOrPseudoElement();
-        if (target && target->isDescendantOf(this) && function(*target))
+        if (target && target->isConnected() && &target->document() == this && function(*target))
             animations.append(animation);
     }