Changeset 255141 in webkit

Timestamp:

Jan 27, 2020, 4:01:21 AM (6 years ago)

Author:

graouts@webkit.org

Message:

[Web Animations] Update all DocumentTimeline objects when updating animations
​https://bugs.webkit.org/show_bug.cgi?id=206819

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Mark a single new WPT progression.

• web-platform-tests/web-animations/timing-model/timelines/update-and-send-events-replacement-expected.txt:

Source/WebCore:

Developers can create additional DocumentTimeline objects in JavaScript using that class's constructor, and an animation can be
assigned to that timeline after its creation. Until now we would only update an timeline created by a Document when that document's
animations were updated. Now we keep track of all DocumentTimeline objects that are created for a given Document as a vector of weak
references, and we update all of them when updating a document's animations.

• animation/DocumentTimeline.cpp:

(WebCore::DocumentTimeline::DocumentTimeline):
(WebCore::DocumentTimeline::~DocumentTimeline):

• animation/DocumentTimeline.h:
• dom/Document.cpp:

(WebCore::Document::updateAnimationsAndSendEvents):
(WebCore::Document::addTimeline):
(WebCore::Document::removeTimeline):

• dom/Document.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/timing-model/timelines/update-and-send-events-replacement-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/DocumentTimeline.cpp (modified) (1 diff)
• Source/WebCore/animation/DocumentTimeline.h (modified) (2 diffs)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)
• Source/WebCore/dom/Document.h (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-01-26  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Update all DocumentTimeline objects when updating animations
+        https://bugs.webkit.org/show_bug.cgi?id=206819
+
+        Reviewed by Antti Koivisto.
+
+        Mark a single new WPT progression.
+
+        * web-platform-tests/web-animations/timing-model/timelines/update-and-send-events-replacement-expected.txt:
+
 2020-01-27  Rob Buis  <rbuis@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/timing-model/timelines/update-and-send-events-replacement-expected.txt

@@ -39 +39 @@
 PASS Does NOT remove an animation after making a redundant change to another animation's effect's properties 
 PASS Does NOT remove an animation after making a redundant change to its effect's properties 
-FAIL Updates ALL timelines before checking for replacement assert_equals: expected "removed" but got "active"
+PASS Updates ALL timelines before checking for replacement 
 PASS Dispatches remove events after finish events 
 PASS Fires remove event before requestAnimationFrame 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-26  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Update all DocumentTimeline objects when updating animations
+        https://bugs.webkit.org/show_bug.cgi?id=206819
+
+        Reviewed by Antti Koivisto.
+
+        Developers can create additional DocumentTimeline objects in JavaScript using that class's constructor, and an animation can be
+        assigned to that timeline after its creation. Until now we would only update an timeline created by a Document when that document's
+        animations were updated. Now we keep track of all DocumentTimeline objects that are created for a given Document as a vector of weak
+        references, and we update all of them when updating a document's animations.
+
+        * animation/DocumentTimeline.cpp:
+        (WebCore::DocumentTimeline::DocumentTimeline):
+        (WebCore::DocumentTimeline::~DocumentTimeline):
+        * animation/DocumentTimeline.h:
+        * dom/Document.cpp:
+        (WebCore::Document::updateAnimationsAndSendEvents):
+        (WebCore::Document::addTimeline):
+        (WebCore::Document::removeTimeline):
+        * dom/Document.h:
+
 2020-01-26  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/animation/DocumentTimeline.cpp

@@ -63 +63 @@
     , m_originTime(originTime)
 {
+    if (m_document)
+        m_document->addTimeline(*this);
     if (m_document && m_document->page() && !m_document->page()->isVisible())
         suspendAnimations();
 }
 
-DocumentTimeline::~DocumentTimeline() = default;
+DocumentTimeline::~DocumentTimeline()
+{
+    if (m_document)
+        m_document->removeTimeline(*this);
+}
 
 void DocumentTimeline::detachFromDocument()

trunk/Source/WebCore/animation/DocumentTimeline.h

@@ -32 +32 @@
 #include <wtf/Markable.h>
 #include <wtf/Ref.h>
+#include <wtf/WeakPtr.h>
 
 namespace WebCore {
@@ -38 +39 @@
 class RenderElement;
 
-class DocumentTimeline final : public AnimationTimeline
+class DocumentTimeline final : public AnimationTimeline, public CanMakeWeakPtr<DocumentTimeline>
 {
 public:

trunk/Source/WebCore/dom/Document.cpp

@@ -6353 +6353 @@
 void Document::updateAnimationsAndSendEvents(DOMHighResTimeStamp timestamp)
 {
-    if (m_timeline)
-        m_timeline->updateAnimationsAndSendEvents(timestamp);
+    ASSERT(!m_timelines.hasNullReferences());
+    // We need to copy m_timelines before iterating over its members since calling updateAnimationsAndSendEvents() may mutate m_timelines.
+    Vector<RefPtr<DocumentTimeline>> timelines;
+    for (auto& timeline : m_timelines)
+        timelines.append(&timeline);
+    for (auto& timeline : timelines)
+        timeline->updateAnimationsAndSendEvents(timestamp);
 }
 
@@ -8039 +8044 @@
 }
 
+void Document::addTimeline(DocumentTimeline& timeline)
+{
+    m_timelines.add(timeline);
+}
+
+void Document::removeTimeline(DocumentTimeline& timeline)
+{
+    m_timelines.remove(timeline);
+}
+
 DocumentTimeline& Document::timeline()
 {

trunk/Source/WebCore/dom/Document.h

@@ -1472 +1472 @@
     WEBCORE_EXPORT void setConsoleMessageListener(RefPtr<StringCallback>&&); // For testing.
 
+    void addTimeline(DocumentTimeline&);
+    void removeTimeline(DocumentTimeline&);
     WEBCORE_EXPORT DocumentTimeline& timeline();
     DocumentTimeline* existingTimeline() const { return m_timeline.get(); }
@@ -2038 +2040 @@
 
     RefPtr<DocumentTimeline> m_timeline;
+    WeakHashSet<DocumentTimeline> m_timelines;
+
     DocumentIdentifier m_identifier;