Title: [165834] trunk/Source/WebCore
- Revision
- 165834
- Author
- [email protected]
- Date
- 2014-03-18 12:47:56 -0700 (Tue, 18 Mar 2014)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165833 => 165834)
--- trunk/Source/WebCore/ChangeLog 2014-03-18 19:46:20 UTC (rev 165833)
+++ trunk/Source/WebCore/ChangeLog 2014-03-18 19:47:56 UTC (rev 165834)
@@ -1,3 +1,18 @@
+2014-03-18 Thiago de Barros Lacerda <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r165815.
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (165833 => 165834)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2014-03-18 19:46:20 UTC (rev 165833)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2014-03-18 19:47:56 UTC (rev 165834)
@@ -131,8 +131,6 @@
Vector<Observer*> m_observers;
};
-typedef Vector<RefPtr<MediaStream>> MediaStreamVector;
-
} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (165833 => 165834)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-03-18 19:46:20 UTC (rev 165833)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-03-18 19:47:56 UTC (rev 165834)
@@ -502,24 +502,24 @@
return m_configuration.get();
}
-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;
}
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();
}
@@ -551,7 +551,7 @@
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;
}
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (165833 => 165834)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2014-03-18 19:46:20 UTC (rev 165833)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2014-03-18 19:47:56 UTC (rev 165834)
@@ -85,9 +85,9 @@
RTCConfiguration* getConfiguration() const;
- MediaStreamVector getLocalStreams() const;
+ Vector<RefPtr<MediaStream>> getLocalStreams() const;
- MediaStreamVector getRemoteStreams() const;
+ Vector<RefPtr<MediaStream>> getRemoteStreams() const;
MediaStream* getStreamById(const String& streamId);
@@ -157,8 +157,8 @@
IceGatheringState m_iceGatheringState;
IceConnectionState m_iceConnectionState;
- MediaStreamVector m_localStreams;
- MediaStreamVector m_remoteStreams;
+ Vector<RefPtr<MediaStream>> m_localStreams;
+ Vector<RefPtr<MediaStream>> m_remoteStreams;
Vector<RefPtr<RTCDataChannel>> m_dataChannels;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
