third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp - 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: third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp

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.cc ('k') | third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h » ('j') | third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp

diff --git a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp

index 9d9704e7f80cb6c04c301c72264b4252b463f5e1..cdba71193f65b999c3ada6d10dd1d844f328d7a9 100644

--- a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp

+++ b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleResult.cpp

@@ -8,6 +8,11 @@

namespace blink {

+bool WebContentDecryptionModuleResult::isCompleted()

+ return m_impl.get();

void WebContentDecryptionModuleResult::complete()

{

m_impl->complete();

@@ -46,6 +51,7 @@ void WebContentDecryptionModuleResult::reset()

void WebContentDecryptionModuleResult::assign(const WebContentDecryptionModuleResult& o)

{

m_impl = o.m_impl;

+ ASSERT(m_impl.get());

}

} // namespace blink