Chromium Code Reviews| Index: third_party/WebKit/public/platform/WebMediaStreamSource.h |
| diff --git a/third_party/WebKit/public/platform/WebMediaStreamSource.h b/third_party/WebKit/public/platform/WebMediaStreamSource.h |
| index bb6bdc84986a3dc3bb57c8a8830311b834ce4d60..5e33a18722afe6d66d2b0e6e807fd340cc2fd654 100644 |
| --- a/third_party/WebKit/public/platform/WebMediaStreamSource.h |
| +++ b/third_party/WebKit/public/platform/WebMediaStreamSource.h |
| @@ -35,6 +35,9 @@ |
| #include "WebNonCopyable.h" |
| #include "WebPrivatePtr.h" |
| #include "WebVector.h" |
| +#if INSIDE_BLINK |
| +#include "platform/heap/Handle.h" |
| +#endif |
| namespace blink { |
| @@ -57,6 +60,9 @@ public: |
| #endif |
| private: |
| +#if INSIDE_BLINK |
| + GC_PLUGIN_IGNORE("http://crbug.com/409526") |
| +#endif |
| MediaStreamSource* m_owner; |
| }; |
| @@ -113,7 +119,7 @@ public: |
| BLINK_PLATFORM_EXPORT bool removeAudioConsumer(WebAudioDestinationConsumer*); |
| #if INSIDE_BLINK |
| - BLINK_PLATFORM_EXPORT WebMediaStreamSource(const WTF::PassRefPtr<MediaStreamSource>&); |
| + BLINK_PLATFORM_EXPORT WebMediaStreamSource(MediaStreamSource*); |
|
sof
2015/09/30 06:26:35
nit: should this be an implicit conversion, or exp
peria
2015/09/30 07:50:05
Done.
Style guide tells us to use explicit.
|
| BLINK_PLATFORM_EXPORT WebMediaStreamSource& operator=(MediaStreamSource*); |
| BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<MediaStreamSource>() const; |
| BLINK_PLATFORM_EXPORT operator MediaStreamSource*() const; |