Changeset 274819 in webkit

Timestamp:

Mar 22, 2021, 4:57:35 PM (5 years ago)

Author:

eric.carlson@apple.com

Message:

AVAudioSessionCaptureDeviceManager should use crossThreadCopy
​https://bugs.webkit.org/show_bug.cgi?id=223565
<rdar://75480589>

Reviewed by Youenn Fablet.

Tested manually, this can only be tested on device.

• platform/mediastream/CaptureDevice.h: Change access restriction for member

variables from private: to protected: so derived classes can access them
directly.

• platform/mediastream/ios/AVAudioSessionCaptureDevice.h:
• platform/mediastream/ios/AVAudioSessionCaptureDevice.mm:

(WebCore::AVAudioSessionCaptureDevice::AVAudioSessionCaptureDevice): New constructor.
(WebCore::AVAudioSessionCaptureDevice::isolatedCopy const): New.

• platform/mediastream/ios/AVAudioSessionCaptureDeviceManager.mm:

(WebCore::AVAudioSessionCaptureDeviceManager::refreshAudioCaptureDevices): Use
WTFMove(deviceList).isolatedCopy() when moving from AVAudioSession queue
to main thread.
(WebCore::AVAudioSessionCaptureDeviceManager::getCaptureDevices): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/CaptureDevice.h (modified) (1 diff)
• platform/mediastream/ios/AVAudioSessionCaptureDevice.h (modified) (1 diff)
• platform/mediastream/ios/AVAudioSessionCaptureDevice.mm (modified) (1 diff)
• platform/mediastream/ios/AVAudioSessionCaptureDeviceManager.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-22  Eric Carlson  <eric.carlson@apple.com>
+
+        AVAudioSessionCaptureDeviceManager should use crossThreadCopy
+        https://bugs.webkit.org/show_bug.cgi?id=223565
+        <rdar://75480589>
+
+        Reviewed by Youenn Fablet.
+
+        Tested manually, this can only be tested on device.
+
+        * platform/mediastream/CaptureDevice.h: Change access restriction for member
+        variables from `private:` to `protected:` so derived classes can access them
+        directly.
+
+        * platform/mediastream/ios/AVAudioSessionCaptureDevice.h:
+        * platform/mediastream/ios/AVAudioSessionCaptureDevice.mm:
+        (WebCore::AVAudioSessionCaptureDevice::AVAudioSessionCaptureDevice): New constructor.
+        (WebCore::AVAudioSessionCaptureDevice::isolatedCopy const): New.
+
+        * platform/mediastream/ios/AVAudioSessionCaptureDeviceManager.mm:
+        (WebCore::AVAudioSessionCaptureDeviceManager::refreshAudioCaptureDevices): Use
+        `WTFMove(deviceList).isolatedCopy()` when moving from AVAudioSession queue
+        to main thread.
+        (WebCore::AVAudioSessionCaptureDeviceManager::getCaptureDevices): Ditto.
+
 2021-03-22  Patrick Angle  <pangle@apple.com>
 

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

@@ -131 +131 @@
 #endif
 
-private:
+protected:
     String m_persistentId;
     DeviceType m_type { DeviceType::Unknown };

trunk/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.h

@@ -40 +40 @@
     virtual ~AVAudioSessionCaptureDevice() = default;
 
+    AVAudioSessionCaptureDevice isolatedCopy() &&;
+
 private:
     AVAudioSessionCaptureDevice(AVAudioSessionPortDescription *deviceInput, AVAudioSessionPortDescription *defaultInput);
+    AVAudioSessionCaptureDevice(const String& persistentId, DeviceType, const String& label, const String& groupId, bool isEnabled, bool isDefault, bool isMock);
 };
 

trunk/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.mm

@@ -45 +45 @@
 }
 
+AVAudioSessionCaptureDevice::AVAudioSessionCaptureDevice(const String& persistentId, DeviceType type, const String& label, const String& groupId, bool isEnabled, bool isDefault, bool isMock)
+    : CaptureDevice(persistentId, type, label, groupId)
+{
+    setEnabled(isEnabled);
+    setIsDefault(isDefault);
+    setIsMockDevice(isMock);
+}
+
+AVAudioSessionCaptureDevice AVAudioSessionCaptureDevice::isolatedCopy() &&
+{
+    return {
+        WTFMove(m_persistentId).isolatedCopy(),
+        m_type,
+        WTFMove(m_label).isolatedCopy(),
+        WTFMove(m_groupId).isolatedCopy(),
+        m_enabled,
+        m_default,
+        m_isMockDevice,
+    };
+}
+
 }
 

trunk/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDeviceManager.mm

@@ -164 +164 @@
         newAudioDevices = retrieveAudioSessionCaptureDevices();
     });
-    setAudioCaptureDevices(WTFMove(newAudioDevices));
+    setAudioCaptureDevices(WTFMove(newAudioDevices).isolatedCopy());
 }
 
@@ -179 +179 @@
     m_dispatchQueue->dispatch([this, completion = WTFMove(completion)] () mutable {
         auto newAudioDevices = retrieveAudioSessionCaptureDevices();
-        callOnWebThreadOrDispatchAsyncOnMainThread(makeBlockPtr([this, completion = WTFMove(completion), newAudioDevices = WTFMove(newAudioDevices)] () mutable {
+        callOnWebThreadOrDispatchAsyncOnMainThread(makeBlockPtr([this, completion = WTFMove(completion), newAudioDevices = WTFMove(newAudioDevices).isolatedCopy()] () mutable {
             setAudioCaptureDevices(WTFMove(newAudioDevices));
             completion(copyToVector(*m_devices));