third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp - Issue 1609343002: Move hasPendingActivity from ActiveDOMObject to ScriptWrappable

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1609343002: Move hasPendingActivity from ActiveDOMObject to ScriptWrappable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

« third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp ('K') | « third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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()