Changeset 252007 in webkit

Timestamp:

Nov 4, 2019 12:36:17 PM (5 years ago)

Author:

Chris Dumez

Message:

Port WebAnimation to the HTML5 event loop
​https://bugs.webkit.org/show_bug.cgi?id=203797

Reviewed by Ryosuke Niwa.

• animation/WebAnimation.cpp:

(WebCore::WebAnimation::WebAnimation):
(WebCore::WebAnimation::enqueueAnimationPlaybackEvent):
(WebCore::WebAnimation::stop):
(WebCore::WebAnimation::hasPendingActivity const):

• animation/WebAnimation.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• animation/WebAnimation.cpp (modified) (5 diffs)
• animation/WebAnimation.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-04  Chris Dumez  <cdumez@apple.com>
+
+        Port WebAnimation to the HTML5 event loop
+        https://bugs.webkit.org/show_bug.cgi?id=203797
+
+        Reviewed by Ryosuke Niwa.
+
+        * animation/WebAnimation.cpp:
+        (WebCore::WebAnimation::WebAnimation):
+        (WebCore::WebAnimation::enqueueAnimationPlaybackEvent):
+        (WebCore::WebAnimation::stop):
+        (WebCore::WebAnimation::hasPendingActivity const):
+        * animation/WebAnimation.h:
+
 2019-11-04  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/animation/WebAnimation.cpp

@@ -27 +27 @@
 #include "WebAnimation.h"
 
+#include "AbstractEventLoop.h"
 #include "AnimationEffect.h"
 #include "AnimationPlaybackEvent.h"
@@ -69 +70 @@
     , m_readyPromise(makeUniqueRef<ReadyPromise>(*this, &WebAnimation::readyPromiseResolve))
     , m_finishedPromise(makeUniqueRef<FinishedPromise>(*this, &WebAnimation::finishedPromiseResolve))
-    , m_taskQueue(SuspendableTaskQueue::create(document))
 {
     m_readyPromise->resolve(*this);
@@ -627 +627 @@
     } else {
         // Otherwise, queue a task to dispatch event at animation. The task source for this task is the DOM manipulation task source.
-        m_taskQueue->enqueueTask([this, event = WTFMove(event)] {
-            dispatchEvent(event);
-        });
+        queueTaskToDispatchEvent(*this, TaskSource::DOMManipulation, WTFMove(event));
     }
 }
@@ -1182 +1180 @@
 void WebAnimation::stop()
 {
-    m_taskQueue->cancelAllTasks();
     ActiveDOMObject::stop();
     removeAllEventListeners();
@@ -1190 +1187 @@
 {
     // Keep the JS wrapper alive if the animation is considered relevant or could become relevant again by virtue of having a timeline.
-    return m_timeline || m_isRelevant || m_taskQueue->hasPendingTasks() || ActiveDOMObject::hasPendingActivity();
+    return m_timeline || m_isRelevant || ActiveDOMObject::hasPendingActivity();
 }
 

trunk/Source/WebCore/animation/WebAnimation.h

@@ -30 +30 @@
 #include "ExceptionOr.h"
 #include "IDLTypes.h"
-#include "SuspendableTaskQueue.h"
 #include "WebAnimationUtilities.h"
 #include <wtf/Markable.h>
@@ -180 +179 @@
     UniqueRef<ReadyPromise> m_readyPromise;
     UniqueRef<FinishedPromise> m_finishedPromise;
-    UniqueRef<SuspendableTaskQueue> m_taskQueue;
     Markable<Seconds, Seconds::MarkableTraits> m_previousCurrentTime;
     Markable<Seconds, Seconds::MarkableTraits> m_startTime;