Changeset 276150 in webkit

Timestamp:

Apr 16, 2021, 12:04:02 PM (5 years ago)

Author:

Russell Epstein

Message:

Revert "Cherry-pick r274819. rdar://problem/76373741"

This reverts commit r276044.

Location:

branches/safari-611-branch/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)

branches/safari-611-branch/Source/WebCore/ChangeLog

@@ -815 +815 @@
             (WebCore::EventHandler::updateSelectionForMouseDownDispatchingSelectStart): Fixed what is now believed to be
             the root cause of the bug 221786.
-
-2021-04-15  Russell Epstein  <repstein@apple.com>
-
-        Cherry-pick r274819. rdar://problem/76373741
-
-    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.
-    
-    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274819 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-    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-04-15  Russell Epstein  <repstein@apple.com>

branches/safari-611-branch/Source/WebCore/platform/mediastream/CaptureDevice.h

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

branches/safari-611-branch/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);
 };
 

branches/safari-611-branch/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,
-    };
-}
-
 }
 

branches/safari-611-branch/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDeviceManager.mm

@@ -167 +167 @@
     dispatch_sync(m_dispatchQueue, makeBlockPtr([&] {
         newAudioDevices = retrieveAudioSessionCaptureDevices();
-    });
-    setAudioCaptureDevices(WTFMove(newAudioDevices).isolatedCopy());
+    }).get());
+    setAudioCaptureDevices(WTFMove(newAudioDevices));
 }
 
@@ -183 +183 @@
     dispatch_async(m_dispatchQueue, makeBlockPtr([this, completion = WTFMove(completion)] () mutable {
         auto newAudioDevices = retrieveAudioSessionCaptureDevices();
-        callOnWebThreadOrDispatchAsyncOnMainThread(makeBlockPtr([this, completion = WTFMove(completion), newAudioDevices = WTFMove(newAudioDevices).isolatedCopy()] () mutable {
+        callOnWebThreadOrDispatchAsyncOnMainThread(makeBlockPtr([this, completion = WTFMove(completion), newAudioDevices = WTFMove(newAudioDevices)] () mutable {
             setAudioCaptureDevices(WTFMove(newAudioDevices));
             completion(copyToVector(*m_devices));