| Index: Source/modules/mediastream/UserMediaRequest.cpp
|
| diff --git a/Source/modules/mediastream/UserMediaRequest.cpp b/Source/modules/mediastream/UserMediaRequest.cpp
|
| index 1a3f8a2f1b3fb262857d9a311e29aeb9ca943587..4acaf1b4aeea0f87a818280de9dc9910721be8ec 100644
|
| --- a/Source/modules/mediastream/UserMediaRequest.cpp
|
| +++ b/Source/modules/mediastream/UserMediaRequest.cpp
|
| @@ -41,8 +41,8 @@
|
| #include "core/dom/SpaceSplitString.h"
|
| #include "core/platform/mediastream/MediaStreamCenter.h"
|
| #include "core/platform/mediastream/MediaStreamDescriptor.h"
|
| -#include "modules/mediastream/LocalMediaStream.h"
|
| #include "modules/mediastream/MediaConstraintsImpl.h"
|
| +#include "modules/mediastream/MediaStream.h"
|
| #include "modules/mediastream/UserMediaController.h"
|
|
|
| namespace WebCore {
|
| @@ -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());
|
| }
|
|
|
|
|