Changeset 158480 in webkit


Ignore:
Timestamp:
Nov 1, 2013 7:13:19 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Removing MediaStreamTrackVector and MediaStreamSourceVector typedefs
​https://bugs.webkit.org/show_bug.cgi?id=123648

Patch by Thiago de Barros Lacerda <​thiago.lacerda@openbossa.org> on 2013-11-01
Reviewed by Eric Carlson.

Source/WebCore:

No new tests needed.

  • Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::create):
(WebCore::MediaStream::clone):
(WebCore::MediaStream::cloneMediaStreamTrackVector):
(WebCore::MediaStream::addTrack):
(WebCore::MediaStream::removeTrack):
(WebCore::MediaStream::haveTrackWithSource):
(WebCore::MediaStream::getTrackById):
(WebCore::MediaStream::trackVectorForType):

  • Modules/mediastream/MediaStream.h:
  • Modules/mediastream/MediaStreamTrack.h:
  • Modules/mediastream/UserMediaRequest.cpp:

(WebCore::UserMediaRequest::callSuccessHandler):

  • Modules/webaudio/AudioContext.cpp:

(WebCore::AudioContext::createMediaStreamSource):

  • Modules/webaudio/MediaStreamAudioDestinationNode.cpp:

(WebCore::MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode):

  • platform/mediastream/MediaStreamDescriptor.cpp:

(WebCore::MediaStreamDescriptor::create):
(WebCore::MediaStreamDescriptor::MediaStreamDescriptor):

  • platform/mediastream/MediaStreamDescriptor.h:
  • platform/mediastream/MediaStreamSource.h:

Source/WebKit/blackberry:

  • WebCoreSupport/UserMediaClientImpl.cpp:

(WebCore::toMediaStreamDescriptor):
(WebCore::UserMediaClientImpl::requestUserMedia):

  • WebCoreSupport/UserMediaClientImpl.h:
