[WIP] Migrate hasPendingActivity from ActiveDOMObject to ScriptWrappable.

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 879 matching lines @@
 ExecutionContext* MediaKeySession::executionContext() const
 {
     return ActiveDOMObject::executionContext();
 }
 
 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);
 }
 
 void MediaKeySession::stop()
 {
     // Stop the CDM from firing any more events for this session.
     m_session.clear();
     m_isClosed = true;
 
     if (m_actionTimer.isActive())
         m_actionTimer.stop();
     m_pendingActions.clear();
     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);
     RefCountedGarbageCollectedEventTargetWithInlineData<MediaKeySession>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink