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

Unified Diff: Source/platform/exported/WebMediaStream.cpp

Issue 534473002: Revert of Oilpan: Move MediaStreamSource, MediaStreamComponent and MediaStreamDescriptor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 months 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: Source/platform/exported/WebMediaStream.cpp
diff --git a/Source/platform/exported/WebMediaStream.cpp b/Source/platform/exported/WebMediaStream.cpp
index 42f7fa33b192c67b309a9b1c02bc0656f455fdc8..7ead4c231ef1bd1044035f8ec08ee482abbcfdee 100644
--- a/Source/platform/exported/WebMediaStream.cpp
+++ b/Source/platform/exported/WebMediaStream.cpp
@@ -52,6 +52,11 @@
};
} // namespace
+
+WebMediaStream::WebMediaStream(const PassRefPtr<MediaStreamDescriptor>& mediaStreamDescriptor)
+ : m_private(mediaStreamDescriptor)
+{
+}
WebMediaStream::WebMediaStream(MediaStreamDescriptor* mediaStreamDescriptor)
: m_private(mediaStreamDescriptor)
@@ -111,10 +116,15 @@
m_private->removeRemoteTrack(track);
}
-WebMediaStream& WebMediaStream::operator=(MediaStreamDescriptor* mediaStreamDescriptor)
+WebMediaStream& WebMediaStream::operator=(const PassRefPtr<MediaStreamDescriptor>& mediaStreamDescriptor)
{
m_private = mediaStreamDescriptor;
return *this;
+}
+
+WebMediaStream::operator PassRefPtr<MediaStreamDescriptor>() const
+{
+ return m_private.get();
}
WebMediaStream::operator MediaStreamDescriptor*() const
« no previous file with comments | « Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp ('k') | Source/platform/exported/WebMediaStreamSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698