Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)

1 files changed, 13 insertions, 3 deletions

diff --git a/Source/WebKit/chromium/src/UserMediaClientImpl.cpp b/Source/WebKit/chromium/src/UserMediaClientImpl.cpp
index 67a7c34b9..9c0bf58e1 100644
--- a/Source/WebKit/chromium/src/UserMediaClientImpl.cpp
+++ b/Source/WebKit/chromium/src/UserMediaClientImpl.cpp
@@ -38,6 +38,7 @@
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include "platform/WebMediaStreamSource.h"
+#include <wtf/RefPtr.h>
 
 using namespace WebCore;
 
@@ -52,10 +53,19 @@ void UserMediaClientImpl::pageDestroyed()
 {
 }
 
-void UserMediaClientImpl::requestUserMedia(PassRefPtr<UserMediaRequest> request, const MediaStreamSourceVector& sources)
+void UserMediaClientImpl::requestUserMedia(PassRefPtr<UserMediaRequest> prpRequest, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
 {
-    if (m_client)
-        m_client->requestUserMedia(request, sources);
+    if (m_client) {
+        RefPtr<UserMediaRequest> request = prpRequest;
+
+        // FIXME: Cleanup when the chromium code has switched to the split sources implementation.
+        MediaStreamSourceVector combinedSources;
+        combinedSources.append(audioSources);
+        combinedSources.append(videoSources);
+        m_client->requestUserMedia(PassRefPtr<UserMediaRequest>(request.get()), combinedSources);
+
+        m_client->requestUserMedia(request.release(), audioSources, videoSources);
+    }
 }
 
 void UserMediaClientImpl::cancelUserMediaRequest(UserMediaRequest* request)