permissions: remove duplicates from request multiple at the Blink level

third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp

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..51184bd5e2dece1a6f277084d68d2c4428d0e357 100644
--- a/third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp
+++ b/third_party/WebKit/Source/modules/permissions/PermissionsCallback.cpp
@@ -10,26 +10,26 @@
 
 namespace blink {
 
-PermissionsCallback::PermissionsCallback(ScriptPromiseResolver* resolver, PassOwnPtr<WebVector<WebPermissionType>> permission_types)
+PermissionsCallback::PermissionsCallback(ScriptPromiseResolver* resolver, PassOwnPtr<Vector<WebPermissionType>> requestedPermissions, PassOwnPtr<Vector<int>> indexToCannonicalIndex)
     : m_resolver(resolver),
-    m_permissionTypes(permission_types)
+    m_requestedPermissions(requestedPermissions),
+    m_indexToCannonicalIndex(indexToCannonicalIndex)
 {
     ASSERT(m_resolver);
 }
 
-void PermissionsCallback::onSuccess(WebPassOwnPtr<WebVector<WebPermissionStatus>> permissionStatus)
+void PermissionsCallback::onSuccess(WebPassOwnPtr<WebVector<WebPermissionStatus>> result)

[mlamouri (slow - plz ping), 2015/09/29 13:25:35]

Could you keep the |permissionStatus| as a name here?

[Lalit Maganti, 2015/09/29 14:51:50]

Done.

 {
     if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
         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);
+    OwnPtr<WebVector<WebPermissionStatus>> statusPtr = result.release();
+    Vector<PermissionStatus*> finalResult(m_indexToCannonicalIndex->size());

[mlamouri (slow - plz ping), 2015/09/29 13:25:35]

Rename this |result|.

[Lalit Maganti, 2015/09/29 14:51:50]

Done.

+    for (size_t i = 0; i < m_indexToCannonicalIndex->size(); ++i) {
+        int cannonicalIndex = m_indexToCannonicalIndex->operator[](i);
+        finalResult[i] = PermissionStatus::createAndListen(m_resolver->executionContext(), statusPtr->operator[](cannonicalIndex), m_requestedPermissions->operator[](cannonicalIndex));
+    }
+    m_resolver->resolve(finalResult);
 }
 
 void PermissionsCallback::onError()