Changeset 249002 in webkit

Timestamp:

Aug 22, 2019, 4:05:50 AM (7 years ago)

Author:

youenn@apple.com

Message:

CaptureDeviceManager does not need to be CanMakeWeakPtr
​https://bugs.webkit.org/show_bug.cgi?id=200936

Reviewed by Alex Christensen.

CaptureDeviceManager does not need to create a weak pointer in deviceChanged
since it directly calls RealtimeMediaSourceCenter singleton.

CoreAudioCaptureDeviceManager does not need to create a weak pointer since its only
instance is NeverDestroyed.
No change of behavior.

• platform/mediastream/CaptureDeviceManager.cpp:

(WebCore::CaptureDeviceManager::deviceChanged):

• platform/mediastream/CaptureDeviceManager.h:
• platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp:

(WebCore::createAudioObjectPropertyListenerBlock):
(WebCore::CoreAudioCaptureDeviceManager::coreAudioCaptureDevices):
(WebCore::CoreAudioCaptureDeviceManager::refreshAudioCaptureDevices):

• platform/mediastream/mac/CoreAudioCaptureDeviceManager.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/CaptureDeviceManager.cpp (modified) (1 diff)
• platform/mediastream/CaptureDeviceManager.h (modified) (1 diff)
• platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp (modified) (3 diffs)
• platform/mediastream/mac/CoreAudioCaptureDeviceManager.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-22  Youenn Fablet  <youenn@apple.com>
+
+        CaptureDeviceManager does not need to be CanMakeWeakPtr
+        https://bugs.webkit.org/show_bug.cgi?id=200936
+
+        Reviewed by Alex Christensen.
+
+        CaptureDeviceManager does not need to create a weak pointer in deviceChanged
+        since it directly calls RealtimeMediaSourceCenter singleton.
+
+        CoreAudioCaptureDeviceManager does not need to create a weak pointer since its only
+        instance is NeverDestroyed.
+        No change of behavior.
+
+        * platform/mediastream/CaptureDeviceManager.cpp:
+        (WebCore::CaptureDeviceManager::deviceChanged):
+        * platform/mediastream/CaptureDeviceManager.h:
+        * platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp:
+        (WebCore::createAudioObjectPropertyListenerBlock):
+        (WebCore::CoreAudioCaptureDeviceManager::coreAudioCaptureDevices):
+        (WebCore::CoreAudioCaptureDeviceManager::refreshAudioCaptureDevices):
+        * platform/mediastream/mac/CoreAudioCaptureDeviceManager.h:
+
 2019-08-22  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp

@@ -53 +53 @@
 void CaptureDeviceManager::deviceChanged()
 {
-    callOnMainThread([weakThis = makeWeakPtr(*this)] {
-        if (!weakThis)
-            return;
-
-        RealtimeMediaSourceCenter::singleton().captureDevicesChanged();
-    });
+    if (!isMainThread()) {
+        callOnMainThread([] {
+            RealtimeMediaSourceCenter::singleton().captureDevicesChanged();
+        });
+        return;
+    }
+    RealtimeMediaSourceCenter::singleton().captureDevicesChanged();
 }
 

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

@@ -30 +30 @@
 #include "CaptureDevice.h"
 #include "RealtimeMediaSource.h"
-#include <wtf/WeakPtr.h>
 
 namespace WebCore {
 
-class WEBCORE_EXPORT CaptureDeviceManager : public CanMakeWeakPtr<CaptureDeviceManager> {
+class WEBCORE_EXPORT CaptureDeviceManager {
 public:
     virtual const Vector<CaptureDevice>& captureDevices() = 0;

trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp

@@ -120 +120 @@
     if (!initialized) {
         initialized = true;
-        refreshAudioCaptureDevices(DoNotNotify);
-
-        auto weakThis = makeWeakPtr(*this);
-        m_listenerBlock = Block_copy(^(UInt32 count, const AudioObjectPropertyAddress properties[]) {
-            if (!weakThis)
-                return;
-
+        refreshAudioCaptureDevices(NotifyIfDevicesHaveChanged::DoNotNotify);
+
+        auto listener = ^(UInt32 count, const AudioObjectPropertyAddress properties[]) {
             for (UInt32 i = 0; i < count; ++i) {
                 const AudioObjectPropertyAddress& property = properties[i];
@@ -133 +129 @@
                     continue;
 
-                weakThis->refreshAudioCaptureDevices(Notify);
+                CoreAudioCaptureDeviceManager::singleton().refreshAudioCaptureDevices(NotifyIfDevicesHaveChanged::Notify);
                 return;
             }
-        });
+        };
 
         AudioObjectPropertyAddress address = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
-        auto err = AudioObjectAddPropertyListenerBlock(kAudioObjectSystemObject, &address, dispatch_get_main_queue(), m_listenerBlock);
+        auto err = AudioObjectAddPropertyListenerBlock(kAudioObjectSystemObject, &address, dispatch_get_main_queue(), listener);
         if (err)
             LOG_ERROR("CoreAudioCaptureDeviceManager::devices(%p) AudioObjectAddPropertyListener for kAudioHardwarePropertyDevices returned error %d (%.4s)", this, (int)err, (char*)&err);
 
         address = { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
-        err = AudioObjectAddPropertyListenerBlock(kAudioObjectSystemObject, &address, dispatch_get_main_queue(), m_listenerBlock);
+        err = AudioObjectAddPropertyListenerBlock(kAudioObjectSystemObject, &address, dispatch_get_main_queue(), listener);
         if (err)
             LOG_ERROR("CoreAudioCaptureDeviceManager::devices(%p) AudioObjectAddPropertyListener for kAudioHardwarePropertyDefaultInputDevice returned error %d (%.4s)", this, (int)err, (char*)&err);
@@ -221 +217 @@
     }
 
-    if (notify == Notify) {
+    if (notify == NotifyIfDevicesHaveChanged::Notify) {
         deviceChanged();
         CoreAudioCaptureSourceFactory::singleton().devicesChanged(m_devices);

trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureDeviceManager.h

@@ -55 +55 @@
     Vector<CoreAudioCaptureDevice>& coreAudioCaptureDevices();
 
-    enum NotifyIfDevicesHaveChanged { Notify, DoNotNotify };
+    enum class NotifyIfDevicesHaveChanged { Notify, DoNotNotify };
     void refreshAudioCaptureDevices(NotifyIfDevicesHaveChanged);
 
     Vector<CaptureDevice> m_devices;
     Vector<CoreAudioCaptureDevice> m_coreAudioCaptureDevices;
-
-    AudioObjectPropertyListenerBlock m_listenerBlock;
 };