Changeset 285413 in webkit

Timestamp:

Nov 8, 2021 10:37:35 AM (8 months ago)

Author:

Chris Dumez

Message:

Stop using a timer to dispatch the source element's error event asynchronously
​https://bugs.webkit.org/show_bug.cgi?id=232817

Reviewed by Youenn Fablet.

Stop using a timer to dispatch the source element's error event asynchronously and use
the HTML5 event loop instead.

• html/HTMLSourceElement.cpp:

(WebCore::HTMLSourceElement::HTMLSourceElement):
(WebCore::HTMLSourceElement::scheduleErrorEvent):
(WebCore::HTMLSourceElement::cancelPendingErrorEvent):
(WebCore::HTMLSourceElement::errorEventTimerFired): Deleted.
(WebCore::HTMLSourceElement::suspend): Deleted.
(WebCore::HTMLSourceElement::resume): Deleted.

• html/HTMLSourceElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLSourceElement.cpp (modified) (4 diffs)
• html/HTMLSourceElement.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-08  Chris Dumez  <cdumez@apple.com>
+
+        Stop using a timer to dispatch the source element's error event asynchronously
+        https://bugs.webkit.org/show_bug.cgi?id=232817
+
+        Reviewed by Youenn Fablet.
+
+        Stop using a timer to dispatch the source element's error event asynchronously and use
+        the HTML5 event loop instead.
+
+        * html/HTMLSourceElement.cpp:
+        (WebCore::HTMLSourceElement::HTMLSourceElement):
+        (WebCore::HTMLSourceElement::scheduleErrorEvent):
+        (WebCore::HTMLSourceElement::cancelPendingErrorEvent):
+        (WebCore::HTMLSourceElement::errorEventTimerFired): Deleted.
+        (WebCore::HTMLSourceElement::suspend): Deleted.
+        (WebCore::HTMLSourceElement::resume): Deleted.
+        * html/HTMLSourceElement.h:
+
 2021-11-08  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/html/HTMLSourceElement.cpp

@@ -55 +55 @@
     : HTMLElement(tagName, document)
     , ActiveDOMObject(document)
-    , m_errorEventTimer(*this, &HTMLSourceElement::errorEventTimerFired)
 {
     LOG(Media, "HTMLSourceElement::HTMLSourceElement - %p", this);
@@ -126 +125 @@
 {
     LOG(Media, "HTMLSourceElement::scheduleErrorEvent - %p", this);
-    if (m_errorEventTimer.isActive())
+    if (m_errorEventCancellationGroup.hasPendingTask())
         return;
 
-    m_errorEventTimer.startOneShot(0_s);
+    queueCancellableTaskToDispatchEvent(*this, TaskSource::MediaElement, m_errorEventCancellationGroup, Event::create(eventNames().errorEvent, Event::CanBubble::No, Event::IsCancelable::Yes));
 }
 
@@ -135 +134 @@
 {
     LOG(Media, "HTMLSourceElement::cancelPendingErrorEvent - %p", this);
-    m_errorEventTimer.stop();
-}
-
-void HTMLSourceElement::errorEventTimerFired()
-{
-    LOG(Media, "HTMLSourceElement::errorEventTimerFired - %p", this);
-    dispatchEvent(Event::create(eventNames().errorEvent, Event::CanBubble::No, Event::IsCancelable::Yes));
+    m_errorEventCancellationGroup.cancel();
 }
 
@@ -152 +145 @@
 {
     return "HTMLSourceElement";
-}
-
-void HTMLSourceElement::suspend(ReasonForSuspension reason)
-{
-    // FIXME: Shouldn't this also stop the timer for PageWillBeSuspended?
-    if (reason == ReasonForSuspension::BackForwardCache) {
-        m_shouldRescheduleErrorEventOnResume = m_errorEventTimer.isActive();
-        m_errorEventTimer.stop();
-    }
-}
-
-void HTMLSourceElement::resume()
-{
-    if (m_shouldRescheduleErrorEventOnResume) {
-        m_errorEventTimer.startOneShot(0_s);
-        m_shouldRescheduleErrorEventOnResume = false;
-    }
 }
 

trunk/Source/WebCore/html/HTMLSourceElement.h

@@ -54 +54 @@
     // ActiveDOMObject.
     const char* activeDOMObjectName() const final;
-    void suspend(ReasonForSuspension) final;
-    void resume() final;
     void stop() final;
 
@@ -62 +60 @@
     void attributeChanged(const QualifiedName&, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason) final;
 
-    void errorEventTimerFired();
-
-    Timer m_errorEventTimer;
-    bool m_shouldRescheduleErrorEventOnResume { false };
+    TaskCancellationGroup m_errorEventCancellationGroup;
     bool m_shouldCallSourcesChanged { false };
     mutable std::optional<RefPtr<const MediaQuerySet>> m_cachedParsedMediaAttribute;