Source/modules/encryptedmedia/MediaKeys.cpp - Issue 687533004: Simplify use of ContentDecryptionModuleResult with promises

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: Source/modules/encryptedmedia/MediaKeys.cpp

Issue 687533004: Simplify use of ContentDecryptionModuleResult with promises (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Changes Created 6 years, 1 month 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 | « Source/modules/encryptedmedia/MediaKeySession.cpp ('k') | Source/modules/encryptedmedia/SimpleContentDecryptionModuleResult.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/encryptedmedia/MediaKeys.cpp

diff --git a/Source/modules/encryptedmedia/MediaKeys.cpp b/Source/modules/encryptedmedia/MediaKeys.cpp

index 884a03e6d67c9abcfbd1121022634b7fe07d69d8..ff72b20295837f231f08ee648dc4c0b9ba3d0138 100644

--- a/Source/modules/encryptedmedia/MediaKeys.cpp

+++ b/Source/modules/encryptedmedia/MediaKeys.cpp

@@ -33,7 +33,7 @@

#include "core/dom/ExceptionCode.h"

#include "core/dom/ExecutionContext.h"

#include "modules/encryptedmedia/MediaKeySession.h"

-#include "modules/encryptedmedia/SimpleContentDecryptionModuleResult.h"

+#include "modules/encryptedmedia/SimpleContentDecryptionModuleResultPromise.h"

#include "platform/ContentType.h"

#include "platform/Logging.h"

#include "platform/MIMETypeRegistry.h"

@@ -165,7 +165,7 @@ ScriptPromise MediaKeys::setServerCertificateInternal(ScriptState* scriptState,

// (Done in caller.)

// 4. Let promise be a new promise.

- SimpleContentDecryptionModuleResult* result = new SimpleContentDecryptionModuleResult(scriptState);

+ SimpleContentDecryptionModuleResultPromise* result = new SimpleContentDecryptionModuleResultPromise(scriptState);

ScriptPromise promise = result->promise();

// 5. Run the following steps asynchronously (documented in timerFired()).