aw: Fix FactoryProvider threading

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

 // Copyright 2014 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.
 
 package com.android.webview.chromium;
 
 import android.Manifest;
 import android.app.ActivityManager;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
@@ skipping 18 matching lines @@
 
 import com.android.webview.chromium.WebViewDelegateFactory.WebViewDelegate;
 
 import org.chromium.android_webview.AwBrowserContext;
 import org.chromium.android_webview.AwBrowserProcess;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwContentsClient;
 import org.chromium.android_webview.AwContentsStatics;
 import org.chromium.android_webview.AwCookieManager;
 import org.chromium.android_webview.AwDevToolsServer;
+import org.chromium.android_webview.AwGeolocationPermissions;
 import org.chromium.android_webview.AwNetworkChangeNotifierRegistrationPolicy;
 import org.chromium.android_webview.AwQuotaManagerBridge;
 import org.chromium.android_webview.AwResource;
 import org.chromium.android_webview.AwSettings;
+import org.chromium.android_webview.HttpAuthDatabase;
 import org.chromium.android_webview.R;
 import org.chromium.android_webview.ResourcesContextWrapperFactory;
+import org.chromium.base.BuildConfig;
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.MemoryPressureListener;
 import org.chromium.base.PathService;
 import org.chromium.base.PathUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
@@ skipping 317 matching lines @@
     boolean hasStarted() {
         return mStarted;
     }
 
     void startYourEngines(boolean onMainThread) {
         synchronized (mLock) {
             ensureChromiumStartedLocked(onMainThread);
         }
     }
 
-    AwBrowserContext getBrowserContext() {
-        synchronized (mLock) {
-            return getBrowserContextLocked();
+    // Only on UI thread.
+    AwBrowserContext getBrowserContextOnUiThread() {
+        assert mStarted;
+        if (BuildConfig.DCHECK_IS_ON && !ThreadUtils.runningOnUiThread()) {
+            throw new RuntimeException(
+                    "getBrowserContextOnUiThread called on " + Thread.currentThread());
         }
-    }
 
-    private AwBrowserContext getBrowserContextLocked() {
-        assert Thread.holdsLock(mLock);
-        assert mStarted;
         if (mBrowserContext == null) {
             mBrowserContext =
                     new AwBrowserContext(mWebViewPrefs, ContextUtils.getApplicationContext());
         }
         return mBrowserContext;
     }
 
     private void setWebContentsDebuggingEnabled(boolean enable) {
         if (Looper.myLooper() != ThreadUtils.getUiThreadLooper()) {
             throw new RuntimeException(
@@ skipping 73 matching lines @@
     @Override
     public WebViewProvider createWebView(WebView webView, WebView.PrivateAccess privateAccess) {
         return new WebViewChromium(this, webView, privateAccess);
     }
 
     @Override
     public GeolocationPermissions getGeolocationPermissions() {
         synchronized (mLock) {
             if (mGeolocationPermissions == null) {
                 ensureChromiumStartedLocked(true);
-                mGeolocationPermissions = new GeolocationPermissionsAdapter(
-                        getBrowserContextLocked().getGeolocationPermissions());
+                AwGeolocationPermissions awGelocationPermissions = ThreadUtils.runningOnUiThread()
+                        ? getBrowserContextOnUiThread().getGeolocationPermissions()

[Torne, 2016/07/29 11:24:26]

minor thing: seems like it might be preferable to create the Callable and then
just call it immediately, so we don't duplicate the actual expression? not sure
that's really much better though.

[boliu, 2016/07/29 13:23:55]

I guess we don't do that in WebVIewChromium because we don't want to be creating
lots of callables/runnables if they are not needed. Even though that's less of a
problem here since these are singletons, I don't want to start a new pattern.

+                        : runOnUiThreadBlocking(new Callable<AwGeolocationPermissions>() {
+                            @Override
+                            public AwGeolocationPermissions call() {
+                                return getBrowserContextOnUiThread().getGeolocationPermissions();
+                            }
+                        });
+                mGeolocationPermissions =
+                        new GeolocationPermissionsAdapter(awGelocationPermissions);
             }
         }
         return mGeolocationPermissions;
     }
 
     @Override
     public CookieManager getCookieManager() {
         synchronized (mLock) {
             if (mCookieManager == null) {
                 mCookieManager = new CookieManagerAdapter(new AwCookieManager());
@@ skipping 11 matching lines @@
             }
         }
         return mWebIconDatabase;
     }
 
     @Override
     public WebStorage getWebStorage() {
         synchronized (mLock) {
             if (mWebStorage == null) {
                 ensureChromiumStartedLocked(true);
-                mWebStorage = new WebStorageAdapter(AwQuotaManagerBridge.getInstance());
+                AwQuotaManagerBridge awQuotaManager = ThreadUtils.runningOnUiThread()
+                        ? AwQuotaManagerBridge.getInstance()
+                        : runOnUiThreadBlocking(new Callable<AwQuotaManagerBridge>() {
+                            @Override
+                            public AwQuotaManagerBridge call() {
+                                return AwQuotaManagerBridge.getInstance();
+                            }
+                        });
+                mWebStorage = new WebStorageAdapter(awQuotaManager);
             }
         }
         return mWebStorage;
     }
 
     @Override
-    public WebViewDatabase getWebViewDatabase(Context context) {
+    public WebViewDatabase getWebViewDatabase(final Context context) {
         synchronized (mLock) {
             if (mWebViewDatabase == null) {
                 ensureChromiumStartedLocked(true);
-                AwBrowserContext browserContext = getBrowserContextLocked();
-                mWebViewDatabase = new WebViewDatabaseAdapter(
-                        browserContext.getHttpAuthDatabase(context));
+                HttpAuthDatabase awDatabase = ThreadUtils.runningOnUiThread()
+                        ? getBrowserContextOnUiThread().getHttpAuthDatabase(context)
+                        : runOnUiThreadBlocking(new Callable<HttpAuthDatabase>() {
+                            @Override
+                            public HttpAuthDatabase call() {
+                                return getBrowserContextOnUiThread().getHttpAuthDatabase(context);
+                            }
+                        });
+                mWebViewDatabase = new WebViewDatabaseAdapter(awDatabase);
             }
         }
         return mWebViewDatabase;
     }
 
     WebViewDelegate getWebViewDelegate() {
         return mWebViewDelegate;
     }
 }