[v8 gc] Introduce a base class for all objects that can have pending activity

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 71 matching lines @@
 };
 
 MediaKeys* MediaKeys::create(ExecutionContext* context, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule> cdm)
 {
     MediaKeys* mediaKeys = new MediaKeys(context, supportedSessionTypes, cdm);
     mediaKeys->suspendIfNeeded();
     return mediaKeys;
 }
 
 MediaKeys::MediaKeys(ExecutionContext* context, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule> cdm)
-    : ActiveDOMObject(context)
+    : ActiveScriptWrappable(this)
+    , ActiveDOMObject(context)
     , m_supportedSessionTypes(supportedSessionTypes)
     , m_cdm(cdm)
     , m_mediaElement(nullptr)
     , m_reservedForMediaElement(false)
     , m_timer(this, &MediaKeys::timerFired)
 {
     WTF_LOG(Media, "MediaKeys(%p)::MediaKeys", this);
 }
 
 MediaKeys::~MediaKeys()
@@ skipping 144 matching lines @@
     ActiveDOMObject::contextDestroyed();
 
     // We don't need the CDM anymore. Only destroyed after all related
     // ActiveDOMObjects have been stopped.
     m_cdm.clear();
 }
 
 bool MediaKeys::hasPendingActivity() const
 {
     // Remain around if there are pending events.
-    WTF_LOG(Media, "MediaKeys(%p)::hasPendingActivity %s%s%s", this,
-        ScriptWrappable::hasPendingActivity() ? " ScriptWrappable::hasPendingActivity()" : "",
+    WTF_LOG(Media, "MediaKeys(%p)::hasPendingActivity %s%s", this,
         !m_pendingActions.isEmpty() ? " !m_pendingActions.isEmpty()" : "",
         m_reservedForMediaElement ? " m_reservedForMediaElement" : "");
 
-    return ScriptWrappable::hasPendingActivity() || !m_pendingActions.isEmpty() || m_reservedForMediaElement;
+    return !m_pendingActions.isEmpty() || m_reservedForMediaElement;
 }
 
 void MediaKeys::stop()
 {
     ActiveDOMObject::stop();
 
     if (m_timer.isActive())
         m_timer.stop();
     m_pendingActions.clear();
 }
 
 } // namespace blink