| Index: public/platform/WebMediaStream.h
|
| diff --git a/public/platform/WebMediaStream.h b/public/platform/WebMediaStream.h
|
| index 184fddc0568ebdfe8e88c29312e1b28a115cce5d..182248ad96e3e911a216e9afc540b8fb44299f86 100644
|
| --- a/public/platform/WebMediaStream.h
|
| +++ b/public/platform/WebMediaStream.h
|
| @@ -30,7 +30,7 @@
|
| #include "WebPrivatePtr.h"
|
| #include "WebVector.h"
|
|
|
| -namespace WebCore {
|
| +namespace blink {
|
| class MediaStreamDescriptor;
|
| }
|
|
|
| @@ -81,15 +81,15 @@ public:
|
| BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);
|
|
|
| #if INSIDE_BLINK
|
| - BLINK_PLATFORM_EXPORT WebMediaStream(WebCore::MediaStreamDescriptor*);
|
| - BLINK_PLATFORM_EXPORT WebMediaStream(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
|
| - BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<WebCore::MediaStreamDescriptor>() const;
|
| - BLINK_PLATFORM_EXPORT operator WebCore::MediaStreamDescriptor*() const;
|
| - BLINK_PLATFORM_EXPORT WebMediaStream& operator=(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
|
| + BLINK_PLATFORM_EXPORT WebMediaStream(blink::MediaStreamDescriptor*);
|
| + BLINK_PLATFORM_EXPORT WebMediaStream(const WTF::PassRefPtr<blink::MediaStreamDescriptor>&);
|
| + BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<blink::MediaStreamDescriptor>() const;
|
| + BLINK_PLATFORM_EXPORT operator blink::MediaStreamDescriptor*() const;
|
| + BLINK_PLATFORM_EXPORT WebMediaStream& operator=(const WTF::PassRefPtr<blink::MediaStreamDescriptor>&);
|
| #endif
|
|
|
| private:
|
| - WebPrivatePtr<WebCore::MediaStreamDescriptor> m_private;
|
| + WebPrivatePtr<blink::MediaStreamDescriptor> m_private;
|
| };
|
|
|
| } // namespace blink
|
|
|