Revert of [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap

third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Ericsson AB. 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
@@ skipping 42 matching lines @@
     , m_readyState(MediaStreamSource::ReadyStateLive)
     , m_isIteratingRegisteredMediaStreams(false)
     , m_stopped(false)
     , m_component(component)
 {
     m_component->source()->addObserver(this);
 }
 
 MediaStreamTrack::~MediaStreamTrack()
 {
+    m_component->source()->removeObserver(this);
 }
 
 String MediaStreamTrack::kind() const
 {
     DEFINE_STATIC_LOCAL(String, audioKind, ("audio"));
     DEFINE_STATIC_LOCAL(String, videoKind, ("video"));
 
     switch (m_component->source()->type()) {
     case MediaStreamSource::TypeAudio:
         return audioKind;
@@ skipping 82 matching lines @@
         return;
 
     m_readyState = MediaStreamSource::ReadyStateEnded;
     MediaStreamCenter::instance().didStopMediaStreamTrack(component());
     dispatchEvent(Event::create(EventTypeNames::ended));
     propagateTrackEnded();
 }
 
 MediaStreamTrack* MediaStreamTrack::clone(ExecutionContext* context)
 {
-    MediaStreamComponent* clonedComponent = MediaStreamComponent::create(component()->source());
-    MediaStreamTrack* clonedTrack = MediaStreamTrack::create(context, clonedComponent);
-    MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent);
+    RefPtr<MediaStreamComponent> clonedComponent = MediaStreamComponent::create(component()->source());
+    MediaStreamTrack* clonedTrack = MediaStreamTrack::create(context, clonedComponent.get());
+    MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent.get());
     return clonedTrack;
 }
 
 bool MediaStreamTrack::ended() const
 {
     return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded);
 }
 
 void MediaStreamTrack::sourceChangedState()
 {
@@ skipping 19 matching lines @@
 
 void MediaStreamTrack::propagateTrackEnded()
 {
     RELEASE_ASSERT(!m_isIteratingRegisteredMediaStreams);
     m_isIteratingRegisteredMediaStreams = true;
     for (HeapHashSet<Member<MediaStream>>::iterator iter = m_registeredMediaStreams.begin(); iter != m_registeredMediaStreams.end(); ++iter)
         (*iter)->trackEnded();
     m_isIteratingRegisteredMediaStreams = false;
 }
 
+MediaStreamComponent* MediaStreamTrack::component()
+{
+    return m_component.get();
+}
+
 void MediaStreamTrack::stop()
 {
     m_stopped = true;
 }
 
 PassOwnPtr<AudioSourceProvider> MediaStreamTrack::createWebAudioSource()
 {
     return MediaStreamCenter::instance().createWebAudioSourceFromMediaStreamTrack(component());
 }
 
@@ skipping 18 matching lines @@
 }
 
 ExecutionContext* MediaStreamTrack::executionContext() const
 {
     return ActiveDOMObject::executionContext();
 }
 
 DEFINE_TRACE(MediaStreamTrack)
 {
     visitor->trace(m_registeredMediaStreams);
-    visitor->trace(m_component);
     RefCountedGarbageCollectedEventTargetWithInlineData<MediaStreamTrack>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink