aw: Avoid hold and wait deadlock

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 23 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.AwServiceWorkerController;
 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;
@@ skipping 18 matching lines @@
  * Entry point to the WebView. The system framework talks to this class to get instances of the
  * implementation classes.
  */
 @SuppressWarnings("deprecation")
 public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
     private static final String TAG = "WebViewChromiumFactoryProvider";
 
     private static final String CHROMIUM_PREFS_NAME = "WebViewChromiumPrefs";
     private static final String VERSION_CODE_PREF = "lastVersionCodeUsed";
     private static final String COMMAND_LINE_FILE = "/data/local/tmp/webview-command-line";
+    private static final String HTTP_AUTH_DATABASE_FILE = "http_auth.db";
 
     private class WebViewChromiumRunQueue {
         public WebViewChromiumRunQueue() {
             mQueue = new ConcurrentLinkedQueue<Runnable>();
         }
 
         public void addTask(Runnable task) {
             mQueue.add(task);
             if (WebViewChromiumFactoryProvider.this.hasStarted()) {
                 ThreadUtils.runOnUiThread(new Runnable() {
@@ skipping 308 matching lines @@
         }
 
         TraceEvent.setATraceEnabled(mWebViewDelegate.isTraceTagEnabled());
         mWebViewDelegate.setOnTraceEnabledChangeListener(
                 new WebViewDelegate.OnTraceEnabledChangeListener() {
                     @Override
                     public void onTraceEnabledChange(boolean enabled) {
                         TraceEvent.setATraceEnabled(enabled);
                     }
                 });
+
+        // Initialize thread-unsafe singletons.
+        AwBrowserContext awBrowserContext = getBrowserContextOnUiThread();
+        mGeolocationPermissions = new GeolocationPermissionsAdapter(
+                this, awBrowserContext.getGeolocationPermissions());
+        mWebStorage = new WebStorageAdapter(this, AwQuotaManagerBridge.getInstance());
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
+            mServiceWorkerController = new ServiceWorkerControllerAdapter(
+                    awBrowserContext.getServiceWorkerController());
+        }
+
         mStarted = true;
         mRunQueue.drainQueue();
     }
 
     boolean hasStarted() {
         return mStarted;
     }
 
     void startYourEngines(boolean onMainThread) {
         synchronized (mLock) {
@@ skipping 121 matching lines @@
             // Ignore this exception and return false.
         }
         return false;
     }
 
     @Override
     public GeolocationPermissions getGeolocationPermissions() {
         synchronized (mLock) {
             if (mGeolocationPermissions == null) {
                 ensureChromiumStartedLocked(true);
-                AwGeolocationPermissions awGelocationPermissions = ThreadUtils.runningOnUiThread()
-                        ? getBrowserContextOnUiThread().getGeolocationPermissions()
-                        : runOnUiThreadBlocking(new Callable<AwGeolocationPermissions>() {
-                            @Override
-                            public AwGeolocationPermissions call() {
-                                return getBrowserContextOnUiThread().getGeolocationPermissions();
-                            }
-                        });
-                mGeolocationPermissions =
-                        new GeolocationPermissionsAdapter(this, awGelocationPermissions);
             }
         }
         return mGeolocationPermissions;
     }
 
     @Override
     public CookieManager getCookieManager() {
         synchronized (mLock) {
             if (mCookieManager == null) {
                 mCookieManager = new CookieManagerAdapter(new AwCookieManager());
             }
         }
         return mCookieManager;
     }
 
     @Override
     public ServiceWorkerController getServiceWorkerController() {
         synchronized (mLock) {
             if (mServiceWorkerController == null) {
                 ensureChromiumStartedLocked(true);
-                AwServiceWorkerController awServiceWorkerController =
-                        ThreadUtils.runningOnUiThread()
-                        ? getBrowserContextOnUiThread().getServiceWorkerController()
-                        : runOnUiThreadBlocking(new Callable<AwServiceWorkerController>() {
-                            @Override
-                            public AwServiceWorkerController call() {
-                                return getBrowserContextOnUiThread().getServiceWorkerController();
-                            }
-                        });
-                mServiceWorkerController =
-                        new ServiceWorkerControllerAdapter(awServiceWorkerController);
             }
         }
         return (ServiceWorkerController) mServiceWorkerController;
     }
 
     public TokenBindingService getTokenBindingService() {
        synchronized (mLock) {
             if (mTokenBindingManager == null) {
                 mTokenBindingManager = new TokenBindingManagerAdapter(this);
             }
@@ skipping 10 matching lines @@
             }
         }
         return mWebIconDatabase;
     }
 
     @Override
     public WebStorage getWebStorage() {
         synchronized (mLock) {
             if (mWebStorage == null) {
                 ensureChromiumStartedLocked(true);
-                AwQuotaManagerBridge awQuotaManager = ThreadUtils.runningOnUiThread()
-                        ? AwQuotaManagerBridge.getInstance()
-                        : runOnUiThreadBlocking(new Callable<AwQuotaManagerBridge>() {
-                            @Override
-                            public AwQuotaManagerBridge call() {
-                                return AwQuotaManagerBridge.getInstance();
-                            }
-                        });
-                mWebStorage = new WebStorageAdapter(this, awQuotaManager);
             }
         }
         return mWebStorage;
     }
 
     @Override
     public WebViewDatabase getWebViewDatabase(final Context context) {
         synchronized (mLock) {
             if (mWebViewDatabase == null) {
                 ensureChromiumStartedLocked(true);
-                HttpAuthDatabase awDatabase = ThreadUtils.runningOnUiThread()
-                        ? getBrowserContextOnUiThread().getHttpAuthDatabase(context)
-                        : runOnUiThreadBlocking(new Callable<HttpAuthDatabase>() {
-                            @Override
-                            public HttpAuthDatabase call() {
-                                return getBrowserContextOnUiThread().getHttpAuthDatabase(context);
-                            }
-                        });
-                mWebViewDatabase = new WebViewDatabaseAdapter(this, awDatabase);
+                mWebViewDatabase = new WebViewDatabaseAdapter(
+                        this, HttpAuthDatabase.newInstance(context, HTTP_AUTH_DATABASE_FILE));
             }
         }
         return mWebViewDatabase;
     }
 
     WebViewDelegate getWebViewDelegate() {
         return mWebViewDelegate;
     }
 }