summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/src/WebUserMediaRequest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/chromium/src/WebUserMediaRequest.cpp')
-rw-r--r--Source/WebKit/chromium/src/WebUserMediaRequest.cpp28
1 files changed, 0 insertions, 28 deletions
diff --git a/Source/WebKit/chromium/src/WebUserMediaRequest.cpp b/Source/WebKit/chromium/src/WebUserMediaRequest.cpp
index 5a76c83b0..dcd270385 100644
--- a/Source/WebKit/chromium/src/WebUserMediaRequest.cpp
+++ b/Source/WebKit/chromium/src/WebUserMediaRequest.cpp
@@ -70,16 +70,6 @@ bool WebUserMediaRequest::video() const
return m_private->video();
}
-bool WebUserMediaRequest::cameraPreferenceUser() const
-{
- return m_private->cameraPreferenceUser();
-}
-
-bool WebUserMediaRequest::cameraPreferenceEnvironment() const
-{
- return m_private->cameraPreferenceEnvironment();
-}
-
WebSecurityOrigin WebUserMediaRequest::securityOrigin() const
{
ASSERT(m_private->scriptExecutionContext());
@@ -105,24 +95,6 @@ void WebUserMediaRequest::requestSucceeded(const WebVector<WebMediaStreamSource>
m_private->succeed(audio, video);
}
-// FIXME: Cleanup when the chromium code has switched to the split sources implementation.
-void WebUserMediaRequest::requestSucceeded(const WebVector<WebMediaStreamSource>& sources)
-{
- if (m_private.isNull())
- return;
-
- MediaStreamSourceVector audio, video;
- for (size_t i = 0; i < sources.size(); ++i) {
- MediaStreamSource* curr = sources[i];
- if (curr->type() == MediaStreamSource::TypeAudio)
- audio.append(curr);
- else if (curr->type() == MediaStreamSource::TypeVideo)
- video.append(curr);
- }
-
- m_private->succeed(audio, video);
-}
-
void WebUserMediaRequest::requestFailed()
{
m_private->fail();