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

Unified Diff: Source/platform/exported/WebMediaStreamTrack.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/WebMediaStreamTrack.cpp
diff --git a/Source/platform/exported/WebMediaStreamTrack.cpp b/Source/platform/exported/WebMediaStreamTrack.cpp
index 115ad924dabbce186f697670608f9b300e566991..4b7b3ac35f83510b8a11e9e408a1ee0b3b49797d 100644
--- a/Source/platform/exported/WebMediaStreamTrack.cpp
+++ b/Source/platform/exported/WebMediaStreamTrack.cpp
@@ -49,6 +49,23 @@
} // namespace
+WebMediaStreamTrack WebMediaStreamTrack::ExtraData::owner()
+{
+ ASSERT(m_owner);
+ return WebMediaStreamTrack(m_owner);
+}
+
+void WebMediaStreamTrack::ExtraData::setOwner(MediaStreamComponent* owner)
+{
+ ASSERT(!m_owner);
+ m_owner = owner;
+}
+
+WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<MediaStreamComponent> mediaStreamComponent)
+ : m_private(mediaStreamComponent)
+{
+}
+
WebMediaStreamTrack::WebMediaStreamTrack(MediaStreamComponent* mediaStreamComponent)
: m_private(mediaStreamComponent)
{
@@ -73,6 +90,11 @@
void WebMediaStreamTrack::reset()
{
m_private.reset();
+}
+
+WebMediaStreamTrack::operator PassRefPtr<MediaStreamComponent>() const
+{
+ return m_private.get();
}
WebMediaStreamTrack::operator MediaStreamComponent*() const
@@ -109,6 +131,10 @@
void WebMediaStreamTrack::setExtraData(ExtraData* extraData)
{
ASSERT(!m_private.isNull());
+
+ if (extraData)
+ extraData->setOwner(m_private.get());
+
m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData))));
}
« no previous file with comments | « Source/platform/exported/WebMediaStreamSource.cpp ('k') | Source/platform/mediastream/MediaStreamComponent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698