third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp - Issue 2606633002: encrypted-media tests should not count # of SuspendableObjects

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/MediaKeySession.cpp

Issue 2606633002: encrypted-media tests should not count # of SuspendableObjects (Closed)

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

« no previous file with comments | « third_party/WebKit/Source/core/testing/Internals.idl ('k') | third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 81fe9241a13a6718febd46f3bc889d39ff60b8b8..69f525fa0372a58181cfa919ac191be62ff1574d 100644

--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

@@ -40,6 +40,7 @@

#include "modules/encryptedmedia/MediaKeyMessageEvent.h"

#include "modules/encryptedmedia/MediaKeys.h"

#include "platform/ContentDecryptionModuleResult.h"

+#include "platform/InstanceCounters.h"

#include "platform/Timer.h"

#include "platform/network/mime/ContentType.h"

#include "public/platform/WebContentDecryptionModule.h"

@@ -378,6 +379,7 @@ MediaKeySession::MediaKeySession(ScriptState* scriptState,

ClosedPromise::Closed)),

m_actionTimer(this, &MediaKeySession::actionTimerFired) {

DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")";

+ InstanceCounters::incrementCounter(InstanceCounters::MediaKeySessionCounter);

// Create the matching Chromium object. It will not be usable until

// initializeNewSession() is called in response to the user calling

@@ -419,6 +421,7 @@ MediaKeySession::MediaKeySession(ScriptState* scriptState,

MediaKeySession::~MediaKeySession() {

DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")";

+ InstanceCounters::decrementCounter(InstanceCounters::MediaKeySessionCounter);

}

void MediaKeySession::dispose() {