Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp

Issue 1805843002: [v8 gc] Introduce a base class for all objects that can have pending activity (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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()

Powered by Google App Engine
This is Rietveld 408576698