Reduce SuspendableObjects

third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.h

 /*
  * 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 11 matching lines @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef MediaKeys_h
 #define MediaKeys_h
 
 #include "bindings/core/v8/ActiveScriptWrappable.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptWrappable.h"
+#include "core/dom/ContextLifecycleObserver.h"
 #include "core/dom/DOMArrayPiece.h"
-#include "core/dom/SuspendableObject.h"
 #include "platform/Timer.h"
 #include "public/platform/WebContentDecryptionModule.h"
 #include "public/platform/WebEncryptedMediaTypes.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebVector.h"
 #include "wtf/Forward.h"
 #include "wtf/text/WTFString.h"
 #include <memory>
 
 namespace blink {
 
 class ExceptionState;
 class ExecutionContext;
 class HTMLMediaElement;
 class MediaKeySession;
 class ScriptState;
 class WebContentDecryptionModule;
 
 // References are held by JS and HTMLMediaElement.
 // The WebContentDecryptionModule has the same lifetime as this object.
 class MediaKeys : public GarbageCollectedFinalized<MediaKeys>,
                   public ActiveScriptWrappable<MediaKeys>,
-                  public SuspendableObject,
+                  public ContextLifecycleObserver,
                   public ScriptWrappable {
   USING_GARBAGE_COLLECTED_MIXIN(MediaKeys);
   DEFINE_WRAPPERTYPEINFO();
 
  public:
   static MediaKeys* create(
       ExecutionContext*,
       const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes,
       std::unique_ptr<WebContentDecryptionModule>);
-  ~MediaKeys() override;
+  virtual ~MediaKeys();
 
   MediaKeySession* createSession(ScriptState*,
                                  const String& sessionTypeString,
                                  ExceptionState&);
 
   ScriptPromise setServerCertificate(ScriptState*,
                                      const DOMArrayPiece& serverCertificate);
 
   // Indicates that the provided HTMLMediaElement wants to use this object.
   // Returns true if no other HTMLMediaElement currently references this
   // object, false otherwise. If true, will take a weak reference to
   // HTMLMediaElement and expects the reservation to be accepted/cancelled
   // later.
   bool reserveForMediaElement(HTMLMediaElement*);
   // Indicates that SetMediaKeys completed successfully.
   void acceptReservation();
   // Indicates that SetMediaKeys failed, so HTMLMediaElement did not
   // successfully link to this object.
   void cancelReservation();
 
   // The previously reserved and accepted HTMLMediaElement is no longer
   // using this object.
   void clearMediaElement();
 
   WebContentDecryptionModule* contentDecryptionModule();
 
   DECLARE_VIRTUAL_TRACE();
 
-  // SuspendableObject implementation.
+  // ContextLifecycleObserver implementation.
   // FIXME: This class could derive from ContextLifecycleObserver
   // again (http://crbug.com/483722).
   void contextDestroyed() override;
 
   // ScriptWrappable implementation.
   bool hasPendingActivity() const final;
 
  private:
   MediaKeys(
       ExecutionContext*,
@@ skipping 21 matching lines @@
   // object will be prevented until the setMediaKeys() completes.
   bool m_reservedForMediaElement;
 
   HeapDeque<Member<PendingAction>> m_pendingActions;
   Timer<MediaKeys> m_timer;
 };
 
 }  // namespace blink
 
 #endif  // MediaKeys_h