Diff
Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (276149 => 276150)
--- branches/safari-611-branch/Source/WebCore/ChangeLog 2021-04-16 18:47:56 UTC (rev 276149)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog 2021-04-16 19:04:02 UTC (rev 276150)
@@ -817,60 +817,6 @@
2021-04-15 Russell Epstein <[email protected]>
- 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 <[email protected]>
-
- 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 <[email protected]>
-
Cherry-pick r274877. rdar://problem/76373841
Enable the quirk to disable firing "webkitendfullscreen" event when a video enters picture-in-picture from fullscreen on espn.com
Modified: branches/safari-611-branch/Source/WebCore/platform/mediastream/CaptureDevice.h (276149 => 276150)
--- branches/safari-611-branch/Source/WebCore/platform/mediastream/CaptureDevice.h 2021-04-16 18:47:56 UTC (rev 276149)
+++ branches/safari-611-branch/Source/WebCore/platform/mediastream/CaptureDevice.h 2021-04-16 19:04:02 UTC (rev 276150)
@@ -130,7 +130,7 @@
}
#endif
-protected:
+private:
String m_persistentId;
DeviceType m_type { DeviceType::Unknown };
String m_label;
Modified: branches/safari-611-branch/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.h (276149 => 276150)
--- branches/safari-611-branch/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.h 2021-04-16 18:47:56 UTC (rev 276149)
+++ branches/safari-611-branch/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.h 2021-04-16 19:04:02 UTC (rev 276150)
@@ -39,11 +39,8 @@
static AVAudioSessionCaptureDevice create(AVAudioSessionPortDescription *deviceInput, AVAudioSessionPortDescription *defaultInput);
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);
};
} // namespace WebCore
Modified: branches/safari-611-branch/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.mm (276149 => 276150)
--- branches/safari-611-branch/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.mm 2021-04-16 18:47:56 UTC (rev 276149)
+++ branches/safari-611-branch/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.mm 2021-04-16 19:04:02 UTC (rev 276150)
@@ -44,27 +44,6 @@
setIsDefault(defaultInput && [defaultInput.UID isEqualToString:deviceInput.UID]);
}
-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,
- };
-}
-
-}
-
#endif // ENABLE(MEDIA_STREAM) && PLATFORM(IOS_FAMILY)
Modified: branches/safari-611-branch/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDeviceManager.mm (276149 => 276150)
--- branches/safari-611-branch/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDeviceManager.mm 2021-04-16 18:47:56 UTC (rev 276149)
+++ branches/safari-611-branch/Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDeviceManager.mm 2021-04-16 19:04:02 UTC (rev 276150)
@@ -166,8 +166,8 @@
Vector<AVAudioSessionCaptureDevice> newAudioDevices;
dispatch_sync(m_dispatchQueue, makeBlockPtr([&] {
newAudioDevices = retrieveAudioSessionCaptureDevices();
- });
- setAudioCaptureDevices(WTFMove(newAudioDevices).isolatedCopy());
+ }).get());
+ setAudioCaptureDevices(WTFMove(newAudioDevices));
}
void AVAudioSessionCaptureDeviceManager::getCaptureDevices(CompletionHandler<void(Vector<CaptureDevice>&&)>&& completion)
@@ -182,7 +182,7 @@
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));
}).get());
