third_party/WebKit/Source/modules/permissions/Permissions.cpp - Issue 2228663002: Mojo C++ bindings: make permissions service use STL string/vector types

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/permissions/Permissions.cpp

Issue 2228663002: Mojo C++ bindings: make permissions service use STL string/vector types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « third_party/WebKit/Source/modules/permissions/Permissions.h ('k') | third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/permissions/Permissions.cpp

diff --git a/third_party/WebKit/Source/modules/permissions/Permissions.cpp b/third_party/WebKit/Source/modules/permissions/Permissions.cpp

index 69d0caeeb51ec8ccec11f44974a56555d86f9d82..6946f3e813c5a116aeb95c76d15df3a058644771 100644

--- a/third_party/WebKit/Source/modules/permissions/Permissions.cpp

+++ b/third_party/WebKit/Source/modules/permissions/Permissions.cpp

@@ -213,9 +213,8 @@ ScriptPromise Permissions::requestAll(ScriptState* scriptState, const Vector<Dic

ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);

ScriptPromise promise = resolver->promise();

- Vector<PermissionName> internalPermissionsCopy(internalPermissions);

- service->RequestPermissions(std::move(internalPermissions), scriptState->getExecutionContext()->getSecurityOrigin()->toString(), UserGestureIndicator::processingUserGesture(),

- convertToBaseCallback(WTF::bind(&Permissions::batchTaskComplete, wrapPersistent(this), wrapPersistent(resolver), std::move(internalPermissionsCopy), std::move(callerIndexToInternalIndex))));

+ service->RequestPermissions(internalPermissions, scriptState->getExecutionContext()->getSecurityOrigin()->toString(), UserGestureIndicator::processingUserGesture(),

+ convertToBaseCallback(WTF::bind(&Permissions::batchTaskComplete, wrapPersistent(this), wrapPersistent(resolver), internalPermissions, callerIndexToInternalIndex)));

return promise;

}

@@ -238,7 +237,7 @@ void Permissions::taskComplete(ScriptPromiseResolver* resolver, PermissionName n

resolver->resolve(PermissionStatus::take(resolver, result, name));

}

-void Permissions::batchTaskComplete(ScriptPromiseResolver* resolver, Vector<PermissionName> names, Vector<int> callerIndexToInternalIndex, mojo::WTFArray<mojom::blink::PermissionStatus> results)

+void Permissions::batchTaskComplete(ScriptPromiseResolver* resolver, Vector<PermissionName> names, Vector<int> callerIndexToInternalIndex, const Vector<mojom::blink::PermissionStatus>& results)

{

if (!resolver->getExecutionContext() || resolver->getExecutionContext()->activeDOMObjectsAreStopped())

return;