Changeset 165834 in webkit
- Timestamp:
- Mar 18, 2014 12:47:56 PM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r165829 r165834 1 2014-03-18 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> 2 3 Removing MediaStreamVector typedef 4 https://bugs.webkit.org/show_bug.cgi?id=130402 5 6 Reviewed by Eric Carlson. 7 8 * Modules/mediastream/MediaStream.h: 9 * Modules/mediastream/RTCPeerConnection.cpp: 10 (WebCore::RTCPeerConnection::getLocalStreams): 11 (WebCore::RTCPeerConnection::getRemoteStreams): 12 (WebCore::RTCPeerConnection::getStreamById): 13 (WebCore::RTCPeerConnection::hasLocalStreamWithTrackId): 14 * Modules/mediastream/RTCPeerConnection.h: 15 1 16 2014-03-18 Commit Queue <commit-queue@webkit.org> 2 17 -
trunk/Source/WebCore/Modules/mediastream/MediaStream.h
r162158 r165834 132 132 }; 133 133 134 typedef Vector<RefPtr<MediaStream>> MediaStreamVector;135 136 134 } // namespace WebCore 137 135 -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
r165255 r165834 503 503 } 504 504 505 MediaStreamVectorRTCPeerConnection::getLocalStreams() const505 Vector<RefPtr<MediaStream>> RTCPeerConnection::getLocalStreams() const 506 506 { 507 507 return m_localStreams; 508 508 } 509 509 510 MediaStreamVectorRTCPeerConnection::getRemoteStreams() const510 Vector<RefPtr<MediaStream>> RTCPeerConnection::getRemoteStreams() const 511 511 { 512 512 return m_remoteStreams; … … 515 515 MediaStream* RTCPeerConnection::getStreamById(const String& streamId) 516 516 { 517 for ( MediaStreamVector::iteratoriter = m_localStreams.begin(); iter != m_localStreams.end(); ++iter) {517 for (auto iter = m_localStreams.begin(); iter != m_localStreams.end(); ++iter) { 518 518 if ((*iter)->id() == streamId) 519 519 return iter->get(); 520 520 } 521 521 522 for ( MediaStreamVector::iteratoriter = m_remoteStreams.begin(); iter != m_remoteStreams.end(); ++iter) {522 for (auto iter = m_remoteStreams.begin(); iter != m_remoteStreams.end(); ++iter) { 523 523 if ((*iter)->id() == streamId) 524 524 return iter->get(); … … 552 552 bool RTCPeerConnection::hasLocalStreamWithTrackId(const String& trackId) 553 553 { 554 for ( MediaStreamVector::iteratoriter = m_localStreams.begin(); iter != m_localStreams.end(); ++iter) {554 for (auto iter = m_localStreams.begin(); iter != m_localStreams.end(); ++iter) { 555 555 if ((*iter)->getTrackById(trackId)) 556 556 return true; -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
r165255 r165834 86 86 RTCConfiguration* getConfiguration() const; 87 87 88 MediaStreamVectorgetLocalStreams() const;88 Vector<RefPtr<MediaStream>> getLocalStreams() const; 89 89 90 MediaStreamVectorgetRemoteStreams() const;90 Vector<RefPtr<MediaStream>> getRemoteStreams() const; 91 91 92 92 MediaStream* getStreamById(const String& streamId); … … 158 158 IceConnectionState m_iceConnectionState; 159 159 160 MediaStreamVectorm_localStreams;161 MediaStreamVectorm_remoteStreams;160 Vector<RefPtr<MediaStream>> m_localStreams; 161 Vector<RefPtr<MediaStream>> m_remoteStreams; 162 162 163 163 Vector<RefPtr<RTCDataChannel>> m_dataChannels;
Note: See TracChangeset
for help on using the changeset viewer.