Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(768)

Unified Diff: third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp

Issue 1360023005: permissions: remove duplicates from request multiple at the Blink level (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor-permissions
Patch Set: Address review comments Created 5 years, 3 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
Index: third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp
diff --git a/third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp b/third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp
index 1ea7d2c1f76064209ff43d4722b6faaa29a4f226..901523afb7383296d9a1cfb2539a4618074a3d9e 100644
--- a/third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp
+++ b/third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp
@@ -10,9 +10,10 @@
namespace blink {
-PermissionsCallback::PermissionsCallback(ScriptPromiseResolver* resolver, PassOwnPtr<WebVector<WebPermissionType>> permission_types)
+PermissionsCallback::PermissionsCallback(ScriptPromiseResolver* resolver, PassOwnPtr<Vector<WebPermissionType>> internalPermissions, PassOwnPtr<Vector<int>> callerIndexToInternalIndex)
: m_resolver(resolver),
- m_permissionTypes(permission_types)
+ m_internalPermissions(internalPermissions),
+ m_callerIndexToInternalIndex(callerIndexToInternalIndex)
{
ASSERT(m_resolver);
}
@@ -23,13 +24,12 @@ void PermissionsCallback::onSuccess(WebPassOwnPtr<WebVector<WebPermissionStatus>
return;
OwnPtr<WebVector<WebPermissionStatus>> statusPtr = permissionStatus.release();
-
- Vector<PermissionStatus*> status;
- status.reserveCapacity(statusPtr->size());
- for (size_t i = 0; i < statusPtr->size(); ++i)
- status.append(PermissionStatus::createAndListen(m_resolver->executionContext(), (*statusPtr)[i], (*m_permissionTypes)[i]));
-
- m_resolver->resolve(status);
+ Vector<PermissionStatus*> result(m_callerIndexToInternalIndex->size());
mlamouri (slow - plz ping) 2015/09/29 18:00:07 nit: need comments
Lalit Maganti 2015/10/02 13:57:25 Done.
+ for (size_t i = 0; i < m_callerIndexToInternalIndex->size(); ++i) {
+ int internalIndex = m_callerIndexToInternalIndex->operator[](i);
+ result[i] = PermissionStatus::createAndListen(m_resolver->executionContext(), statusPtr->operator[](internalIndex), m_internalPermissions->operator[](internalIndex));
+ }
+ m_resolver->resolve(result);
}
void PermissionsCallback::onError()

Powered by Google App Engine
This is Rietveld 408576698