Changeset 252981 in webkit

Timestamp:

Dec 2, 2019 5:20:51 AM (4 years ago)

Author:

youenn@apple.com

Message:

Remove MediaStreamTrack event queue
​https://bugs.webkit.org/show_bug.cgi?id=204603

Reviewed by Eric Carlson.

Small refactoring to remove the track event queue and use ActiveDOMObject::queueTaskToDispatchEvent instead.
Updated some #include as some include fixes were needed.
No change of behavior.

• Modules/mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::trackMutedChanged):

• Modules/mediastream/MediaStreamTrack.h:
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
• platform/mediastream/MediaStreamPrivate.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStreamTrack.cpp (modified) (1 diff)
• Modules/mediastream/MediaStreamTrack.h (modified) (2 diffs)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (modified) (1 diff)
• platform/mediastream/MediaStreamPrivate.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-12-02  youenn fablet  <youenn@apple.com>
+
+        Remove MediaStreamTrack event queue
+        https://bugs.webkit.org/show_bug.cgi?id=204603
+
+        Reviewed by Eric Carlson.
+
+        Small refactoring to remove the track event queue and use ActiveDOMObject::queueTaskToDispatchEvent instead.
+        Updated some #include as some include fixes were needed.
+        No change of behavior.
+
+        * Modules/mediastream/MediaStreamTrack.cpp:
+        (WebCore::MediaStreamTrack::trackMutedChanged):
+        * Modules/mediastream/MediaStreamTrack.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
+        * platform/mediastream/MediaStreamPrivate.h:
+
 2019-12-02  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

@@ -512 +512 @@
 void MediaStreamTrack::trackMutedChanged(MediaStreamTrackPrivate&)
 {
-    if (scriptExecutionContext()->activeDOMObjectsAreSuspended() || scriptExecutionContext()->activeDOMObjectsAreStopped() || m_ended)
-        return;
-
-    m_eventTaskQueue.enqueueTask([this, muted = this->muted()] {
-        AtomString eventType = muted ? eventNames().muteEvent : eventNames().unmuteEvent;
-        dispatchEvent(Event::create(eventType, Event::CanBubble::No, Event::IsCancelable::No));
-    });
+    if (scriptExecutionContext()->activeDOMObjectsAreStopped() || m_ended)
+        return;
+
+    AtomString eventType = muted() ? eventNames().muteEvent : eventNames().unmuteEvent;
+    queueTaskToDispatchEvent(*this, TaskSource::Networking, Event::create(eventType, Event::CanBubble::No, Event::IsCancelable::No));
 
     configureTrackRendering();

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

@@ -33 +33 @@
 #include "DoubleRange.h"
 #include "EventTarget.h"
-#include "GenericTaskQueue.h"
 #include "LongRange.h"
 #include "MediaProducer.h"
@@ -217 +216 @@
     MediaTrackConstraints m_constraints;
     std::unique_ptr<DOMPromiseDeferred<void>> m_promise;
-    GenericTaskQueue<Timer> m_eventTaskQueue;
 
     bool m_ended { false };

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h

@@ -33 +33 @@
 #include "MediaStreamPrivate.h"
 #include <CoreGraphics/CGAffineTransform.h>
+#include <wtf/Deque.h>
 #include <wtf/Function.h>
 #include <wtf/LoggerHelper.h>

trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h

@@ -38 +38 @@
 
 #include "FloatSize.h"
-#include "MediaStreamTrack.h"
 #include "MediaStreamTrackPrivate.h"
 #include <wtf/Function.h>
 #include <wtf/HashMap.h>
-#include <wtf/LoggerHelper.h>
 #include <wtf/MediaTime.h>
-#include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 #include <wtf/UUID.h>