Changeset 203904 in webkit


Ignore:
Timestamp:
Jul 29, 2016 10:47:35 AM (8 years ago)
Author:
eric.carlson@apple.com
Message:

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.

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r203903 r203904  
     12016-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
    1302016-07-28  Dean Jackson  <dino@apple.com>
    231
  • trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm

    r193389 r203904  
    4444typedef AVCaptureAudioDataOutput AVCaptureAudioDataOutputType;
    4545typedef AVCaptureConnection AVCaptureConnectionType;
    46 typedef AVCaptureDevice AVCaptureDeviceType;
     46typedef AVCaptureDevice AVCaptureDeviceTypedef;
    4747typedef AVCaptureDeviceInput AVCaptureDeviceInputType;
    4848typedef AVCaptureOutput AVCaptureOutputType;
     
    6363namespace WebCore {
    6464
    65 RefPtr<AVMediaCaptureSource> AVAudioCaptureSource::create(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
     65RefPtr<AVMediaCaptureSource> AVAudioCaptureSource::create(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
    6666{
    6767    return adoptRef(new AVAudioCaptureSource(device, id, constraint));
    6868}
    6969   
    70 AVAudioCaptureSource::AVAudioCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraints)
     70AVAudioCaptureSource::AVAudioCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraints)
    7171    : AVMediaCaptureSource(device, id, RealtimeMediaSource::Audio, constraints)
    7272{
  • trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm

    r194819 r203904  
    4646#import <wtf/NeverDestroyed.h>
    4747
    48 typedef AVCaptureDevice AVCaptureDeviceType;
     48typedef AVCaptureDevice AVCaptureDeviceTypedef;
    4949typedef AVCaptureSession AVCaptureSessionType;
    5050
     
    148148}
    149149
    150 inline static bool shouldConsiderDeviceInDeviceList(AVCaptureDeviceType *device)
     150inline static bool shouldConsiderDeviceInDeviceList(AVCaptureDeviceTypedef *device)
    151151{
    152152    if (![device isConnected])
     
    163163void AVCaptureDeviceManager::refreshCaptureDeviceList()
    164164{
    165     for (AVCaptureDeviceType *platformDevice in [getAVCaptureDeviceClass() devices]) {
     165    for (AVCaptureDeviceTypedef *platformDevice in [getAVCaptureDeviceClass() devices]) {
    166166        if (!shouldConsiderDeviceInDeviceList(platformDevice))
    167167            continue;
     
    288288RealtimeMediaSource* AVCaptureDeviceManager::createMediaSourceForCaptureDeviceWithConstraints(const CaptureDeviceInfo& captureDevice, MediaConstraints* constraints)
    289289{
    290     AVCaptureDeviceType *device = [getAVCaptureDeviceClass() deviceWithUniqueID:captureDevice.m_persistentDeviceID];
     290    AVCaptureDeviceTypedef *device = [getAVCaptureDeviceClass() deviceWithUniqueID:captureDevice.m_persistentDeviceID];
    291291    if (!device)
    292292        return nullptr;
     
    321321}
    322322
    323 void AVCaptureDeviceManager::deviceDisconnected(AVCaptureDeviceType* device)
     323void AVCaptureDeviceManager::deviceDisconnected(AVCaptureDeviceTypedef* device)
    324324{
    325325    Vector<CaptureDeviceInfo>& devices = captureDeviceList();
     
    396396    dispatch_async(dispatch_get_main_queue(), ^{
    397397        if (m_callback) {
    398             AVCaptureDeviceType *device = [notification object];
     398            AVCaptureDeviceTypedef *device = [notification object];
    399399            m_callback->deviceDisconnected(device);
    400400        }
  • trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm

    r202439 r203904  
    4343
    4444typedef AVCaptureConnection AVCaptureConnectionType;
    45 typedef AVCaptureDevice AVCaptureDeviceType;
     45typedef AVCaptureDevice AVCaptureDeviceTypedef;
    4646typedef AVCaptureDeviceInput AVCaptureDeviceInputType;
    4747typedef AVCaptureOutput AVCaptureOutputType;
     
    124124}
    125125
    126 AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints)
     126AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id, RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints)
    127127    : RealtimeMediaSource(id, type, emptyString())
    128128    , m_weakPtrFactory(this)
  • trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm

    r203739 r203904  
    4848
    4949typedef AVCaptureConnection AVCaptureConnectionType;
    50 typedef AVCaptureDevice AVCaptureDeviceType;
     50typedef AVCaptureDevice AVCaptureDeviceTypedef;
    5151typedef AVCaptureDeviceInput AVCaptureDeviceInputType;
    5252typedef AVCaptureOutput AVCaptureOutputType;
     
    8585namespace WebCore {
    8686
    87 RefPtr<AVMediaCaptureSource> AVVideoCaptureSource::create(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
     87RefPtr<AVMediaCaptureSource> AVVideoCaptureSource::create(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
    8888{
    8989    return adoptRef(new AVVideoCaptureSource(device, id, constraint));
    9090}
    9191
    92 AVVideoCaptureSource::AVVideoCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
     92AVVideoCaptureSource::AVVideoCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
    9393    : AVMediaCaptureSource(device, id, RealtimeMediaSource::Video, constraint)
    9494{
Note: See TracChangeset for help on using the changeset viewer.