| Index: Source/platform/exported/WebMediaStream.cpp
|
| diff --git a/Source/platform/exported/WebMediaStream.cpp b/Source/platform/exported/WebMediaStream.cpp
|
| index bdc7fa83491bc8135bdb686d96682f3d080f2622..7ead4c231ef1bd1044035f8ec08ee482abbcfdee 100644
|
| --- a/Source/platform/exported/WebMediaStream.cpp
|
| +++ b/Source/platform/exported/WebMediaStream.cpp
|
| @@ -37,8 +37,6 @@
|
| #include "wtf/PassOwnPtr.h"
|
| #include "wtf/Vector.h"
|
|
|
| -using namespace blink;
|
| -
|
| namespace blink {
|
|
|
| namespace {
|
| @@ -55,12 +53,12 @@ private:
|
|
|
| } // namespace
|
|
|
| -WebMediaStream::WebMediaStream(const PassRefPtr<blink::MediaStreamDescriptor>& mediaStreamDescriptor)
|
| +WebMediaStream::WebMediaStream(const PassRefPtr<MediaStreamDescriptor>& mediaStreamDescriptor)
|
| : m_private(mediaStreamDescriptor)
|
| {
|
| }
|
|
|
| -WebMediaStream::WebMediaStream(blink::MediaStreamDescriptor* mediaStreamDescriptor)
|
| +WebMediaStream::WebMediaStream(MediaStreamDescriptor* mediaStreamDescriptor)
|
| : m_private(mediaStreamDescriptor)
|
| {
|
| }
|
| @@ -118,18 +116,18 @@ void WebMediaStream::removeTrack(const WebMediaStreamTrack& track)
|
| m_private->removeRemoteTrack(track);
|
| }
|
|
|
| -WebMediaStream& WebMediaStream::operator=(const PassRefPtr<blink::MediaStreamDescriptor>& mediaStreamDescriptor)
|
| +WebMediaStream& WebMediaStream::operator=(const PassRefPtr<MediaStreamDescriptor>& mediaStreamDescriptor)
|
| {
|
| m_private = mediaStreamDescriptor;
|
| return *this;
|
| }
|
|
|
| -WebMediaStream::operator PassRefPtr<blink::MediaStreamDescriptor>() const
|
| +WebMediaStream::operator PassRefPtr<MediaStreamDescriptor>() const
|
| {
|
| return m_private.get();
|
| }
|
|
|
| -WebMediaStream::operator blink::MediaStreamDescriptor*() const
|
| +WebMediaStream::operator MediaStreamDescriptor*() const
|
| {
|
| return m_private.get();
|
| }
|
|
|