[Android] Enable copy picture only in contenteditable

.gitignore

@@ -218,6 +218,7 @@ v8.log
 /net/Release
 /net/testserver.log
 /out*
+/ozone
 /ppapi/native_client/nacl_irt.xml
 /ppapi/native_client/ppapi_lib.xml
 /remoting/appengine/
@@ -312,6 +313,7 @@ v8.log
 /third_party/junit/src
 /third_party/kasko
 /third_party/khronos_glcts
+/third_party/khronos/CL
 /third_party/leveldatabase/src
 /third_party/leveldb
 /third_party/libaddressinput/src
@@ -383,6 +385,7 @@ v8.log
 /third_party/valgrind
 /third_party/v4l2capture
 /third_party/web-animations-js
+/third_party/webcl
 /third_party/webdriver/pylib
 /third_party/webdriver/python/selenium
 /third_party/webgl
@@ -434,3 +437,4 @@ v8.log
 /win8/metro_driver/metro_driver_version_resources.xml
 /x86-generic_out/
 /xcodebuild
+/xwalk

android_webview/apk/java/proguard.flags

@@ -99,3 +99,7 @@
 -keep class com.android.org.chromium.ui.ColorPickerMoreButton {
   <init>(...);
 }
+
+# Remove when ViewStructure is no longer duplicated (crbug.com/513229)
+-dontwarn android.view.*
+-dontwarn android.webkit.*

android_webview/browser/aw_permission_manager.cc

@@ -4,28 +4,163 @@
 
 #include "android_webview/browser/aw_permission_manager.h"
 
+#include <string>
+
 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
 #include "base/callback.h"