Location:
trunk/Source
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r158478 r158480  
     12013-11-01  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        Removing MediaStreamTrackVector and MediaStreamSourceVector typedefs
     4        https://bugs.webkit.org/show_bug.cgi?id=123648
     5
     6        Reviewed by Eric Carlson.
     7
     8        No new tests needed.
     9
     10        * Modules/mediastream/MediaStream.cpp:
     11        (WebCore::MediaStream::create):
     12        (WebCore::MediaStream::clone):
     13        (WebCore::MediaStream::cloneMediaStreamTrackVector):
     14        (WebCore::MediaStream::addTrack):
     15        (WebCore::MediaStream::removeTrack):
     16        (WebCore::MediaStream::haveTrackWithSource):
     17        (WebCore::MediaStream::getTrackById):
     18        (WebCore::MediaStream::trackVectorForType):
     19        * Modules/mediastream/MediaStream.h:
     20        * Modules/mediastream/MediaStreamTrack.h:
     21        * Modules/mediastream/UserMediaRequest.cpp:
     22        (WebCore::UserMediaRequest::callSuccessHandler):
     23        * Modules/webaudio/AudioContext.cpp:
     24        (WebCore::AudioContext::createMediaStreamSource):
     25        * Modules/webaudio/MediaStreamAudioDestinationNode.cpp:
     26        (WebCore::MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode):
     27        * platform/mediastream/MediaStreamDescriptor.cpp:
     28        (WebCore::MediaStreamDescriptor::create):
     29        (WebCore::MediaStreamDescriptor::MediaStreamDescriptor):
     30        * platform/mediastream/MediaStreamDescriptor.h:
     31        * platform/mediastream/MediaStreamSource.h:
     32
    1332013-11-01  Andreas Kling  <akling@apple.com>
    234

  • trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

    r158470 r158480  
    4444PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext& context)
    4545{
    46     return MediaStream::create(context, MediaStreamDescriptor::create(MediaStreamSourceVector(), MediaStreamSourceVector()));
     46    return MediaStream::create(context, MediaStreamDescriptor::create(Vector<RefPtr<MediaStreamSource>>(), Vector<RefPtr<MediaStreamSource>>()));
    4747}
    4848
    … …  
    6363}
    6464
    65 PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext& context, const MediaStreamTrackVector& tracks)
     65PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext& context, const Vector<RefPtr<MediaStreamTrack>>& tracks)
    6666{
    6767    Vector<RefPtr<MediaStreamTrackPrivate>> audioTracks;
    … …  
    128128PassRefPtr<MediaStream> MediaStream::clone()
    129129{
    130     MediaStreamTrackVector trackSet;
     130    Vector<RefPtr<MediaStreamTrack>> trackSet;
    131131
    132132    cloneMediaStreamTrackVector(trackSet, getAudioTracks());
    … …  
    135135}
    136136
    137 void MediaStream::cloneMediaStreamTrackVector(MediaStreamTrackVector& destination, const MediaStreamTrackVector& origin)
    138 {
    139     for (unsigned i = 0; i < origin.size(); i++)
    140         destination.append(origin[i]->clone());
     137void MediaStream::cloneMediaStreamTrackVector(Vector<RefPtr<MediaStreamTrack>>& destination, const Vector<RefPtr<MediaStreamTrack>>& source)
     138{
     139    for (unsigned i = 0; i < source.size(); i++)
     140        destination.append(source[i]->clone());
    141141}
    142142
    … …  
    164164        return false;
    165165
    166     MediaStreamTrackVector* tracks = trackVectorForType(track->source()->type());
     166    Vector<RefPtr<MediaStreamTrack>>* tracks = trackVectorForType(track->source()->type());
    167167
    168168    tracks->append(track);
    … …  
    192192    // and removeRemoteTrack and only removeRemoteTrack must fire removetrack event
    193193    RefPtr<MediaStreamTrack> track = prpTrack;
    194     MediaStreamTrackVector* tracks = trackVectorForType(track->source()->type());
     194    Vector<RefPtr<MediaStreamTrack>>* tracks = trackVectorForType(track->source()->type());
    195195
    196196    size_t pos = tracks->find(track);
    … …  
    217217{
    218218    if (source->type() == MediaStreamSource::Audio) {
    219         for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter) {
     219        for (auto iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter) {
    220220            if ((*iter)->source() == source.get())
    221221                return true;
    … …  
    224224    }
    225225
    226     for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter) {
     226    for (auto iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter) {
    227227        if ((*iter)->source() == source.get())
    228228            return true;
    … …  
    234234MediaStreamTrack* MediaStream::getTrackById(String id)
    235235{
    236     for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter) {
     236    for (auto iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter) {
    237237        if ((*iter)->id() == id)
    238238            return (*iter).get();
    239239    }
    240240
    241     for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter) {
     241    for (auto iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter) {
    242242        if ((*iter)->id() == id)
    243243            return (*iter).get();
    … …  
    363363}
    364364
    365 MediaStreamTrackVector* MediaStream::trackVectorForType(MediaStreamSource::Type type)
     365Vector<RefPtr<MediaStreamTrack>>* MediaStream::trackVectorForType(MediaStreamSource::Type type)
    366366{
    367367    switch (type) {

  • trunk/Source/WebCore/Modules/mediastream/MediaStream.h

    r158470 r158480  
    4949    static PassRefPtr<MediaStream> create(ScriptExecutionContext&);
    5050    static PassRefPtr<MediaStream> create(ScriptExecutionContext&, PassRefPtr<MediaStream>);
    51     static PassRefPtr<MediaStream> create(ScriptExecutionContext&, const MediaStreamTrackVector&);
     51    static PassRefPtr<MediaStream> create(ScriptExecutionContext&, const Vector<RefPtr<MediaStreamTrack>>&);
    5252    static PassRefPtr<MediaStream> create(ScriptExecutionContext&, PassRefPtr<MediaStreamDescriptor>);
    5353    virtual ~MediaStream();
    … …  
    5959    MediaStreamTrack* getTrackById(String);
    6060
    61     MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; }
    62     MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; }
     61    Vector<RefPtr<MediaStreamTrack>> getAudioTracks() const { return m_audioTracks; }
     62    Vector<RefPtr<MediaStreamTrack>> getVideoTracks() const { return m_videoTracks; }
    6363
    6464    bool ended() const;
    … …  
    109109    void scheduledEventTimerFired(Timer<MediaStream>*);
    110110
    111     void cloneMediaStreamTrackVector(MediaStreamTrackVector&, const MediaStreamTrackVector&);
     111    void cloneMediaStreamTrackVector(Vector<RefPtr<MediaStreamTrack>>&, const Vector<RefPtr<MediaStreamTrack>>&);
    112112
    113     MediaStreamTrackVector* trackVectorForType(MediaStreamSource::Type);
     113    Vector<RefPtr<MediaStreamTrack>>* trackVectorForType(MediaStreamSource::Type);
    114114
    115115    RefPtr<MediaStreamDescriptor> m_descriptor;
    116     MediaStreamTrackVector m_audioTracks;
    117     MediaStreamTrackVector m_videoTracks;
     116    Vector<RefPtr<MediaStreamTrack>> m_audioTracks;
     117    Vector<RefPtr<MediaStreamTrack>> m_videoTracks;
    118118
    119119    Timer<MediaStream> m_scheduledEventTimer;

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

    r158365 r158480  
    143143};
    144144
    145 typedef Vector<RefPtr<MediaStreamTrack>> MediaStreamTrackVector;
    146 
    147145} // namespace WebCore
    148146

  • trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp

    r158390 r158480  
    166166    RefPtr<MediaStream> stream = MediaStream::create(*m_scriptExecutionContext, streamDescriptor);
    167167
    168     MediaStreamTrackVector tracks = stream->getAudioTracks();
    169     for (MediaStreamTrackVector::iterator iter = tracks.begin(); iter != tracks.end(); ++iter)
     168    Vector<RefPtr<MediaStreamTrack>> tracks = stream->getAudioTracks();
     169    for (auto iter = tracks.begin(); iter != tracks.end(); ++iter)
    170170        (*iter)->applyConstraints(m_audioConstraints);
    171171
    172172    tracks = stream->getVideoTracks();
    173     for (MediaStreamTrackVector::iterator iter = tracks.begin(); iter != tracks.end(); ++iter)
     173    for (auto iter = tracks.begin(); iter != tracks.end(); ++iter)
    174174        (*iter)->applyConstraints(m_videoConstraints);
    175175

  • trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp

    r158365 r158480  
    417417    AudioSourceProvider* provider = 0;
    418418
    419     MediaStreamTrackVector audioTracks = mediaStream->getAudioTracks();
     419    Vector<RefPtr<MediaStreamTrack>> audioTracks = mediaStream->getAudioTracks();
    420420    // FIXME: get a provider for non-local MediaStreams (like from a remote peer).
    421421    for (size_t i = 0; i < audioTracks.size(); ++i) {

  • trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp

    r158376 r158480  
    5050
    5151    m_source = MediaStreamAudioSource::create();
    52     MediaStreamSourceVector audioSources;
     52    Vector<RefPtr<MediaStreamSource>> audioSources;
    5353    audioSources.append(m_source);
    54     m_stream = MediaStream::create(*context->scriptExecutionContext(), MediaStreamDescriptor::create(audioSources, MediaStreamSourceVector()));
     54    m_stream = MediaStream::create(*context->scriptExecutionContext(), MediaStreamDescriptor::create(audioSources, Vector<RefPtr<MediaStreamSource>>()));
    5555
    5656    m_source->setAudioFormat(numberOfChannels, context->sampleRate());

  • trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.cpp

    r158438 r158480  
    4343namespace WebCore {
    4444
    45 PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
     45PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources)
    4646{
    4747    return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audioSources, videoSources));
    … …  
    124124}
    125125
    126 MediaStreamDescriptor::MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
     126MediaStreamDescriptor::MediaStreamDescriptor(const String& id, const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources)
    127127    : m_client(0)
    128128    , m_id(id)

  • trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h

    r158438 r158480  
    5858class MediaStreamDescriptor : public RefCounted<MediaStreamDescriptor> {
    5959public:
    60     static PassRefPtr<MediaStreamDescriptor> create(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);
     60    static PassRefPtr<MediaStreamDescriptor> create(const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources);
    6161    static PassRefPtr<MediaStreamDescriptor> create(const Vector<RefPtr<MediaStreamTrackPrivate>>& audioPrivateTracks, const Vector<RefPtr<MediaStreamTrackPrivate>>& videoPrivateTracks);
    6262
    … …  
    9696
    9797private:
    98     MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);
     98    MediaStreamDescriptor(const String& id, const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources);
    9999    MediaStreamDescriptor(const String& id, const Vector<RefPtr<MediaStreamTrackPrivate>>& audioPrivateTracks, const Vector<RefPtr<MediaStreamTrackPrivate>>& videoPrivateTracks);
    100100
    101101    MediaStreamDescriptorClient* m_client;
    102102    String m_id;
    103     MediaStreamSourceVector m_audioStreamSources;
    104     MediaStreamSourceVector m_videoStreamSources;
     103    Vector<RefPtr<MediaStreamSource>> m_audioStreamSources;
     104    Vector<RefPtr<MediaStreamSource>> m_videoStreamSources;
    105105
    106106    Vector<RefPtr<MediaStreamTrackPrivate>> m_audioPrivateTracks;

  • trunk/Source/WebCore/platform/mediastream/MediaStreamSource.h

    r158220 r158480  
    123123};
    124124
    125 typedef Vector<RefPtr<MediaStreamSource>> MediaStreamSourceVector;
    126 
    127125} // namespace WebCore
    128126

  • trunk/Source/WebKit/blackberry/ChangeLog

    r158415 r158480  
     12013-11-01  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        Removing MediaStreamTrackVector and MediaStreamSourceVector typedefs
     4        https://bugs.webkit.org/show_bug.cgi?id=123648
     5
     6        Reviewed by Eric Carlson.
     7
     8        * WebCoreSupport/UserMediaClientImpl.cpp:
     9        (WebCore::toMediaStreamDescriptor):
     10        (WebCore::UserMediaClientImpl::requestUserMedia):
     11        * WebCoreSupport/UserMediaClientImpl.h:
     12
    1132013-10-31  Joseph Pecoraro  <pecoraro@apple.com>
    214

  • trunk/Source/WebKit/blackberry/WebCoreSupport/UserMediaClientImpl.cpp

    r148667 r158480  
    5656static PassRefPtr<MediaStreamDescriptor> toMediaStreamDescriptor(const WebMediaStreamDescriptor& d)
    5757{
    58     MediaStreamSourceVector audioSources;
     58    Vector<RefPtr<MediaStreamSource>> audioSources;
    5959    for (size_t i = 0; i < d.audios().size(); i++) {
    6060        RefPtr<MediaStreamSource> src = toMediaStreamSource(d.audios()[i]);
    … …  
    6262    }
    6363
    64     MediaStreamSourceVector videoSources;
     64    Vector<RefPtr<MediaStreamSource>> videoSources;
    6565    for (size_t i = 0; i < d.videos().size(); i++) {
    6666        RefPtr<MediaStreamSource> src = toMediaStreamSource(d.videos()[i]);
    … …  
    114114}
    115115
    116 void UserMediaClientImpl::requestUserMedia(PassRefPtr<UserMediaRequest> prpRequest, const MediaStreamSourceVector&, const MediaStreamSourceVector&)
     116void UserMediaClientImpl::requestUserMedia(PassRefPtr<UserMediaRequest> prpRequest, const Vector<RefPtr<MediaStreamSource>>&, const Vector<RefPtr<MediaStreamSource>>&)
    117117{
    118118    UserMediaRequest* request = prpRequest.get();

  • trunk/Source/WebKit/blackberry/WebCoreSupport/UserMediaClientImpl.h

    r127083 r158480  
    4343
    4444    void pageDestroyed();
    45     void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const WebCore::MediaStreamSourceVector& audioSources, const WebCore::MediaStreamSourceVector& videoSources);
     45    void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const Vector<RefPtr<WebCore::MediaStreamSource>>& audioSources, const Vector<RefPtr<WebCore::MediaStreamSource>>& videoSources);
    4646    void cancelUserMediaRequest(WebCore::UserMediaRequest*);
    4747
Note: See TracChangeset for help on using the changeset viewer.