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

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

Issue 562663002: Revert 181702 "Oilpan: Move MediaStreamSource, MediaStreamCompon..." (Closed) Base URL: svn://svn.chromium.org/blink/
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: trunk/Source/platform/exported/WebMediaStream.cpp
===================================================================
--- trunk/Source/platform/exported/WebMediaStream.cpp (revision 181729)
+++ trunk/Source/platform/exported/WebMediaStream.cpp (working copy)
@@ -53,6 +53,11 @@
} // namespace
+WebMediaStream::WebMediaStream(const PassRefPtr<MediaStreamDescriptor>& mediaStreamDescriptor)
+ : m_private(mediaStreamDescriptor)
+{
+}
+
WebMediaStream::WebMediaStream(MediaStreamDescriptor* mediaStreamDescriptor)
: m_private(mediaStreamDescriptor)
{
@@ -111,12 +116,17 @@
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
{
return m_private.get();

Powered by Google App Engine
This is Rietveld 408576698