Implement PreauthorizePermission

android_webview/native/permission/permission_request_handler.cc

Index: android_webview/native/permission/permission_request_handler.cc
diff --git a/android_webview/native/permission/permission_request_handler.cc b/android_webview/native/permission/permission_request_handler.cc
index 08b7431b4934dc0664c59c0d71fb98703f9da635..da9b75bb09998ad66b3d9733d0f1bd192393c5de 100644
--- a/android_webview/native/permission/permission_request_handler.cc
+++ b/android_webview/native/permission/permission_request_handler.cc
@@ -26,6 +26,11 @@ PermissionRequestHandler::~PermissionRequestHandler() {
 
 void PermissionRequestHandler::SendRequest(
     scoped_ptr<AwPermissionRequestDelegate> request) {
+  if (Preauthorized(request->GetOrigin(), request->GetResources())) {
+    request->NotifyRequestResult(true);
+    return;
+  }

[michaelbai, 2014/05/06 23:09:50]

Note, the all resources will passed to permission callback even if requested
resources are partially preauthorized,  

+
   AwPermissionRequest* aw_request = new AwPermissionRequest(request.Pass());
   requests_.push_back(
       base::WeakPtr<AwPermissionRequest>(aw_request->GetWeakPtr()));
@@ -45,6 +50,18 @@ void PermissionRequestHandler::CancelRequest(const GURL& origin,
   }
 }
 
+void PermissionRequestHandler::PreauthorizePermission(const GURL& origin,
+                                                      int64 resources) {
+  if (!resources)
+    return;
+
+  std::string key = origin.GetOrigin().spec();
+  if (key.empty())

[mkosiba (inactive), 2014/05/07 17:25:50]

ok, so if we get here the user managed to create a Uri that GURL doesn't like. I
think we should LOG(ERROR). Experience shows that silently dropping things on
the floor leads to very unhappy developers.

[michaelbai, 2014/05/07 19:22:25]

Done.

+    return;
+
+  preauthorized_permission_[key] |= resources;

[benm (inactive), 2014/05/07 17:01:21]

I think you need to initialise this mapped value in the case that they key
doesn't exist yet?

[michaelbai, 2014/05/07 19:22:25]

In this case, the default value is 0, we can use it directly.

On 2014/05/07 17:01:21, benm wrote:

+}
+
 PermissionRequestHandler::RequestIterator
 PermissionRequestHandler::FindRequest(const GURL& origin,
                                       int64 resources) {
@@ -77,4 +94,11 @@ void PermissionRequestHandler::PruneRequests() {
   }
 }
 
+bool PermissionRequestHandler::Preauthorized(const GURL& origin,
+                                              int64 resources) {
+  std::map<std::string, int64>::iterator i =
+      preauthorized_permission_.find(origin.GetOrigin().spec());

[mkosiba (inactive), 2014/05/07 17:25:50]

I'm paranoid so I'd suggest doing the same thing you do in line 58:

std::string key = ...
if (key.empty())
  return false;

[michaelbai, 2014/05/07 19:22:25]

I would like to make you happy, but I need to check whether the value is found
anyway, I'd prefer not to check key here :)


On 2014/05/07 17:25:50, mkosiba wrote:

+  return (resources & i->second) == resources;

[mkosiba (inactive), 2014/05/07 17:25:50]

what if we don't find the origin in the map? you'll reference uninitialized
memory

[michaelbai, 2014/05/07 19:22:25]

Oops, I were checking it there, it was removed with log by accident.


On 2014/05/07 17:25:50, mkosiba wrote:

+}
+
 }  // namespace android_webivew