Android WebView: post QuotaManager calls to UI thread.

android_webview/native/aw_quota_manager_bridge_impl.cc

 // Copyright (c) 2013 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.
 
 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
 
 #include <set>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "base/synchronization/waitable_event.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
 #include "jni/AwQuotaManagerBridge_jni.h"
 #include "url/gurl.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/common/quota/quota_types.h"
 
 using base::android::AttachCurrentThread;
 using content::BrowserThread;
@@ skipping 111 matching lines @@
     NOTREACHED();
   }
 }
 
 // This method is to avoid copying the 3 vector arguments into a bound callback.
 void GetOriginsTask::DoneOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ui_callback_.Run(origin_, usage_, quota_);
 }
 
+void RunOnUIThread(const base::Closure& task) {
+  if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
+    task.Run();
+  } else {
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, task);
+  }
+}
+
 }  // namespace
 
 
 // static
 jint GetDefaultNativeAwQuotaManagerBridge(JNIEnv* env, jclass clazz) {
   AwBrowserContext* browser_context =
       AwContentBrowserClient::GetAwBrowserContext();
 
   AwQuotaManagerBridgeImpl* bridge = static_cast<AwQuotaManagerBridgeImpl*>(
       browser_context->GetQuotaManagerBridge());
   DCHECK(bridge);
   return reinterpret_cast<jint>(bridge);
 }
 
+// static
+scoped_refptr<AwQuotaManagerBridge> AwQuotaManagerBridgeImpl::Create(
+    AwBrowserContext* browser_context) {
+  return new AwQuotaManagerBridgeImpl(browser_context);
+}
+
 AwQuotaManagerBridgeImpl::AwQuotaManagerBridgeImpl(
     AwBrowserContext* browser_context)
     : weak_factory_(this),
       browser_context_(browser_context) {
 }
 
 AwQuotaManagerBridgeImpl::~AwQuotaManagerBridgeImpl() {}
 
 void AwQuotaManagerBridgeImpl::Init(JNIEnv* env, jobject object) {
   java_ref_ = JavaObjectWeakGlobalRef(env, object);
@@ skipping 11 matching lines @@
 
 QuotaManager* AwQuotaManagerBridgeImpl::GetQuotaManager() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   QuotaManager* quota_manager = GetStoragePartition()->GetQuotaManager();
   DCHECK(quota_manager);
   return quota_manager;
 }
 
 void AwQuotaManagerBridgeImpl::DeleteAllData(JNIEnv* env, jobject object) {
+  RunOnUIThread(base::Bind(&AwQuotaManagerBridgeImpl::DeleteAllDataOnUiThread,
+                           this));
+}
+
+void AwQuotaManagerBridgeImpl::DeleteAllDataOnUiThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   GetStoragePartition()->ClearDataForUnboundedRange(
       // Clear all web storage data except cookies.
       StoragePartition::REMOVE_DATA_MASK_APPCACHE |
           StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
           StoragePartition::REMOVE_DATA_MASK_INDEXEDDB |
           StoragePartition::REMOVE_DATA_MASK_LOCAL_STORAGE |
           StoragePartition::REMOVE_DATA_MASK_WEBSQL,
       StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY);
 }
 
 void AwQuotaManagerBridgeImpl::DeleteOrigin(
     JNIEnv* env, jobject object, jstring origin) {
+  base::string16 origin_string(
+      base::android::ConvertJavaStringToUTF16(env, origin));
+  RunOnUIThread(base::Bind(&AwQuotaManagerBridgeImpl::DeleteOriginOnUiThread,
+                           this,
+                           origin_string));
+}
+
+void AwQuotaManagerBridgeImpl::DeleteOriginOnUiThread(
+    const base::string16& origin) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   StoragePartition* storage_partition = GetStoragePartition();
   storage_partition->ClearDataForOrigin(
       // All (temporary) QuotaClient types.
       StoragePartition::REMOVE_DATA_MASK_APPCACHE |
           StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
           StoragePartition::REMOVE_DATA_MASK_INDEXEDDB |
           StoragePartition::REMOVE_DATA_MASK_WEBSQL,
       StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY,
-      GURL(base::android::ConvertJavaStringToUTF16(env, origin)),
+      GURL(origin),
       storage_partition->GetURLRequestContext());
 }
 
 void AwQuotaManagerBridgeImpl::GetOrigins(
     JNIEnv* env, jobject object, jint callback_id) {
+  RunOnUIThread(base::Bind(&AwQuotaManagerBridgeImpl::GetOriginsOnUiThread,
+                           this,
+                           callback_id));
+}
+
+void AwQuotaManagerBridgeImpl::GetOriginsOnUiThread(jint callback_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const GetOriginsCallback ui_callback = base::Bind(
       &AwQuotaManagerBridgeImpl::GetOriginsCallbackImpl,
       weak_factory_.GetWeakPtr(),
       callback_id);
 
   (new GetOriginsTask(ui_callback, GetQuotaManager()))->Run();
 }
 
@@ skipping 35 matching lines @@
       base::Bind(ui_callback, usage, quota));
 }
 
 } // namespace
 
 void AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOrigin(
     JNIEnv* env, jobject object,
     jstring origin,
     jint callback_id,
     bool is_quota) {
+  base::string16 origin_string(
+      base::android::ConvertJavaStringToUTF16(env, origin));
+  RunOnUIThread(base::Bind(
+      &AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOriginOnUiThread,
+      this,
+      origin_string,
+      callback_id,
+      is_quota));
+}
+
+void AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOriginOnUiThread(
+    const base::string16& origin,
+    jint callback_id,
+    bool is_quota) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const QuotaUsageCallback ui_callback = base::Bind(
       &AwQuotaManagerBridgeImpl::QuotaUsageCallbackImpl,
       weak_factory_.GetWeakPtr(),
       callback_id,
       is_quota);
 
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&QuotaManager::GetUsageAndQuota,
                  GetQuotaManager(),
-                 GURL(base::android::ConvertJavaStringToUTF16(env, origin)),
+                 GURL(),

[benm (inactive), 2013/10/08 11:30:11]

origin?

[Torne, 2013/10/08 11:43:46]

Oops, added.

                  quota::kStorageTypeTemporary,
                  base::Bind(&OnUsageAndQuotaObtained, ui_callback)));
 }
 
 void AwQuotaManagerBridgeImpl::QuotaUsageCallbackImpl(
     int jcallback_id, bool is_quota, int64 usage, int64 quota) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
 
   Java_AwQuotaManagerBridge_onGetUsageAndQuotaForOriginCallback(
       env, obj.obj(), jcallback_id, is_quota, usage, quota);
 }
 
 bool RegisterAwQuotaManagerBridge(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace android_webview