| Index: public/platform/WebMediaStream.h
|
| diff --git a/public/platform/WebMediaStream.h b/public/platform/WebMediaStream.h
|
| index 182248ad96e3e911a216e9afc540b8fb44299f86..ce0514a81978f46d2c9e8338935a1c67c249a4e5 100644
|
| --- a/public/platform/WebMediaStream.h
|
| +++ b/public/platform/WebMediaStream.h
|
| @@ -31,11 +31,8 @@
|
| #include "WebVector.h"
|
|
|
| namespace blink {
|
| -class MediaStreamDescriptor;
|
| -}
|
| -
|
| -namespace blink {
|
|
|
| +class MediaStreamDescriptor;
|
| class WebMediaStreamSource;
|
| class WebMediaStreamTrack;
|
| class WebString;
|
| @@ -81,15 +78,15 @@ public:
|
| BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);
|
|
|
| #if INSIDE_BLINK
|
| - 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>&);
|
| + BLINK_PLATFORM_EXPORT WebMediaStream(MediaStreamDescriptor*);
|
| + BLINK_PLATFORM_EXPORT WebMediaStream(const WTF::PassRefPtr<MediaStreamDescriptor>&);
|
| + BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<MediaStreamDescriptor>() const;
|
| + BLINK_PLATFORM_EXPORT operator MediaStreamDescriptor*() const;
|
| + BLINK_PLATFORM_EXPORT WebMediaStream& operator=(const WTF::PassRefPtr<MediaStreamDescriptor>&);
|
| #endif
|
|
|
| private:
|
| - WebPrivatePtr<blink::MediaStreamDescriptor> m_private;
|
| + WebPrivatePtr<MediaStreamDescriptor> m_private;
|
| };
|
|
|
| } // namespace blink
|
|
|