+#include "base/containers/hash_tables.h"
+#include "base/logging.h"
+#include "base/memory/weak_ptr.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
+using content::PermissionStatus;
+using content::PermissionType;
+
 namespace android_webview {
 
+class LastRequestResultCache {
+ public:
+  LastRequestResultCache() : weak_factory_(this) {}
+
+  void SetResult(PermissionType permission,
+                 const GURL& requesting_origin,
+                 const GURL& embedding_origin,
+                 PermissionStatus status) {
+    DCHECK(status == content::PERMISSION_STATUS_GRANTED ||
+           status == content::PERMISSION_STATUS_DENIED);
+
+    // TODO(ddorwin): We should be denying empty origins at a higher level.
+    if (requesting_origin.is_empty() || embedding_origin.is_empty()) {
+      DLOG(WARNING) << "Not caching result because of empty origin.";
+      return;
+    }
+
+    if (!requesting_origin.is_valid()) {
+      NOTREACHED() << requesting_origin.possibly_invalid_spec();
+      return;
+    }
+    if (!embedding_origin.is_valid()) {
+      NOTREACHED() << embedding_origin.possibly_invalid_spec();
+      return;
+    }
+
+    if (permission != PermissionType::PROTECTED_MEDIA_IDENTIFIER) {
+      // Other permissions are not cached.
+      return;
+    }
+
+    std::string key = GetCacheKey(requesting_origin, embedding_origin);
+    if (key.empty()) {
+      NOTREACHED();
+      // Never store an empty key because it could inadvertently be used for
+      // another combination.
+      return;
+    }
+    pmi_result_cache_[key] = status;
+  }
+
+  PermissionStatus GetResult(PermissionType permission,
+                             const GURL& requesting_origin,
+                             const GURL& embedding_origin) const {
+    // TODO(ddorwin): We should be denying empty origins at a higher level.
+    if (requesting_origin.is_empty() || embedding_origin.is_empty()) {
+      return content::PERMISSION_STATUS_ASK;
+    }
+
+    DCHECK(requesting_origin.is_valid())
+        << requesting_origin.possibly_invalid_spec();
+    DCHECK(embedding_origin.is_valid())
+        << embedding_origin.possibly_invalid_spec();
+
+    if (permission != PermissionType::PROTECTED_MEDIA_IDENTIFIER) {
+      NOTREACHED() << "Results are only cached for PROTECTED_MEDIA_IDENTIFIER";
+      return content::PERMISSION_STATUS_ASK;
+    }
+
+    std::string key = GetCacheKey(requesting_origin, embedding_origin);
+    StatusMap::const_iterator it = pmi_result_cache_.find(key);
+    if (it == pmi_result_cache_.end()) {
+      DLOG(WARNING) << "GetResult() called for uncached origins: " << key;
+      return content::PERMISSION_STATUS_ASK;
+    }
+
+    DCHECK(!key.empty());
+    return it->second;
+  }
+
+  void ClearResult(PermissionType permission,
+                   const GURL& requesting_origin,
+                   const GURL& embedding_origin) {
+    // TODO(ddorwin): We should be denying empty origins at a higher level.
+    if (requesting_origin.is_empty() || embedding_origin.is_empty()) {
+      return;
+    }
+
+    DCHECK(requesting_origin.is_valid())
+        << requesting_origin.possibly_invalid_spec();
+    DCHECK(embedding_origin.is_valid())
+        << embedding_origin.possibly_invalid_spec();
+
+
+    if (permission != PermissionType::PROTECTED_MEDIA_IDENTIFIER) {
+      // Other permissions are not cached, so nothing to clear.
+      return;
+    }
+
+    std::string key = GetCacheKey(requesting_origin, embedding_origin);
+    pmi_result_cache_.erase(key);
+  }
+
+  base::WeakPtr<LastRequestResultCache> GetWeakPtr() {
+    return weak_factory_.GetWeakPtr();
+  }
+
+ private:
+  // Returns a concatenation of the origins to be used as the index.
+  // Returns the empty string if either origin is invalid or empty.
+  static std::string GetCacheKey(const GURL& requesting_origin,
+                                 const GURL& embedding_origin) {
+    const std::string& requesting = requesting_origin.spec();
+    const std::string& embedding = embedding_origin.spec();
+    if (requesting.empty() || embedding.empty())
+      return std::string();
+    return requesting + "," + embedding;
+  }
+
+  using StatusMap = base::hash_map<std::string, PermissionStatus>;
+  StatusMap pmi_result_cache_;
+
+  base::WeakPtrFactory<LastRequestResultCache> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(LastRequestResultCache);
+};
+
 namespace {
 
 void CallbackPermisisonStatusWrapper(
+    const base::WeakPtr<LastRequestResultCache>& result_cache,
     const base::Callback<void(content::PermissionStatus)>& callback,
+    PermissionType permission,
+    const GURL& requesting_origin,
+    const GURL& embedding_origin,
     bool allowed) {
-  callback.Run(allowed ? content::PERMISSION_STATUS_GRANTED
-                       : content::PERMISSION_STATUS_DENIED);
+  PermissionStatus status = allowed ? content::PERMISSION_STATUS_GRANTED
+                                    : content::PERMISSION_STATUS_DENIED;
+  if (result_cache.get()) {
+    result_cache->SetResult(permission, requesting_origin, embedding_origin,
+                            status);
+  }
+
+  callback.Run(status);
 }
 
 }  // anonymous namespace
 
 AwPermissionManager::AwPermissionManager()
-    : content::PermissionManager() {
+    : content::PermissionManager(), result_cache_(new LastRequestResultCache) {
 }
 
 AwPermissionManager::~AwPermissionManager() {
@@ -50,14 +185,21 @@ void AwPermissionManager::RequestPermission(
     return;
   }
 
+  const GURL& embedding_origin =
+      web_contents->GetLastCommittedURL().GetOrigin();
+
   switch (permission) {
     case content::PermissionType::GEOLOCATION:
       delegate->RequestGeolocationPermission(
-          origin, base::Bind(&CallbackPermisisonStatusWrapper, callback));
+          origin, base::Bind(&CallbackPermisisonStatusWrapper,
+                             result_cache_->GetWeakPtr(), callback, permission,
+                             origin, embedding_origin));
       break;
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
       delegate->RequestProtectedMediaIdentifierPermission(
-          origin, base::Bind(&CallbackPermisisonStatusWrapper, callback));
+          origin, base::Bind(&CallbackPermisisonStatusWrapper,
+                             result_cache_->GetWeakPtr(), callback, permission,
+                             origin, embedding_origin));
       break;
     case content::PermissionType::MIDI_SYSEX:
     case content::PermissionType::NOTIFICATIONS:
@@ -78,6 +220,13 @@ void AwPermissionManager::CancelPermissionRequest(
     content::WebContents* web_contents,
     int request_id,
     const GURL& origin) {
+  // The caller is canceling (presumably) the most recent request. Assuming the
+  // request did not complete, the user did not respond to the requset.
+  // Thus, assume we do not know the result.
+  const GURL& embedding_origin =
+      web_contents->GetLastCommittedURL().GetOrigin();
+  result_cache_->ClearResult(permission, origin, embedding_origin);
+
   int render_process_id = web_contents->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
   AwBrowserPermissionRequestDelegate* delegate =
@@ -109,12 +258,19 @@ void AwPermissionManager::ResetPermission(
     content::PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
+  result_cache_->ClearResult(permission, requesting_origin, embedding_origin);
 }
 
 content::PermissionStatus AwPermissionManager::GetPermissionStatus(
     content::PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
+  // Method is called outside the Permissions API only for this permission.
+  if (permission == PermissionType::PROTECTED_MEDIA_IDENTIFIER) {
+    return result_cache_->GetResult(permission, requesting_origin,
+                                    embedding_origin);
+  }
+
   return content::PERMISSION_STATUS_DENIED;
 }
 

android_webview/browser/aw_permission_manager.h

@@ -7,10 +7,13 @@
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
 #include "content/public/browser/permission_manager.h"
 
 namespace android_webview {
 
+class LastRequestResultCache;
+
 class AwPermissionManager : public content::PermissionManager {
  public:
   AwPermissionManager();
@@ -46,6 +49,8 @@ class AwPermissionManager : public content::PermissionManager {
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
  private:
+  scoped_ptr<LastRequestResultCache> result_cache_;
+
   DISALLOW_COPY_AND_ASSIGN(AwPermissionManager);
 };
 

android_webview/browser/scoped_app_gl_state_restore.cc

@@ -297,8 +297,11 @@ ScopedAppGLStateRestoreImpl::ScopedAppGLStateRestoreImpl(
         i, GL_CURRENT_VERTEX_ATTRIB, vertex_attrib_[i].current_vertex_attrib);
   }
 
-  // Android 5.0.0 specific qualcomm workaround. See crbug.com/434570.
-  glBindRenderbufferEXT(GL_RENDERBUFFER, 0);
+  if (mode_ == ScopedAppGLStateRestore::MODE_RESOURCE_MANAGEMENT) {
+    // Android 5.0.0 specific qualcomm workaround. See crbug.com/434570.
+    glBindRenderbufferEXT(GL_RENDERBUFFER, 0);
+  }
+
   DCHECK(ClearGLErrors(false, NULL));
 }
 

android_webview/glue/java/src/com/android/webview/chromium/ResourceRewriter.java

@@ -6,20 +6,18 @@
 
 /**
  * Helper class used to fix up resource ids.
- * This is mostly a copy of the code in frameworks/base/core/java/android/app/LoadedApk.java.
- * TODO: Remove if a cleaner mechanism is provided (either public API or AAPT is changed to generate
- * this code).
  */
 class ResourceRewriter {
     /**
      * Rewrite the R 'constants' for the WebView library apk.
      */
     public static void rewriteRValues(final int packageId) {
-        // TODO: We should use jarjar to remove the redundant R classes here, but due
-        // to a bug in jarjar it's not possible to rename classes with '$' in their name.
-        // See b/15684775.
+        // This list must be kept up to date to include all R classes depended on directly or
+        // indirectly by android_webview_java.
+        // TODO(torne): find a better way to do this, http://crbug.com/492166.
         com.android.webview.chromium.R.onResourcesLoaded(packageId);
         org.chromium.android_webview.R.onResourcesLoaded(packageId);
+        org.chromium.components.web_contents_delegate_android.R.onResourcesLoaded(packageId);
         org.chromium.content.R.onResourcesLoaded(packageId);
         org.chromium.ui.R.onResourcesLoaded(packageId);
     }