Reduce SuspendableObjects

third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.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 111 matching lines @@
   }
 
  private:
   Member<MediaKeys> m_mediaKeys;
 };
 
 MediaKeys* MediaKeys::create(
     ExecutionContext* context,
     const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes,
     std::unique_ptr<WebContentDecryptionModule> cdm) {
-  MediaKeys* mediaKeys =
-      new MediaKeys(context, supportedSessionTypes, std::move(cdm));
-  mediaKeys->suspendIfNeeded();
-  return mediaKeys;
+  return new MediaKeys(context, supportedSessionTypes, std::move(cdm));
 }
 
 MediaKeys::MediaKeys(
     ExecutionContext* context,
     const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes,
     std::unique_ptr<WebContentDecryptionModule> cdm)
-    : SuspendableObject(context),
+    : ContextLifecycleObserver(context),
       m_supportedSessionTypes(supportedSessionTypes),
       m_cdm(std::move(cdm)),
       m_mediaElement(nullptr),
       m_reservedForMediaElement(false),
       m_timer(this, &MediaKeys::timerFired) {
   DVLOG(MEDIA_KEYS_LOG_LEVEL) << __func__ << "(" << this << ")";
 }
 
 MediaKeys::~MediaKeys() {
   DVLOG(MEDIA_KEYS_LOG_LEVEL) << __func__ << "(" << this << ")";
@@ skipping 132 matching lines @@
   }
 }
 
 WebContentDecryptionModule* MediaKeys::contentDecryptionModule() {
   return m_cdm.get();
 }
 
 DEFINE_TRACE(MediaKeys) {
   visitor->trace(m_pendingActions);
   visitor->trace(m_mediaElement);
-  SuspendableObject::trace(visitor);
+  ContextLifecycleObserver::trace(visitor);
 }
 
 void MediaKeys::contextDestroyed() {
   m_timer.stop();
   m_pendingActions.clear();
 
   // We don't need the CDM anymore. Only destroyed after all related
-  // SuspendableObjects have been stopped.
+  // ContextLifecycleObservers have been stopped.
   m_cdm.reset();
 }
 
 bool MediaKeys::hasPendingActivity() const {
   // Remain around if there are pending events.
   DVLOG(MEDIA_KEYS_LOG_LEVEL)
       << __func__ << "(" << this << ")"
       << (!m_pendingActions.isEmpty() ? " !m_pendingActions.isEmpty()" : "")
       << (m_reservedForMediaElement ? " m_reservedForMediaElement" : "");
 
   return !m_pendingActions.isEmpty() || m_reservedForMediaElement;
 }
 
 }  // namespace blink