Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / mediastream / MediaStreamCenter.cpp

diff --git a/src/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp b/src/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp
index 6ca053f..ccbd1c7 100644 (file)
--- a/src/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp
+++ b/src/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp
@@ -46,7 +46,7 @@
 #include "wtf/MainThread.h"
 #include "wtf/PassOwnPtr.h"
 
-namespace WebCore {
+namespace blink {
 
 MediaStreamCenter& MediaStreamCenter::instance()
 {
@@ -64,7 +64,7 @@ MediaStreamCenter::~MediaStreamCenter()
 {
 }
 
-bool MediaStreamCenter::getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequest> request)
+bool MediaStreamCenter::getMediaStreamTrackSources(MediaStreamTrackSourcesRequest* request)
 {
     return m_private && m_private->getMediaStreamTrackSources(request);
 }
@@ -101,11 +101,26 @@ bool MediaStreamCenter::didStopMediaStreamTrack(MediaStreamComponent* track)
     return m_private && m_private->didStopMediaStreamTrack(track);
 }
 
+void MediaStreamCenter::didCreateMediaStreamAndTracks(MediaStreamDescriptor* stream)
+{
+    if (!m_private)
+        return;
+
+    for (size_t i = 0; i < stream->numberOfAudioComponents(); ++i)
+        didCreateMediaStreamTrack(stream->audioComponent(i));
+
+    for (size_t i = 0; i < stream->numberOfVideoComponents(); ++i)
+        didCreateMediaStreamTrack(stream->videoComponent(i));
+
+    blink::WebMediaStream webStream(stream);
+    m_private->didCreateMediaStream(webStream);
+}
+
 void MediaStreamCenter::didCreateMediaStream(MediaStreamDescriptor* stream)
 {
     if (m_private) {
-        blink::WebMediaStream webStream(stream);
-        m_private->didCreateMediaStream(webStream);
+        blink::WebMediaStream WebMediaStream(stream);
+        m_private->didCreateMediaStream(WebMediaStream);
     }
 }
 
@@ -136,4 +151,4 @@ void MediaStreamCenter::stopLocalMediaStream(const blink::WebMediaStream& webStr
         stream->setEnded();
 }
 
-} // namespace WebCore
+} // namespace blink