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 7c8122874bc03f512d8dac3e5f79159aefc0c9b0..c5483aa99d82f2885f28e13ed3f995d9d2e3966c 100644 |
--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp |
+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp |
@@ -255,11 +255,11 @@ bool MediaKeys::hasPendingActivity() const |
{ |
// Remain around if there are pending events. |
WTF_LOG(Media, "MediaKeys(%p)::hasPendingActivity %s%s%s", this, |
- ActiveDOMObject::hasPendingActivity() ? " ActiveDOMObject::hasPendingActivity()" : "", |
+ ScriptWrappable::hasPendingActivity() ? " ScriptWrappable::hasPendingActivity()" : "", |
!m_pendingActions.isEmpty() ? " !m_pendingActions.isEmpty()" : "", |
m_reservedForMediaElement ? " m_reservedForMediaElement" : ""); |
- return ActiveDOMObject::hasPendingActivity() || !m_pendingActions.isEmpty() || m_reservedForMediaElement; |
+ return ScriptWrappable::hasPendingActivity() || !m_pendingActions.isEmpty() || m_reservedForMediaElement; |
} |
void MediaKeys::stop() |