Changeset 248853 in webkit

Timestamp:

Aug 19, 2019 8:46:04 AM (5 years ago)

Author:

youenn@apple.com

Message:

Stop MediaDevices timer when stopping MediaDevices
​https://bugs.webkit.org/show_bug.cgi?id=200880

Reviewed by Eric Carlson.

No change of behavior.
Stop timer when stopping MediaDevices and check for MediaDevices being stopped before scheduling the timer.

• Modules/mediastream/MediaDevices.cpp:

(WebCore::MediaDevices::stop):
Remove document/controller check since at that point,
the document should not be null and the controller should be there.
(WebCore::MediaDevices::scheduledEventTimerFired):
(WebCore::MediaDevices::listenForDeviceChanges):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaDevices.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-19  Youenn Fablet  <youenn@apple.com>
+
+        Stop MediaDevices timer when stopping MediaDevices
+        https://bugs.webkit.org/show_bug.cgi?id=200880
+
+        Reviewed by Eric Carlson.
+
+        No change of behavior.
+        Stop timer when stopping MediaDevices and check for MediaDevices being stopped before scheduling the timer.
+
+        * Modules/mediastream/MediaDevices.cpp:
+        (WebCore::MediaDevices::stop):
+        Remove document/controller check since at that point,
+        the document should not be null and the controller should be there.
+        (WebCore::MediaDevices::scheduledEventTimerFired):
+        (WebCore::MediaDevices::listenForDeviceChanges):
+
 2019-08-19  Yusuke Suzuki  <ysuzuki@apple.com>
 

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

@@ -74 +74 @@
 {
     if (m_deviceChangeToken) {
-        auto* document = this->document();
-        auto* controller = document ? UserMediaController::from(document->page()) : nullptr;
-        if (document && controller)
-            controller->removeDeviceChangeObserver(m_deviceChangeToken);
+        auto* controller = UserMediaController::from(document()->page());
+        controller->removeDeviceChangeObserver(m_deviceChangeToken);
     }
     m_devices.clear();
+    m_scheduledEventTimer.stop();
 }
 
@@ -207 +206 @@
 void MediaDevices::scheduledEventTimerFired()
 {
-    if (isContextStopped())
-        return;
-
+    ASSERT(!isContextStopped());
     dispatchEvent(Event::create(eventNames().devicechangeEvent, Event::CanBubble::No, Event::IsCancelable::No));
 }
@@ -241 +238 @@
 
     m_deviceChangeToken = controller->addDeviceChangeObserver([weakThis = makeWeakPtr(*this), this]() {
-        if (!weakThis || m_scheduledEventTimer.isActive())
+        if (!weakThis || isContextStopped() || m_scheduledEventTimer.isActive())
             return;