Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp |
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp |
index c5483aa99d82f2885f28e13ed3f995d9d2e3966c..c00c1968d992da965f41af455b7746bfb77b698e 100644 |
--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp |
+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp |
@@ -89,7 +89,8 @@ MediaKeys* MediaKeys::create(ExecutionContext* context, const WebVector<WebEncry |
} |
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) |
@@ -254,12 +255,11 @@ void MediaKeys::contextDestroyed() |
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() |