Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)

New snapshot to include QDeclarative* -> QQml* build fixes

1 files changed, 23 insertions, 28 deletions

diff --git a/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp b/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp
index 722192376..4efeb82d3 100644
--- a/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp
+++ b/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp
@@ -42,43 +42,38 @@
 
 namespace WebKit {
 
+class MockExtraData : public WebMediaStreamDescriptor::ExtraData {
+public:
+    int foo;
+};
+
 PassOwnPtr<WebUserMediaClientMock> WebUserMediaClientMock::create()
 {
     return adoptPtr(new WebUserMediaClientMock());
 }
 
-bool WebUserMediaClientMock::IsMockStream(const WebURL& url)
-{
-    WebMediaStreamDescriptor descriptor(WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
-    if (descriptor.isNull())
-        return false;
-
-    WebVector<WebMediaStreamSource> sourceVector;
-    descriptor.sources(sourceVector);
-    WebString trackId;
-    for (size_t i = 0; i < sourceVector.size(); ++i) {
-        if (sourceVector[i].type() == WebMediaStreamSource::TypeVideo) {
-            trackId = sourceVector[i].id();
-            break;
-        }
-    }
-    return trackId.equals("mediastreamtest");
-}
-
 void WebUserMediaClientMock::requestUserMedia(const WebUserMediaRequest& streamRequest, const WebVector<WebMediaStreamSource>& audioSourcesVector, const WebVector<WebMediaStreamSource>& videoSourcesVector)
 {
     ASSERT(!streamRequest.isNull());
-
     WebUserMediaRequest request = streamRequest;
-    const size_t size = 1;
-    WebVector<WebMediaStreamSource> audioSources(size);
-    WebVector<WebMediaStreamSource> videoSources(size);
-    WebString trackId("mediastreamtest");
-    WebString audioTrackName("AudioRecord");
-    WebString videoTrackName("VideoCapture");
-    audioSources[0].initialize(trackId, WebMediaStreamSource::TypeAudio, audioTrackName);
-    videoSources[0].initialize(trackId, WebMediaStreamSource::TypeVideo, videoTrackName);
-    request.requestSucceeded(audioSources, videoSources);
+
+    const size_t zero = 0;
+    const size_t one = 1;
+    WebVector<WebMediaStreamSource> audioSources(request.audio() ? one : zero);
+    WebVector<WebMediaStreamSource> videoSources(request.video() ? one : zero);
+
+    if (request.audio())
+        audioSources[0].initialize("MockAudioDevice#1", WebMediaStreamSource::TypeAudio, "Mock audio device");
+
+    if (request.video())
+        videoSources[0].initialize("MockVideoDevice#1", WebMediaStreamSource::TypeVideo, "Mock video device");
+
+    WebKit::WebMediaStreamDescriptor descriptor;
+    descriptor.initialize("foobar", audioSources, videoSources);
+
+    descriptor.setExtraData(new MockExtraData());
+
+    request.requestSucceeded(descriptor);
 }
 
 void WebUserMediaClientMock::cancelUserMediaRequest(const WebUserMediaRequest&)