Revert 181702 "Oilpan: Move MediaStreamSource, MediaStreamCompon..."

trunk/Source/platform/exported/WebMediaStreamTrack.cpp

Index: trunk/Source/platform/exported/WebMediaStreamTrack.cpp
===================================================================
--- trunk/Source/platform/exported/WebMediaStreamTrack.cpp	(revision 181729)
+++ trunk/Source/platform/exported/WebMediaStreamTrack.cpp	(working copy)
@@ -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)
 {
@@ -75,6 +92,11 @@
     m_private.reset();
 }
 
+WebMediaStreamTrack::operator PassRefPtr<MediaStreamComponent>() const
+{
+    return m_private.get();
+}
+
 WebMediaStreamTrack::operator MediaStreamComponent*() const
 {
     return m_private.get();
@@ -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))));
 }