renderer: implement multiple permission requesting

content/child/permissions/permission_dispatcher.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_
 #define CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
@@ skipping 25 matching lines @@
   explicit PermissionDispatcher(ServiceRegistry* service_registry);
   virtual ~PermissionDispatcher();
 
   // blink::WebPermissionClient implementation.
   virtual void queryPermission(blink::WebPermissionType type,
                                const blink::WebURL& origin,
                                blink::WebPermissionCallback* callback);
   virtual void requestPermission(blink::WebPermissionType,
                                  const blink::WebURL& origin,
                                  blink::WebPermissionCallback* callback);
+  virtual void requestPermissions(
+      const blink::WebVector<blink::WebPermissionType>& types,
+      const blink::WebURL& origin,
+      blink::WebPermissionsCallback* callback);
   virtual void revokePermission(blink::WebPermissionType,
                                 const blink::WebURL& origin,
                                 blink::WebPermissionCallback* callback);
   virtual void startListening(blink::WebPermissionType type,
                               const blink::WebURL& origin,
                               blink::WebPermissionObserver* observer);
   virtual void stopListening(blink::WebPermissionObserver* observer);
 
   // The following methods must be called by workers on the main thread.
   void QueryPermissionForWorker(blink::WebPermissionType type,
                                 const std::string& origin,
                                 blink::WebPermissionCallback* callback,
                                 int worker_thread_id);
   void RequestPermissionForWorker(blink::WebPermissionType type,
                                   const std::string& origin,
                                   blink::WebPermissionCallback* callback,
                                   int worker_thread_id);
+  void RequestPermissionsForWorker(
+      const blink::WebVector<blink::WebPermissionType>& types,
+      const std::string& origin,
+      blink::WebPermissionsCallback* callback,
+      int worker_thread_id);
   void RevokePermissionForWorker(blink::WebPermissionType type,
                                  const std::string& origin,
                                  blink::WebPermissionCallback* callback,
                                  int worker_thread_id);
   void StartListeningForWorker(
       blink::WebPermissionType type,
       const std::string& origin,
       int worker_thread_id,
       const base::Callback<void(blink::WebPermissionStatus)>& callback);
   void GetNextPermissionChangeForWorker(
       blink::WebPermissionType type,
       const std::string& origin,
       blink::WebPermissionStatus status,
       int worker_thread_id,
       const base::Callback<void(blink::WebPermissionStatus)>& callback);
 
  private:
    using PendingCallbackMap =
       base::ScopedPtrHashMap<uintptr_t,
           scoped_ptr<blink::WebPermissionCallback>>;
+   using PendingBatchCallbackMap =

[mlamouri (slow - plz ping), 2015/09/02 11:36:41]

Name-wise, what about: PermissionCallbackMap and PermissionsCallbackMap. Again,
the 's' is subtle but maybe the type will help.

[Lalit Maganti, 2015/09/02 14:24:50]

Done.

+      base::ScopedPtrHashMap<uintptr_t,
+          scoped_ptr<blink::WebPermissionsCallback>>;
 
   // Runs the given |callback| with |status| as a parameter. It has to be run
   // on a worker thread.
   static void RunCallbackOnWorkerThread(

[mlamouri (slow - plz ping), 2015/09/02 11:36:41]

Rename to RunPermissionCallbackOnWorkerThread?

[Lalit Maganti, 2015/09/02 14:24:50]

Done.

       blink::WebPermissionCallback* callback,
       scoped_ptr<blink::WebPermissionStatus> status);
+  static void RunMultiCallbackOnWorkerThread(

[mlamouri (slow - plz ping), 2015/09/02 11:36:41]

RunPermissionsCallbackOnWorkerThread?

[Lalit Maganti, 2015/09/02 14:24:50]

Done.

+      blink::WebPermissionsCallback* callback,
+      scoped_ptr<blink::WebVector<blink::WebPermissionStatus>> statuses);
 
   // Helper method that returns an initialized PermissionServicePtr.
   PermissionServicePtr& GetPermissionServicePtr();
 
   void QueryPermissionInternal(blink::WebPermissionType type,
                                const std::string& origin,
                                blink::WebPermissionCallback* callback,
                                int worker_thread_id);
   void RequestPermissionInternal(blink::WebPermissionType type,
                                 const std::string& origin,
                                 blink::WebPermissionCallback* callback,
                                 int worker_thread_id);
+  void RequestPermissionsInternal(
+      const blink::WebVector<blink::WebPermissionType>& types,
+      const std::string& origin,
+      blink::WebPermissionsCallback* callback,
+      int worker_thread_id);
   void RevokePermissionInternal(blink::WebPermissionType type,
                                 const std::string& origin,
                                 blink::WebPermissionCallback* callback,
                                 int worker_thread_id);
 
   // This is the callback function used for query, request and revoke.
   void OnPermissionResponse(int worker_thread_id,
                             uintptr_t callback_key,
                             PermissionStatus status);
+  void OnPermissionsResponse(int worker_thread_id,

[mlamouri (slow - plz ping), 2015/09/02 11:36:41]

Rename OnRequestPermissionsResponse()

[Lalit Maganti, 2015/09/02 14:24:50]

Done.

+                             uintptr_t callback_key,
+                             const mojo::Array<PermissionStatus>& status);
   void OnPermissionChanged(blink::WebPermissionType type,
                            const std::string& origin,
                            blink::WebPermissionObserver* observer,
                            PermissionStatus status);
   void OnPermissionChangedForWorker(
       int worker_thread_id,
       const base::Callback<void(blink::WebPermissionStatus)>& callback,
       PermissionStatus status);
 
   void GetNextPermissionChange(blink::WebPermissionType type,
                                const std::string& origin,
                                blink::WebPermissionObserver* observer,
                                PermissionStatus current_status);
 
   PendingCallbackMap pending_callbacks_;
+  PendingBatchCallbackMap batch_pending_callbacks_;

[mlamouri (slow - plz ping), 2015/09/02 11:36:41]

// Pending callbacks for query(), revoke() and request() single permission.
PermissionCallbackMap permission_callbacks_;

// Pending callbacks for request() multiple permissions.
PermissionsCallbackMap permissions_callback_;

(You can also rename all that PendingPermissionCallbacks and
PendingPermissionsCallbacks. It might be slightly better?)

[Lalit Maganti, 2015/09/02 14:24:50]

Done.

 
   ServiceRegistry* service_registry_;
   PermissionServicePtr permission_service_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionDispatcher);
 };
 
 }  // namespace content
 
 #endif // CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_