summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/src/UserMediaClientImpl.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
commit2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch)
tree988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit/chromium/src/UserMediaClientImpl.cpp
parentdd91e772430dc294e3bf478c119ef8d43c0a3358 (diff)
downloadqtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit/chromium/src/UserMediaClientImpl.cpp')
-rw-r--r--Source/WebKit/chromium/src/UserMediaClientImpl.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/WebKit/chromium/src/UserMediaClientImpl.cpp b/Source/WebKit/chromium/src/UserMediaClientImpl.cpp
index 9c0bf58e1..ca8a98dcb 100644
--- a/Source/WebKit/chromium/src/UserMediaClientImpl.cpp
+++ b/Source/WebKit/chromium/src/UserMediaClientImpl.cpp
@@ -58,12 +58,6 @@ void UserMediaClientImpl::requestUserMedia(PassRefPtr<UserMediaRequest> prpReque
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);
}
}