Reduce SuspendableObjects

third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

 /*
  * Copyright (C) 2013 Apple 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 337 matching lines @@
  private:
   // Keep track of the MediaKeySession that created this promise so that it
   // remains reachable as long as this promise is reachable.
   Member<MediaKeySession> m_session;
 };
 
 MediaKeySession* MediaKeySession::create(
     ScriptState* scriptState,
     MediaKeys* mediaKeys,
     WebEncryptedMediaSessionType sessionType) {
-  MediaKeySession* session =
-      new MediaKeySession(scriptState, mediaKeys, sessionType);
-  session->suspendIfNeeded();
-  return session;
+  return new MediaKeySession(scriptState, mediaKeys, sessionType);
 }
 
 MediaKeySession::MediaKeySession(ScriptState* scriptState,
                                  MediaKeys* mediaKeys,
                                  WebEncryptedMediaSessionType sessionType)
-    : SuspendableObject(scriptState->getExecutionContext()),
+    : ContextLifecycleObserver(scriptState->getExecutionContext()),
       m_asyncEventQueue(GenericEventQueue::create(this)),
       m_mediaKeys(mediaKeys),
       m_sessionType(sessionType),
       m_expiration(std::numeric_limits<double>::quiet_NaN()),
       m_keyStatusesMap(new MediaKeyStatusMap()),
       m_isUninitialized(true),
       m_isCallable(false),
       m_isClosed(false),
       m_closedPromise(new ClosedPromise(scriptState->getExecutionContext(),
                                         this,
@@ skipping 627 matching lines @@
   //    may choose to skip this step if it knows resuming will fail.
   // FIXME: Attempt to resume playback if |hasAdditionalUsableKey| is true.
   // http://crbug.com/413413
 }
 
 const AtomicString& MediaKeySession::interfaceName() const {
   return EventTargetNames::MediaKeySession;
 }
 
 ExecutionContext* MediaKeySession::getExecutionContext() const {
-  return SuspendableObject::getExecutionContext();
+  return ContextLifecycleObserver::getExecutionContext();
 }
 
 bool MediaKeySession::hasPendingActivity() const {
   // Remain around if there are pending events or MediaKeys is still around
   // and we're not closed.
   DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL)
       << __func__ << "(" << this << ")"
       << (!m_pendingActions.isEmpty() ? " !m_pendingActions.isEmpty()" : "")
       << (m_asyncEventQueue->hasPendingEvents()
               ? " m_asyncEventQueue->hasPendingEvents()"
@@ skipping 13 matching lines @@
   m_asyncEventQueue->close();
 }
 
 DEFINE_TRACE(MediaKeySession) {
   visitor->trace(m_asyncEventQueue);
   visitor->trace(m_pendingActions);
   visitor->trace(m_mediaKeys);
   visitor->trace(m_keyStatusesMap);
   visitor->trace(m_closedPromise);
   EventTargetWithInlineData::trace(visitor);
-  SuspendableObject::trace(visitor);
+  ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink