media/mojo/services/mojo_cdm_promise.cc - Issue 1729063003: media: Reject pending CDM promise during destruction.

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: media/mojo/services/mojo_cdm_promise.cc

Issue 1729063003: media: Reject pending CDM promise during destruction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: comments addressed Created 4 years, 10 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

« media/base/cdm_promise.h ('K') | « media/mojo/services/mojo_cdm_promise.h ('k') | third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp » ('j') | third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/mojo/services/mojo_cdm_promise.cc

diff --git a/media/mojo/services/mojo_cdm_promise.cc b/media/mojo/services/mojo_cdm_promise.cc

index 25131b2115a3bcb27f4baca3cdcb21c1fcb86e52..ab699a218a491e10301255b5747d51ef020291e7 100644

--- a/media/mojo/services/mojo_cdm_promise.cc

+++ b/media/mojo/services/mojo_cdm_promise.cc

@@ -37,8 +37,11 @@ MojoCdmPromise<T...>::MojoCdmPromise(const CallbackType& callback)

template <typename... T>

MojoCdmPromise<T...>::~MojoCdmPromise() {

- if (!callback_.is_null())

- DVLOG(1) << "Promise not resolved before destruction.";

+ if (IsPromiseSettled())

+ return;

+ DCHECK(!callback_.is_null());

+ RejectPromiseOnDestruction();

}

template <typename... T>