Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Unified Diff: public/platform/WebMediaStreamSource.h

Issue 64593002: Move MediaStreamSource to platform/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: public/platform/WebMediaStreamSource.h
diff --git a/public/platform/WebMediaStreamSource.h b/public/platform/WebMediaStreamSource.h
index 7bdd7eb7605d070e1f756d566d2608ad7f5a0d45..ce39120a1b48d9a110c9d9ac66377de0000de31d 100644
--- a/public/platform/WebMediaStreamSource.h
+++ b/public/platform/WebMediaStreamSource.h
@@ -52,9 +52,9 @@ public:
ExtraData() : m_owner(0) { }
virtual ~ExtraData() { }
- BLINK_EXPORT WebMediaStreamSource owner();
+ BLINK_PLATFORM_EXPORT WebMediaStreamSource owner();
-#if BLINK_IMPLEMENTATION
+#if INSIDE_BLINK
void setOwner(WebCore::MediaStreamSource*);
abarth-chromium 2013/11/07 18:23:23 ditto
#endif
@@ -83,43 +83,43 @@ public:
return *this;
}
- BLINK_EXPORT void assign(const WebMediaStreamSource&);
+ BLINK_PLATFORM_EXPORT void assign(const WebMediaStreamSource&);
- BLINK_EXPORT void initialize(const WebString& id, Type, const WebString& name);
- BLINK_EXPORT void reset();
+ BLINK_PLATFORM_EXPORT void initialize(const WebString& id, Type, const WebString& name);
+ BLINK_PLATFORM_EXPORT void reset();
bool isNull() const { return m_private.isNull(); }
- BLINK_EXPORT WebString id() const;
- BLINK_EXPORT Type type() const;
- BLINK_EXPORT WebString name() const;
+ BLINK_PLATFORM_EXPORT WebString id() const;
+ BLINK_PLATFORM_EXPORT Type type() const;
+ BLINK_PLATFORM_EXPORT WebString name() const;
- BLINK_EXPORT void setReadyState(ReadyState);
- BLINK_EXPORT ReadyState readyState() const;
+ BLINK_PLATFORM_EXPORT void setReadyState(ReadyState);
+ BLINK_PLATFORM_EXPORT ReadyState readyState() const;
// Extra data associated with this object.
// If non-null, the extra data pointer will be deleted when the object is destroyed.
// Setting the extra data pointer will cause any existing non-null
// extra data pointer to be deleted.
- BLINK_EXPORT ExtraData* extraData() const;
- BLINK_EXPORT void setExtraData(ExtraData*);
+ BLINK_PLATFORM_EXPORT ExtraData* extraData() const;
+ BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);
- BLINK_EXPORT WebMediaConstraints constraints();
+ BLINK_PLATFORM_EXPORT WebMediaConstraints constraints();
- BLINK_EXPORT WebString deviceId() const;
- BLINK_EXPORT void setDeviceId(const WebString&);
+ BLINK_PLATFORM_EXPORT WebString deviceId() const;
+ BLINK_PLATFORM_EXPORT void setDeviceId(const WebString&);
// Only used if if this is a WebAudio source.
// The WebAudioDestinationConsumer is not owned, and has to be disposed of separately
// after calling removeAudioConsumer.
- BLINK_EXPORT bool requiresAudioConsumer() const;
- BLINK_EXPORT void addAudioConsumer(WebAudioDestinationConsumer*);
- BLINK_EXPORT bool removeAudioConsumer(WebAudioDestinationConsumer*);
-
-#if BLINK_IMPLEMENTATION
- WebMediaStreamSource(const WTF::PassRefPtr<WebCore::MediaStreamSource>&);
- WebMediaStreamSource& operator=(WebCore::MediaStreamSource*);
- operator WTF::PassRefPtr<WebCore::MediaStreamSource>() const;
- operator WebCore::MediaStreamSource*() const;
+ BLINK_PLATFORM_EXPORT bool requiresAudioConsumer() const;
+ BLINK_PLATFORM_EXPORT void addAudioConsumer(WebAudioDestinationConsumer*);
+ BLINK_PLATFORM_EXPORT bool removeAudioConsumer(WebAudioDestinationConsumer*);
+
+#if INSIDE_BLINK
+ BLINK_PLATFORM_EXPORT WebMediaStreamSource(const WTF::PassRefPtr<WebCore::MediaStreamSource>&);
+ BLINK_PLATFORM_EXPORT WebMediaStreamSource& operator=(WebCore::MediaStreamSource*);
+ BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<WebCore::MediaStreamSource>() const;
+ BLINK_PLATFORM_EXPORT operator WebCore::MediaStreamSource*() const;
#endif
private:
« public/platform/WebMediaConstraints.h ('K') | « public/platform/WebMediaConstraints.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698