Revert of Reduce ActiveDOMObjects from modules/mediastream/

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 25 matching lines @@
 #include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h"
 #include "modules/mediastream/UserMediaController.h"
 #include "platform/mediastream/MediaStreamCenter.h"
 #include "platform/mediastream/MediaStreamComponent.h"
 #include "public/platform/WebSourceInfo.h"
 
 namespace blink {
 
 MediaStreamTrack* MediaStreamTrack::create(ExecutionContext* context, MediaStreamComponent* component)
 {
-    return new MediaStreamTrack(context, component);
+    MediaStreamTrack* track = new MediaStreamTrack(context, component);
+    track->suspendIfNeeded();
+    return track;
 }
 
 MediaStreamTrack::MediaStreamTrack(ExecutionContext* context, MediaStreamComponent* component)
-    : ContextLifecycleObserver(context)
+    : ActiveDOMObject(context)
     , m_readyState(MediaStreamSource::ReadyStateLive)
     , m_isIteratingRegisteredMediaStreams(false)
+    , m_stopped(false)
     , m_component(component)
 {
     m_component->source()->addObserver(this);
 }
 
 MediaStreamTrack::~MediaStreamTrack()
 {
 }
 
 String MediaStreamTrack::kind() const
@@ skipping 98 matching lines @@
 MediaStreamTrack* MediaStreamTrack::clone(ExecutionContext* context)
 {
     MediaStreamComponent* clonedComponent = MediaStreamComponent::create(component()->source());
     MediaStreamTrack* clonedTrack = MediaStreamTrack::create(context, clonedComponent);
     MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent);
     return clonedTrack;
 }
 
 bool MediaStreamTrack::ended() const
 {
-    return !executionContext() || (m_readyState == MediaStreamSource::ReadyStateEnded);
+    return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded);
 }
 
 void MediaStreamTrack::sourceChangedState()
 {
     if (ended())
         return;
 
     m_readyState = m_component->source()->readyState();
     switch (m_readyState) {
     case MediaStreamSource::ReadyStateLive:
@@ skipping 13 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;
 }
 
+void MediaStreamTrack::stop()
+{
+    m_stopped = true;
+}
+
 bool MediaStreamTrack::hasPendingActivity() const
 {
     // If 'ended' listeners exist and the object hasn't yet reached
     // that state, keep the object alive.
     //
     // An otherwise unreachable MediaStreamTrack object in an non-ended
     // state will otherwise indirectly be transitioned to the 'ended' state
     // while finalizing m_component. Which dispatches an 'ended' event,
     // referring to this object as the target. If this object is then GCed
     // at the same time, v8 objects will retain (wrapper) references to
@@ skipping 24 matching lines @@
     m_registeredMediaStreams.remove(iter);
 }
 
 const AtomicString& MediaStreamTrack::interfaceName() const
 {
     return EventTargetNames::MediaStreamTrack;
 }
 
 ExecutionContext* MediaStreamTrack::executionContext() const
 {
-    return ContextLifecycleObserver::executionContext();
+    return ActiveDOMObject::executionContext();
 }
 
 DEFINE_TRACE(MediaStreamTrack)
 {
     visitor->trace(m_registeredMediaStreams);
     visitor->trace(m_component);
     RefCountedGarbageCollectedEventTargetWithInlineData<MediaStreamTrack>::trace(visitor);
-    ContextLifecycleObserver::trace(visitor);
+    ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink