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

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

Issue 1133713008: [WIP] Migrate hasPendingActivity from ActiveDOMObject to ScriptWrappable. Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 2 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/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()" : "",
!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()
|| !m_pendingActions.isEmpty()
|| m_asyncEventQueue->hasPendingEvents()
|| (m_mediaKeys && !m_isClosed);

Powered by Google App Engine
This is Rietveld 408576698