Changeset 165834 in webkit

Timestamp:

Mar 18, 2014 12:47:56 PM (10 years ago)

Author:

thiago.lacerda@openbossa.org

Message:

Removing MediaStreamVector typedef
​https://bugs.webkit.org/show_bug.cgi?id=130402

Reviewed by Eric Carlson.

• Modules/mediastream/MediaStream.h:
• Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::getLocalStreams):
(WebCore::RTCPeerConnection::getRemoteStreams):
(WebCore::RTCPeerConnection::getStreamById):
(WebCore::RTCPeerConnection::hasLocalStreamWithTrackId):

• Modules/mediastream/RTCPeerConnection.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStream.h (modified) (1 diff)
• Modules/mediastream/RTCPeerConnection.cpp (modified) (3 diffs)
• Modules/mediastream/RTCPeerConnection.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-18  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
+
+        Removing MediaStreamVector typedef
+        https://bugs.webkit.org/show_bug.cgi?id=130402
+
+        Reviewed by Eric Carlson.
+
+        * Modules/mediastream/MediaStream.h:
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::getLocalStreams):
+        (WebCore::RTCPeerConnection::getRemoteStreams):
+        (WebCore::RTCPeerConnection::getStreamById):
+        (WebCore::RTCPeerConnection::hasLocalStreamWithTrackId):
+        * Modules/mediastream/RTCPeerConnection.h:
+
 2014-03-18  Commit Queue  <commit-queue@webkit.org>
 

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

@@ -132 +132 @@
 };
 
-typedef Vector<RefPtr<MediaStream>> MediaStreamVector;
-
 } // namespace WebCore
 

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

@@ -503 +503 @@
 }
 
-MediaStreamVector RTCPeerConnection::getLocalStreams() const
+Vector<RefPtr<MediaStream>> RTCPeerConnection::getLocalStreams() const
 {
     return m_localStreams;
 }
 
-MediaStreamVector RTCPeerConnection::getRemoteStreams() const
+Vector<RefPtr<MediaStream>> RTCPeerConnection::getRemoteStreams() const
 {
     return m_remoteStreams;
@@ -515 +515 @@
 MediaStream* RTCPeerConnection::getStreamById(const String& streamId)
 {
-    for (MediaStreamVector::iterator iter = m_localStreams.begin(); iter != m_localStreams.end(); ++iter) {
+    for (auto iter = m_localStreams.begin(); iter != m_localStreams.end(); ++iter) {
         if ((*iter)->id() == streamId)
             return iter->get();
     }
 
-    for (MediaStreamVector::iterator iter = m_remoteStreams.begin(); iter != m_remoteStreams.end(); ++iter) {
+    for (auto iter = m_remoteStreams.begin(); iter != m_remoteStreams.end(); ++iter) {
         if ((*iter)->id() == streamId)
             return iter->get();
@@ -552 +552 @@
 bool RTCPeerConnection::hasLocalStreamWithTrackId(const String& trackId)
 {
-    for (MediaStreamVector::iterator iter = m_localStreams.begin(); iter != m_localStreams.end(); ++iter) {
+    for (auto iter = m_localStreams.begin(); iter != m_localStreams.end(); ++iter) {
         if ((*iter)->getTrackById(trackId))
             return true;

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h

@@ -86 +86 @@
     RTCConfiguration* getConfiguration() const;
 
-    MediaStreamVector getLocalStreams() const;
+    Vector<RefPtr<MediaStream>> getLocalStreams() const;
 
-    MediaStreamVector getRemoteStreams() const;
+    Vector<RefPtr<MediaStream>> getRemoteStreams() const;
 
     MediaStream* getStreamById(const String& streamId);
@@ -158 +158 @@
     IceConnectionState m_iceConnectionState;
 
-    MediaStreamVector m_localStreams;
-    MediaStreamVector m_remoteStreams;
+    Vector<RefPtr<MediaStream>> m_localStreams;
+    Vector<RefPtr<MediaStream>> m_remoteStreams;
 
     Vector<RefPtr<RTCDataChannel>> m_dataChannels;