| Index: Source/modules/mediastream/UserMediaRequest.cpp
|
| diff --git a/Source/modules/mediastream/UserMediaRequest.cpp b/Source/modules/mediastream/UserMediaRequest.cpp
|
| index 663193c3972308d767390d20c0a2bc65d7c56e71..8a9441b024e8cfb943186640e9847883088f8af6 100644
|
| --- a/Source/modules/mediastream/UserMediaRequest.cpp
|
| +++ b/Source/modules/mediastream/UserMediaRequest.cpp
|
| @@ -38,8 +38,8 @@
|
| #include "Dictionary.h"
|
| #include "Document.h"
|
| #include "ExceptionCode.h"
|
| -#include "LocalMediaStream.h"
|
| #include "MediaConstraintsImpl.h"
|
| +#include "MediaStream.h"
|
| #include "MediaStreamCenter.h"
|
| #include "MediaStreamDescriptor.h"
|
| #include "SpaceSplitString.h"
|
| @@ -135,21 +135,12 @@ void UserMediaRequest::didCompleteQuery(const MediaStreamSourceVector& audioSour
|
| m_controller->requestUserMedia(this, audioSources, videoSources);
|
| }
|
|
|
| -void UserMediaRequest::succeed(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
|
| -{
|
| - if (!m_scriptExecutionContext)
|
| - return;
|
| -
|
| - RefPtr<LocalMediaStream> stream = LocalMediaStream::create(m_scriptExecutionContext, audioSources, videoSources);
|
| - m_successCallback->handleEvent(stream.get());
|
| -}
|
| -
|
| void UserMediaRequest::succeed(PassRefPtr<MediaStreamDescriptor> streamDescriptor)
|
| {
|
| if (!m_scriptExecutionContext)
|
| return;
|
|
|
| - RefPtr<LocalMediaStream> stream = LocalMediaStream::create(m_scriptExecutionContext, streamDescriptor);
|
| + RefPtr<MediaStream> stream = MediaStream::create(m_scriptExecutionContext, streamDescriptor);
|
| m_successCallback->handleEvent(stream.get());
|
| }
|
|
|
|
|