[WIP] Migrate hasPendingActivity from ActiveDOMObject to ScriptWrappable.

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

Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
index 6111349b6b7ff973b539732352fa66437b5cd1d2..5b98d49e23ae893255837b5bd665622ffb562263 100644
--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
@@ -897,12 +897,12 @@ bool MediaKeySession::hasPendingActivity() const
     // Remain around if there are pending events or MediaKeys is still around
     // and we're not closed.
     WTF_LOG(Media, "MediaKeySession(%p)::hasPendingActivity %s%s%s%s", this,
-        ActiveDOMObject::hasPendingActivity() ? " ActiveDOMObject::hasPendingActivity()" : "",
+        ScriptWrappable::hasPendingActivity() ? " ScriptWrappable::hasPendingActivity()" : "",

[Yuki, 2015/10/16 06:43:15]

The direct super class (on the path to ScriptWrappable) of this class is
    RefCountedGarbageCollectedEventTargetWithInlineData<MediaKeySession>,
so you should call
    RefCountedGarbageCollectedEventTargetWithInlineData<MediaKeySession>::
    hasPendingActivity()
instead of ScriptWrappable::hasPendingActivity().

You may or may not want to define an alias in .h (just after inheritance) like
    typedef RefCountedGarbageCollectedEventTargetWithInlineData<MediaKeySession>
ParentClassToScriptWrappable;
or something like that.

If we think that it's granted that super class' hasPendingActivity() always
returns false, then we can remove this code.

[vivekg, 2015/10/16 06:59:33]

Done. Removed the code as it would always return false here.

         !m_pendingActions.isEmpty() ? " !m_pendingActions.isEmpty()" : "",
         m_asyncEventQueue->hasPendingEvents() ? " m_asyncEventQueue->hasPendingEvents()" : "",
         (m_mediaKeys && !m_isClosed) ? " m_mediaKeys && !m_isClosed" : "");
 
-    return ActiveDOMObject::hasPendingActivity()
+    return ScriptWrappable::hasPendingActivity()

[Yuki, 2015/10/16 06:43:15]

Ditto.

[vivekg, 2015/10/16 06:59:33]

Done.

         || !m_pendingActions.isEmpty()
         || m_asyncEventQueue->hasPendingEvents()
         || (m_mediaKeys && !m_isClosed);