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

trunk/Source/platform/exported/WebMediaStreamTrack.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 31 matching lines @@
     explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extraData) : m_extraData(extraData) { }
 
     WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); }
 
 private:
     OwnPtr<WebMediaStreamTrack::ExtraData> m_extraData;
 };
 
 } // 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)
 {
 }
 
 WebMediaStreamTrack& WebMediaStreamTrack::operator=(MediaStreamComponent* mediaStreamComponent)
 {
     m_private = mediaStreamComponent;
     return *this;
 }
 
 void WebMediaStreamTrack::initialize(const WebMediaStreamSource& source)
 {
     m_private = MediaStreamComponent::create(source);
 }
 
 void WebMediaStreamTrack::initialize(const WebString& id, const WebMediaStreamSource& source)
 {
     m_private = MediaStreamComponent::create(id, source);
 }
 
 void WebMediaStreamTrack::reset()
 {
     m_private.reset();
 }
 
+WebMediaStreamTrack::operator PassRefPtr<MediaStreamComponent>() const
+{
+    return m_private.get();
+}
+
 WebMediaStreamTrack::operator MediaStreamComponent*() const
 {
     return m_private.get();
 }
 
 bool WebMediaStreamTrack::isEnabled() const
 {
     ASSERT(!m_private.isNull());
     return m_private->enabled();
 }
@@ skipping 20 matching lines @@
 {
     MediaStreamComponent::ExtraData* data = m_private->extraData();
     if (!data)
         return 0;
     return static_cast<ExtraDataContainer*>(data)->extraData();
 }
 
 void WebMediaStreamTrack::setExtraData(ExtraData* extraData)
 {
     ASSERT(!m_private.isNull());
+
+    if (extraData)
+        extraData->setOwner(m_private.get());
+
     m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData))));
 }
 
 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider)
 {
 #if ENABLE(WEB_AUDIO)
     ASSERT(!m_private.isNull());
     m_private->setSourceProvider(provider);
 #endif // ENABLE(WEB_AUDIO)
 }
 
 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other)
 {
     m_private = other.m_private;
 }
 
 } // namespace blink