Revert of Reduce ActiveDOMObjects from modules/mediastream/

third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.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 33 matching lines @@
 static const int defaultInterToneGapMs = 50;
 
 RTCDTMFSender* RTCDTMFSender::create(ExecutionContext* context, WebRTCPeerConnectionHandler* peerConnectionHandler, MediaStreamTrack* track, ExceptionState& exceptionState)
 {
     OwnPtr<WebRTCDTMFSenderHandler> handler = adoptPtr(peerConnectionHandler->createDTMFSender(track->component()));
     if (!handler) {
         exceptionState.throwDOMException(NotSupportedError, "The MediaStreamTrack provided is not an element of a MediaStream that's currently in the local streams set.");
         return nullptr;
     }
 
-    return new RTCDTMFSender(context, track, handler.release());
+    RTCDTMFSender* dtmfSender = new RTCDTMFSender(context, track, handler.release());
+    dtmfSender->suspendIfNeeded();
+    return dtmfSender;
 }
 
 RTCDTMFSender::RTCDTMFSender(ExecutionContext* context, MediaStreamTrack* track, PassOwnPtr<WebRTCDTMFSenderHandler> handler)
-    : ContextLifecycleObserver(context)
+    : ActiveDOMObject(context)
     , m_track(track)
     , m_duration(defaultToneDurationMs)
     , m_interToneGap(defaultInterToneGapMs)
     , m_handler(handler)
+    , m_stopped(false)
     , m_scheduledEventTimer(this, &RTCDTMFSender::scheduledEventTimerFired)
 {
     m_handler->setClient(this);
 }
 
 RTCDTMFSender::~RTCDTMFSender()
 {
 }
 
 bool RTCDTMFSender::canInsertDTMF() const
@@ skipping 50 matching lines @@
     scheduleDispatchEvent(RTCDTMFToneChangeEvent::create(tone));
 }
 
 const AtomicString& RTCDTMFSender::interfaceName() const
 {
     return EventTargetNames::RTCDTMFSender;
 }
 
 ExecutionContext* RTCDTMFSender::executionContext() const
 {
-    return ContextLifecycleObserver::executionContext();
+    return ActiveDOMObject::executionContext();
 }
 
-void RTCDTMFSender::contextDestroyed()
+void RTCDTMFSender::stop()
 {
+    m_stopped = true;
     m_handler->setClient(0);
 }
 
 void RTCDTMFSender::scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
 {
     m_scheduledEvents.append(event);
 
     if (!m_scheduledEventTimer.isActive())
         m_scheduledEventTimer.startOneShot(0, BLINK_FROM_HERE);
 }
 
 void RTCDTMFSender::scheduledEventTimerFired(Timer<RTCDTMFSender>*)
 {
-    if (!executionContext())
+    if (m_stopped)
         return;
 
     WillBeHeapVector<RefPtrWillBeMember<Event>> events;
     events.swap(m_scheduledEvents);
 
     WillBeHeapVector<RefPtrWillBeMember<Event>>::iterator it = events.begin();
     for (; it != events.end(); ++it)
         dispatchEvent((*it).release());
 }
 
 DEFINE_TRACE(RTCDTMFSender)
 {
     visitor->trace(m_track);
     visitor->trace(m_scheduledEvents);
     RefCountedGarbageCollectedEventTargetWithInlineData<RTCDTMFSender>::trace(visitor);
-    ContextLifecycleObserver::trace(visitor);
+    ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink