| Index: public/platform/WebMediaStreamSource.h
|
| diff --git a/public/platform/WebMediaStreamSource.h b/public/platform/WebMediaStreamSource.h
|
| index 9d8b2d30b96f5d94e910cdaa14690580a00bda7f..58692287a9b053c1c168ca058d7ecd6d8fdf621f 100644
|
| --- a/public/platform/WebMediaStreamSource.h
|
| +++ b/public/platform/WebMediaStreamSource.h
|
| @@ -37,10 +37,8 @@
|
| #include "WebVector.h"
|
|
|
| namespace blink {
|
| -class MediaStreamSource;
|
| -}
|
|
|
| -namespace blink {
|
| +class MediaStreamSource;
|
| class WebAudioDestinationConsumer;
|
| class WebMediaConstraints;
|
| class WebString;
|
| @@ -55,11 +53,11 @@ public:
|
| BLINK_PLATFORM_EXPORT WebMediaStreamSource owner();
|
|
|
| #if INSIDE_BLINK
|
| - BLINK_PLATFORM_EXPORT void setOwner(blink::MediaStreamSource*);
|
| + BLINK_PLATFORM_EXPORT void setOwner(MediaStreamSource*);
|
| #endif
|
|
|
| private:
|
| - blink::MediaStreamSource* m_owner;
|
| + MediaStreamSource* m_owner;
|
| };
|
|
|
| enum Type {
|
| @@ -113,14 +111,14 @@ public:
|
| BLINK_PLATFORM_EXPORT bool removeAudioConsumer(WebAudioDestinationConsumer*);
|
|
|
| #if INSIDE_BLINK
|
| - BLINK_PLATFORM_EXPORT WebMediaStreamSource(const WTF::PassRefPtr<blink::MediaStreamSource>&);
|
| - BLINK_PLATFORM_EXPORT WebMediaStreamSource& operator=(blink::MediaStreamSource*);
|
| - BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<blink::MediaStreamSource>() const;
|
| - BLINK_PLATFORM_EXPORT operator blink::MediaStreamSource*() const;
|
| + BLINK_PLATFORM_EXPORT WebMediaStreamSource(const WTF::PassRefPtr<MediaStreamSource>&);
|
| + BLINK_PLATFORM_EXPORT WebMediaStreamSource& operator=(MediaStreamSource*);
|
| + BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<MediaStreamSource>() const;
|
| + BLINK_PLATFORM_EXPORT operator MediaStreamSource*() const;
|
| #endif
|
|
|
| private:
|
| - WebPrivatePtr<blink::MediaStreamSource> m_private;
|
| + WebPrivatePtr<MediaStreamSource> m_private;
|
| };
|
|
|
| } // namespace blink
|
|
|