Source/modules/crypto/SubtleCrypto.cpp - Issue 1228373006: Reliably cancel in-progress CryptoResult(Impl) upon shutdown.

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/crypto/SubtleCrypto.cpp

Issue 1228373006: Reliably cancel in-progress CryptoResult(Impl) upon shutdown. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Separate out cancellation handling (+rebase) Created 5 years, 5 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

« Source/modules/crypto/CryptoResultImpl.cpp ('K') | « Source/modules/crypto/CryptoResultImpl.cpp ('k') | Source/platform/CryptoResult.h » ('j') | Source/platform/exported/WebCryptoResult.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/crypto/SubtleCrypto.cpp

diff --git a/Source/modules/crypto/SubtleCrypto.cpp b/Source/modules/crypto/SubtleCrypto.cpp

index c6aa37a15f422b91a572acbfa362c2c36aebb1ae..554d6adb6af57f7d94c6d4f0bea7f8bbd3971bdc 100644

--- a/Source/modules/crypto/SubtleCrypto.cpp

+++ b/Source/modules/crypto/SubtleCrypto.cpp

@@ -395,7 +395,7 @@ ScriptPromise SubtleCrypto::deriveBits(ScriptState* scriptState, const Algorithm

ScriptPromise SubtleCrypto::deriveKey(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* baseKey, const AlgorithmIdentifier& rawDerivedKeyType, bool extractable, const Vector<String>& rawKeyUsages)

{

- RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);

+ RefPtrWillBeRawPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);

ScriptPromise promise = result->promise();

if (!canAccessWebCrypto(scriptState, result.get()))