Changeset 203904 in webkit
- Timestamp:
- Jul 29, 2016 10:47:35 AM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r203903 r203904 1 2016-07-29 Eric Carlson <eric.carlson@apple.com> 2 3 Change internal AVCaptureDeviceType typedef name 4 https://bugs.webkit.org/show_bug.cgi?id=160345 5 <rdar://problem/27610935> 6 7 Reviewed by Dean Jackson. 8 9 * platform/mediastream/mac/AVAudioCaptureSource.mm: 10 (WebCore::AVAudioCaptureSource::create): AVCaptureDeviceType -> AVCaptureDeviceTypedef 11 (WebCore::AVAudioCaptureSource::AVAudioCaptureSource): Ditto. 12 13 * platform/mediastream/mac/AVCaptureDeviceManager.mm: 14 (WebCore::AVCaptureDeviceManager::captureDeviceList): Ditto. 15 (WebCore::shouldConsiderDeviceInDeviceList): Ditto. 16 (WebCore::AVCaptureDeviceManager::refreshCaptureDeviceList): Ditto. 17 (WebCore::AVCaptureDeviceManager::createMediaSourceForCaptureDeviceWithConstraints): Ditto. 18 (WebCore::AVCaptureDeviceManager::deviceConnected): Ditto. 19 (WebCore::AVCaptureDeviceManager::deviceDisconnected): Ditto. 20 (-[WebCoreAVCaptureDeviceManagerObserver deviceDisconnected:]): Ditto. 21 22 * platform/mediastream/mac/AVMediaCaptureSource.mm: 23 (WebCore::globaVideoCaptureSerialQueue): Ditto. 24 (WebCore::AVMediaCaptureSource::AVMediaCaptureSource): Ditto. 25 26 * platform/mediastream/mac/AVVideoCaptureSource.mm: 27 (WebCore::AVVideoCaptureSource::create): Ditto. 28 (WebCore::AVVideoCaptureSource::AVVideoCaptureSource): Ditto. 29 1 30 2016-07-28 Dean Jackson <dino@apple.com> 2 31 -
trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm
r193389 r203904 44 44 typedef AVCaptureAudioDataOutput AVCaptureAudioDataOutputType; 45 45 typedef AVCaptureConnection AVCaptureConnectionType; 46 typedef AVCaptureDevice AVCaptureDeviceType ;46 typedef AVCaptureDevice AVCaptureDeviceTypedef; 47 47 typedef AVCaptureDeviceInput AVCaptureDeviceInputType; 48 48 typedef AVCaptureOutput AVCaptureOutputType; … … 63 63 namespace WebCore { 64 64 65 RefPtr<AVMediaCaptureSource> AVAudioCaptureSource::create(AVCaptureDeviceType * device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)65 RefPtr<AVMediaCaptureSource> AVAudioCaptureSource::create(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint) 66 66 { 67 67 return adoptRef(new AVAudioCaptureSource(device, id, constraint)); 68 68 } 69 69 70 AVAudioCaptureSource::AVAudioCaptureSource(AVCaptureDeviceType * device, const AtomicString& id, PassRefPtr<MediaConstraints> constraints)70 AVAudioCaptureSource::AVAudioCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraints) 71 71 : AVMediaCaptureSource(device, id, RealtimeMediaSource::Audio, constraints) 72 72 { -
trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm
r194819 r203904 46 46 #import <wtf/NeverDestroyed.h> 47 47 48 typedef AVCaptureDevice AVCaptureDeviceType ;48 typedef AVCaptureDevice AVCaptureDeviceTypedef; 49 49 typedef AVCaptureSession AVCaptureSessionType; 50 50 … … 148 148 } 149 149 150 inline static bool shouldConsiderDeviceInDeviceList(AVCaptureDeviceType *device)150 inline static bool shouldConsiderDeviceInDeviceList(AVCaptureDeviceTypedef *device) 151 151 { 152 152 if (![device isConnected]) … … 163 163 void AVCaptureDeviceManager::refreshCaptureDeviceList() 164 164 { 165 for (AVCaptureDeviceType *platformDevice in [getAVCaptureDeviceClass() devices]) {165 for (AVCaptureDeviceTypedef *platformDevice in [getAVCaptureDeviceClass() devices]) { 166 166 if (!shouldConsiderDeviceInDeviceList(platformDevice)) 167 167 continue; … … 288 288 RealtimeMediaSource* AVCaptureDeviceManager::createMediaSourceForCaptureDeviceWithConstraints(const CaptureDeviceInfo& captureDevice, MediaConstraints* constraints) 289 289 { 290 AVCaptureDeviceType *device = [getAVCaptureDeviceClass() deviceWithUniqueID:captureDevice.m_persistentDeviceID];290 AVCaptureDeviceTypedef *device = [getAVCaptureDeviceClass() deviceWithUniqueID:captureDevice.m_persistentDeviceID]; 291 291 if (!device) 292 292 return nullptr; … … 321 321 } 322 322 323 void AVCaptureDeviceManager::deviceDisconnected(AVCaptureDeviceType * device)323 void AVCaptureDeviceManager::deviceDisconnected(AVCaptureDeviceTypedef* device) 324 324 { 325 325 Vector<CaptureDeviceInfo>& devices = captureDeviceList(); … … 396 396 dispatch_async(dispatch_get_main_queue(), ^{ 397 397 if (m_callback) { 398 AVCaptureDeviceType *device = [notification object];398 AVCaptureDeviceTypedef *device = [notification object]; 399 399 m_callback->deviceDisconnected(device); 400 400 } -
trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm
r202439 r203904 43 43 44 44 typedef AVCaptureConnection AVCaptureConnectionType; 45 typedef AVCaptureDevice AVCaptureDeviceType ;45 typedef AVCaptureDevice AVCaptureDeviceTypedef; 46 46 typedef AVCaptureDeviceInput AVCaptureDeviceInputType; 47 47 typedef AVCaptureOutput AVCaptureOutputType; … … 124 124 } 125 125 126 AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceType * device, const AtomicString& id, RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints)126 AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id, RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints) 127 127 : RealtimeMediaSource(id, type, emptyString()) 128 128 , m_weakPtrFactory(this) -
trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
r203739 r203904 48 48 49 49 typedef AVCaptureConnection AVCaptureConnectionType; 50 typedef AVCaptureDevice AVCaptureDeviceType ;50 typedef AVCaptureDevice AVCaptureDeviceTypedef; 51 51 typedef AVCaptureDeviceInput AVCaptureDeviceInputType; 52 52 typedef AVCaptureOutput AVCaptureOutputType; … … 85 85 namespace WebCore { 86 86 87 RefPtr<AVMediaCaptureSource> AVVideoCaptureSource::create(AVCaptureDeviceType * device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)87 RefPtr<AVMediaCaptureSource> AVVideoCaptureSource::create(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint) 88 88 { 89 89 return adoptRef(new AVVideoCaptureSource(device, id, constraint)); 90 90 } 91 91 92 AVVideoCaptureSource::AVVideoCaptureSource(AVCaptureDeviceType * device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)92 AVVideoCaptureSource::AVVideoCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint) 93 93 : AVMediaCaptureSource(device, id, RealtimeMediaSource::Video, constraint) 94 94 {
Note: See TracChangeset
for help on using the changeset viewer.