Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203913 => 203914)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 19:11:29 UTC (rev 203913)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 19:19:59 UTC (rev 203914)
@@ -1,3 +1,36 @@
+2016-07-29 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r203904. rdar://problem/27610935
+
+ 2016-07-29 Eric Carlson <eric.carl...@apple.com>
+
+ Change internal AVCaptureDeviceType typedef name
+ https://bugs.webkit.org/show_bug.cgi?id=160345
+ <rdar://problem/27610935>
+
+ Reviewed by Dean Jackson.
+
+ * platform/mediastream/mac/AVAudioCaptureSource.mm:
+ (WebCore::AVAudioCaptureSource::create): AVCaptureDeviceType -> AVCaptureDeviceTypedef
+ (WebCore::AVAudioCaptureSource::AVAudioCaptureSource): Ditto.
+
+ * platform/mediastream/mac/AVCaptureDeviceManager.mm:
+ (WebCore::AVCaptureDeviceManager::captureDeviceList): Ditto.
+ (WebCore::shouldConsiderDeviceInDeviceList): Ditto.
+ (WebCore::AVCaptureDeviceManager::refreshCaptureDeviceList): Ditto.
+ (WebCore::AVCaptureDeviceManager::createMediaSourceForCaptureDeviceWithConstraints): Ditto.
+ (WebCore::AVCaptureDeviceManager::deviceConnected): Ditto.
+ (WebCore::AVCaptureDeviceManager::deviceDisconnected): Ditto.
+ (-[WebCoreAVCaptureDeviceManagerObserver deviceDisconnected:]): Ditto.
+
+ * platform/mediastream/mac/AVMediaCaptureSource.mm:
+ (WebCore::globaVideoCaptureSerialQueue): Ditto.
+ (WebCore::AVMediaCaptureSource::AVMediaCaptureSource): Ditto.
+
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::create): Ditto.
+ (WebCore::AVVideoCaptureSource::AVVideoCaptureSource): Ditto.
+
2016-07-28 Babak Shafiei <bshaf...@apple.com>
Merge r203825. rdar://problem/27578447
Modified: branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm (203913 => 203914)
--- branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm 2016-07-29 19:11:29 UTC (rev 203913)
+++ branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm 2016-07-29 19:19:59 UTC (rev 203914)
@@ -43,7 +43,7 @@
typedef AVCaptureAudioChannel AVCaptureAudioChannelType;
typedef AVCaptureAudioDataOutput AVCaptureAudioDataOutputType;
typedef AVCaptureConnection AVCaptureConnectionType;
-typedef AVCaptureDevice AVCaptureDeviceType;
+typedef AVCaptureDevice AVCaptureDeviceTypedef;
typedef AVCaptureDeviceInput AVCaptureDeviceInputType;
typedef AVCaptureOutput AVCaptureOutputType;
@@ -62,12 +62,12 @@
namespace WebCore {
-RefPtr<AVMediaCaptureSource> AVAudioCaptureSource::create(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
+RefPtr<AVMediaCaptureSource> AVAudioCaptureSource::create(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
{
return adoptRef(new AVAudioCaptureSource(device, id, constraint));
}
-AVAudioCaptureSource::AVAudioCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraints)
+AVAudioCaptureSource::AVAudioCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraints)
: AVMediaCaptureSource(device, id, RealtimeMediaSource::Audio, constraints)
{
m_inputDescription = std::make_unique<AudioStreamBasicDescription>();
Modified: branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm (203913 => 203914)
--- branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2016-07-29 19:11:29 UTC (rev 203913)
+++ branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2016-07-29 19:19:59 UTC (rev 203914)
@@ -45,7 +45,7 @@
#import <wtf/MainThread.h>
#import <wtf/NeverDestroyed.h>
-typedef AVCaptureDevice AVCaptureDeviceType;
+typedef AVCaptureDevice AVCaptureDeviceTypedef;
typedef AVCaptureSession AVCaptureSessionType;
SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
@@ -147,7 +147,7 @@
return m_devices;
}
-inline static bool shouldConsiderDeviceInDeviceList(AVCaptureDeviceType *device)
+inline static bool shouldConsiderDeviceInDeviceList(AVCaptureDeviceTypedef *device)
{
if (![device isConnected])
return false;
@@ -162,7 +162,7 @@
void AVCaptureDeviceManager::refreshCaptureDeviceList()
{
- for (AVCaptureDeviceType *platformDevice in [getAVCaptureDeviceClass() devices]) {
+ for (AVCaptureDeviceTypedef *platformDevice in [getAVCaptureDeviceClass() devices]) {
if (!shouldConsiderDeviceInDeviceList(platformDevice))
continue;
@@ -287,7 +287,7 @@
RealtimeMediaSource* AVCaptureDeviceManager::createMediaSourceForCaptureDeviceWithConstraints(const CaptureDeviceInfo& captureDevice, MediaConstraints* constraints)
{
- AVCaptureDeviceType *device = [getAVCaptureDeviceClass() deviceWithUniqueID:captureDevice.m_persistentDeviceID];
+ AVCaptureDeviceTypedef *device = [getAVCaptureDeviceClass() deviceWithUniqueID:captureDevice.m_persistentDeviceID];
if (!device)
return nullptr;
@@ -320,7 +320,7 @@
refreshCaptureDeviceList();
}
-void AVCaptureDeviceManager::deviceDisconnected(AVCaptureDeviceType* device)
+void AVCaptureDeviceManager::deviceDisconnected(AVCaptureDeviceTypedef* device)
{
Vector<CaptureDeviceInfo>& devices = captureDeviceList();
@@ -395,7 +395,7 @@
dispatch_async(dispatch_get_main_queue(), ^{
if (m_callback) {
- AVCaptureDeviceType *device = [notification object];
+ AVCaptureDeviceTypedef *device = [notification object];
m_callback->deviceDisconnected(device);
}
});
Modified: branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm (203913 => 203914)
--- branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2016-07-29 19:11:29 UTC (rev 203913)
+++ branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2016-07-29 19:19:59 UTC (rev 203914)
@@ -42,7 +42,7 @@
#import <wtf/NeverDestroyed.h>
typedef AVCaptureConnection AVCaptureConnectionType;
-typedef AVCaptureDevice AVCaptureDeviceType;
+typedef AVCaptureDevice AVCaptureDeviceTypedef;
typedef AVCaptureDeviceInput AVCaptureDeviceInputType;
typedef AVCaptureOutput AVCaptureOutputType;
typedef AVCaptureSession AVCaptureSessionType;
@@ -123,7 +123,7 @@
return globalQueue;
}
-AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints)
+AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id, RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints)
: RealtimeMediaSource(id, type, emptyString())
, m_weakPtrFactory(this)
, m_objcObserver(adoptNS([[WebCoreAVMediaCaptureSourceObserver alloc] initWithCallback:this]))
Modified: branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (203913 => 203914)
--- branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-07-29 19:11:29 UTC (rev 203913)
+++ branches/safari-602-branch/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-07-29 19:19:59 UTC (rev 203914)
@@ -46,7 +46,7 @@
#import "CoreVideoSoftLink.h"
typedef AVCaptureConnection AVCaptureConnectionType;
-typedef AVCaptureDevice AVCaptureDeviceType;
+typedef AVCaptureDevice AVCaptureDeviceTypedef;
typedef AVCaptureDeviceInput AVCaptureDeviceInputType;
typedef AVCaptureOutput AVCaptureOutputType;
typedef AVCaptureVideoDataOutput AVCaptureVideoDataOutputType;
@@ -83,12 +83,12 @@
namespace WebCore {
-RefPtr<AVMediaCaptureSource> AVVideoCaptureSource::create(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
+RefPtr<AVMediaCaptureSource> AVVideoCaptureSource::create(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
{
return adoptRef(new AVVideoCaptureSource(device, id, constraint));
}
-AVVideoCaptureSource::AVVideoCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
+AVVideoCaptureSource::AVVideoCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
: AVMediaCaptureSource(device, id, RealtimeMediaSource::Video, constraint)
{
}
