Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1096)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

Issue 2182683003: aw: Move thread hop code to ProviderFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
index c496c9018427a3237d3beb03bc8cf9afd9a7c6fc..9061f62e480696a7f1ca3b8b720e4344154cf089 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
@@ -64,11 +64,7 @@ import java.io.BufferedWriter;
import java.io.File;
import java.lang.reflect.Method;
import java.util.Map;
-import java.util.Queue;
import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
/**
* This class is the delegate to which WebViewProxy forwards all API calls.
@@ -81,39 +77,6 @@ import java.util.concurrent.TimeUnit;
@SuppressWarnings("deprecation")
class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate,
WebViewProvider.ViewDelegate, SmartClipProvider {
- private class WebViewChromiumRunQueue {
- public WebViewChromiumRunQueue() {
- mQueue = new ConcurrentLinkedQueue<Runnable>();
- }
-
- public void addTask(Runnable task) {
- mQueue.add(task);
- if (mFactory.hasStarted()) {
- ThreadUtils.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- drainQueue();
- }
- });
- }
- }
-
- public void drainQueue() {
- if (mQueue == null || mQueue.isEmpty()) {
- return;
- }
-
- Runnable task = mQueue.poll();
- while (task != null) {
- task.run();
- task = mQueue.poll();
- }
- }
-
- private Queue<Runnable> mQueue;
- }
-
- private WebViewChromiumRunQueue mRunQueue;
private static final String TAG = WebViewChromium.class.getSimpleName();
@@ -154,7 +117,6 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
mContext = ResourcesContextWrapperFactory.get(mWebView.getContext());
mAppTargetSdkVersion = mContext.getApplicationInfo().targetSdkVersion;
mFactory = factory;
- mRunQueue = new WebViewChromiumRunQueue();
factory.getWebViewDelegate().addWebViewAssetPath(mWebView.getContext());
}
@@ -165,34 +127,6 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
parentContents.supplyContentsForPopup(childContents);
}
- private <T> T runBlockingFuture(FutureTask<T> task) {
- if (!mFactory.hasStarted()) throw new RuntimeException("Must be started before we block!");
- if (ThreadUtils.runningOnUiThread()) {
- throw new IllegalStateException("This method should only be called off the UI thread");
- }
- mRunQueue.addTask(task);
- try {
- return task.get(4, TimeUnit.SECONDS);
- } catch (java.util.concurrent.TimeoutException e) {
- throw new RuntimeException("Probable deadlock detected due to WebView API being called "
- + "on incorrect thread while the UI thread is blocked.", e);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- // We have a 4 second timeout to try to detect deadlocks to detect and aid in debuggin
- // deadlocks.
- // Do not call this method while on the UI thread!
- private void runVoidTaskOnUiThreadBlocking(Runnable r) {
- FutureTask<Void> task = new FutureTask<Void>(r, null);
- runBlockingFuture(task);
- }
-
- private <T> T runOnUiThreadBlocking(Callable<T> c) {
- return runBlockingFuture(new FutureTask<T>(c));
- }
-
// WebViewProvider methods --------------------------------------------------------------------
@Override
@@ -249,7 +183,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
mWebSettings.getAwSettings().setZeroLayoutHeightDisablesViewportQuirk(true);
}
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
initForReal();
@@ -288,10 +222,6 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
mAwContents.setLayerType(mWebView.getLayerType(), null);
}
- void startYourEngine() {
- mRunQueue.drainQueue();
- }
-
private RuntimeException createThreadException() {
return new IllegalStateException(
"Calling View methods on another thread than the UI thread.");
@@ -322,7 +252,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void setHorizontalScrollbarOverlay(final boolean overlay) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
setHorizontalScrollbarOverlay(overlay);
@@ -336,7 +266,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void setVerticalScrollbarOverlay(final boolean overlay) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
setVerticalScrollbarOverlay(overlay);
@@ -351,7 +281,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean overlayHorizontalScrollbar() {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return overlayHorizontalScrollbar();
@@ -366,7 +296,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean overlayVerticalScrollbar() {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return overlayVerticalScrollbar();
@@ -387,7 +317,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public SslCertificate getCertificate() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- SslCertificate ret = runOnUiThreadBlocking(new Callable<SslCertificate>() {
+ SslCertificate ret = mFactory.runOnUiThreadBlocking(new Callable<SslCertificate>() {
@Override
public SslCertificate call() {
return getCertificate();
@@ -412,7 +342,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public void setHttpAuthUsernamePassword(
final String host, final String realm, final String username, final String password) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
setHttpAuthUsernamePassword(host, realm, username, password);
@@ -427,7 +357,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public String[] getHttpAuthUsernamePassword(final String host, final String realm) {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- String[] ret = runOnUiThreadBlocking(new Callable<String[]>() {
+ String[] ret = mFactory.runOnUiThreadBlocking(new Callable<String[]>() {
@Override
public String[] call() {
return getHttpAuthUsernamePassword(host, realm);
@@ -441,7 +371,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void destroy() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
destroy();
@@ -465,7 +395,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
// Note that this purely toggles the JS navigator.online property.
// It does not in affect chromium or network stack state in any way.
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
setNetworkAvailable(networkUp);
@@ -480,12 +410,13 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public WebBackForwardList saveState(final Bundle outState) {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- WebBackForwardList ret = runOnUiThreadBlocking(new Callable<WebBackForwardList>() {
- @Override
- public WebBackForwardList call() {
- return saveState(outState);
- }
- });
+ WebBackForwardList ret =
+ mFactory.runOnUiThreadBlocking(new Callable<WebBackForwardList>() {
+ @Override
+ public WebBackForwardList call() {
+ return saveState(outState);
+ }
+ });
return ret;
}
if (outState == null) return null;
@@ -509,12 +440,13 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public WebBackForwardList restoreState(final Bundle inState) {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- WebBackForwardList ret = runOnUiThreadBlocking(new Callable<WebBackForwardList>() {
- @Override
- public WebBackForwardList call() {
- return restoreState(inState);
- }
- });
+ WebBackForwardList ret =
+ mFactory.runOnUiThreadBlocking(new Callable<WebBackForwardList>() {
+ @Override
+ public WebBackForwardList call() {
+ return restoreState(inState);
+ }
+ });
return ret;
}
if (inState == null) return null;
@@ -528,7 +460,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
if (checkNeedsPost()) {
// Disallowed in WebView API for apps targetting a new SDK
assert mAppTargetSdkVersion < Build.VERSION_CODES.JELLY_BEAN_MR2;
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
mAwContents.loadUrl(url, additionalHttpHeaders);
@@ -545,7 +477,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
if (checkNeedsPost()) {
// Disallowed in WebView API for apps targetting a new SDK
assert mAppTargetSdkVersion < Build.VERSION_CODES.JELLY_BEAN_MR2;
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
mAwContents.loadUrl(url);
@@ -562,7 +494,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
if (checkNeedsPost()) {
// Disallowed in WebView API for apps targetting a new SDK
assert mAppTargetSdkVersion < Build.VERSION_CODES.JELLY_BEAN_MR2;
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
mAwContents.postUrl(url, postData);
@@ -579,7 +511,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
if (checkNeedsPost()) {
// Disallowed in WebView API for apps targetting a new SDK
assert mAppTargetSdkVersion < Build.VERSION_CODES.JELLY_BEAN_MR2;
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
mAwContents.loadData(data, mimeType, encoding);
@@ -597,7 +529,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
if (checkNeedsPost()) {
// Disallowed in WebView API for apps targetting a new SDK
assert mAppTargetSdkVersion < Build.VERSION_CODES.JELLY_BEAN_MR2;
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
mAwContents.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl);
@@ -622,7 +554,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public void saveWebArchive(final String basename, final boolean autoname,
final ValueCallback<String> callback) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
saveWebArchive(basename, autoname, callback);
@@ -636,7 +568,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void stopLoading() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
stopLoading();
@@ -651,7 +583,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void reload() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
reload();
@@ -666,7 +598,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean canGoBack() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- Boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ Boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return canGoBack();
@@ -680,7 +612,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void goBack() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
goBack();
@@ -695,7 +627,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean canGoForward() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- Boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ Boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return canGoForward();
@@ -709,7 +641,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void goForward() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
goForward();
@@ -724,7 +656,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean canGoBackOrForward(final int steps) {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- Boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ Boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return canGoBackOrForward(steps);
@@ -738,7 +670,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void goBackOrForward(final int steps) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
goBackOrForward(steps);
@@ -759,7 +691,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean pageUp(final boolean top) {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- Boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ Boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return pageUp(top);
@@ -774,7 +706,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean pageDown(final boolean bottom) {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- Boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ Boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return pageDown(bottom);
@@ -789,7 +721,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public void insertVisualStateCallback(
final long requestId, final VisualStateCallback callback) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
insertVisualStateCallback(requestId, callback);
@@ -809,7 +741,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void clearView() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
clearView();
@@ -824,7 +756,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public Picture capturePicture() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- Picture ret = runOnUiThreadBlocking(new Callable<Picture>() {
+ Picture ret = mFactory.runOnUiThreadBlocking(new Callable<Picture>() {
@Override
public Picture call() {
return capturePicture();
@@ -851,7 +783,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void invokeZoomPicker() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
invokeZoomPicker();
@@ -867,7 +799,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
WebView.HitTestResult ret =
- runOnUiThreadBlocking(new Callable<WebView.HitTestResult>() {
+ mFactory.runOnUiThreadBlocking(new Callable<WebView.HitTestResult>() {
@Override
public WebView.HitTestResult call() {
return getHitTestResult();
@@ -884,7 +816,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void requestFocusNodeHref(final Message hrefMsg) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
requestFocusNodeHref(hrefMsg);
@@ -898,7 +830,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void requestImageRef(final Message msg) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
requestImageRef(msg);
@@ -913,7 +845,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public String getUrl() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- String ret = runOnUiThreadBlocking(new Callable<String>() {
+ String ret = mFactory.runOnUiThreadBlocking(new Callable<String>() {
@Override
public String call() {
return getUrl();
@@ -928,7 +860,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public String getOriginalUrl() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- String ret = runOnUiThreadBlocking(new Callable<String>() {
+ String ret = mFactory.runOnUiThreadBlocking(new Callable<String>() {
@Override
public String call() {
return getOriginalUrl();
@@ -943,7 +875,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public String getTitle() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- String ret = runOnUiThreadBlocking(new Callable<String>() {
+ String ret = mFactory.runOnUiThreadBlocking(new Callable<String>() {
@Override
public String call() {
return getTitle();
@@ -958,7 +890,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public Bitmap getFavicon() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- Bitmap ret = runOnUiThreadBlocking(new Callable<Bitmap>() {
+ Bitmap ret = mFactory.runOnUiThreadBlocking(new Callable<Bitmap>() {
@Override
public Bitmap call() {
return getFavicon();
@@ -999,7 +931,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void pauseTimers() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
pauseTimers();
@@ -1013,7 +945,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void resumeTimers() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
resumeTimers();
@@ -1027,7 +959,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void onPause() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onPause();
@@ -1041,7 +973,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void onResume() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onResume();
@@ -1056,7 +988,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean isPaused() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- Boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ Boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return isPaused();
@@ -1075,7 +1007,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void clearCache(final boolean includeDiskFiles) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
clearCache(includeDiskFiles);
@@ -1092,7 +1024,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void clearFormData() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
clearFormData();
@@ -1106,7 +1038,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void clearHistory() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
clearHistory();
@@ -1120,7 +1052,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void clearSslPreferences() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
clearSslPreferences();
@@ -1135,12 +1067,13 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public WebBackForwardList copyBackForwardList() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- WebBackForwardList ret = runOnUiThreadBlocking(new Callable<WebBackForwardList>() {
- @Override
- public WebBackForwardList call() {
- return copyBackForwardList();
- }
- });
+ WebBackForwardList ret =
+ mFactory.runOnUiThreadBlocking(new Callable<WebBackForwardList>() {
+ @Override
+ public WebBackForwardList call() {
+ return copyBackForwardList();
+ }
+ });
return ret;
}
// mAwContents.getNavigationHistory() can be null here if mAwContents has been destroyed,
@@ -1158,7 +1091,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void findNext(final boolean forwards) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
findNext(forwards);
@@ -1178,7 +1111,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void findAllAsync(final String searchString) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
findAllAsync(searchString);
@@ -1222,7 +1155,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void notifyFindDialogDismissed() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
notifyFindDialogDismissed();
@@ -1236,7 +1169,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void clearMatches() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
clearMatches();
@@ -1250,7 +1183,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void documentHasImages(final Message response) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
documentHasImages(response);
@@ -1318,7 +1251,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@SuppressWarnings("deprecation")
public void setPictureListener(final WebView.PictureListener listener) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
setPictureListener(listener);
@@ -1334,7 +1267,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void addJavascriptInterface(final Object obj, final String interfaceName) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
addJavascriptInterface(obj, interfaceName);
@@ -1348,7 +1281,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void removeJavascriptInterface(final String interfaceName) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
removeJavascriptInterface(interfaceName);
@@ -1363,7 +1296,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public WebMessagePort[] createWebMessageChannel() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- WebMessagePort[] ret = runOnUiThreadBlocking(new Callable<WebMessagePort[]>() {
+ WebMessagePort[] ret = mFactory.runOnUiThreadBlocking(new Callable<WebMessagePort[]>() {
@Override
public WebMessagePort[] call() {
return createWebMessageChannel();
@@ -1378,7 +1311,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@TargetApi(Build.VERSION_CODES.M)
public void postMessageToMainFrame(final WebMessage message, final Uri targetOrigin) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
postMessageToMainFrame(message, targetOrigin);
@@ -1403,7 +1336,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void flingScroll(final int vx, final int vy) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
flingScroll(vx, vy);
@@ -1447,7 +1380,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean zoomIn() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return zoomIn();
@@ -1462,7 +1395,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean zoomOut() {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return zoomOut();
@@ -1517,7 +1450,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean shouldDelayChildPressedState() {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return shouldDelayChildPressedState();
@@ -1533,7 +1466,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
AccessibilityNodeProvider ret =
- runOnUiThreadBlocking(new Callable<AccessibilityNodeProvider>() {
+ mFactory.runOnUiThreadBlocking(new Callable<AccessibilityNodeProvider>() {
@Override
public AccessibilityNodeProvider call() {
return getAccessibilityNodeProvider();
@@ -1549,7 +1482,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public void onProvideVirtualStructure(final ViewStructure structure) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- runVoidTaskOnUiThreadBlocking(new Runnable() {
+ mFactory.runVoidTaskOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
onProvideVirtualStructure(structure);
@@ -1564,7 +1497,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public void onInitializeAccessibilityNodeInfo(final AccessibilityNodeInfo info) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- runVoidTaskOnUiThreadBlocking(new Runnable() {
+ mFactory.runVoidTaskOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
onInitializeAccessibilityNodeInfo(info);
@@ -1579,7 +1512,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public void onInitializeAccessibilityEvent(final AccessibilityEvent event) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- runVoidTaskOnUiThreadBlocking(new Runnable() {
+ mFactory.runVoidTaskOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
onInitializeAccessibilityEvent(event);
@@ -1594,7 +1527,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean performAccessibilityAction(final int action, final Bundle arguments) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return performAccessibilityAction(action, arguments);
@@ -1617,7 +1550,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
if (mAwContents == null) return;
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
setOverScrollMode(mode);
@@ -1631,7 +1564,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void setScrollBarStyle(final int style) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
setScrollBarStyle(style);
@@ -1655,7 +1588,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public void onOverScrolled(final int scrollX, final int scrollY,
final boolean clampedX, final boolean clampedY) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onOverScrolled(scrollX, scrollY, clampedX, clampedY);
@@ -1669,7 +1602,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void onWindowVisibilityChanged(final int visibility) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onWindowVisibilityChanged(visibility);
@@ -1685,7 +1618,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public void onDraw(final Canvas canvas) {
mFactory.startYourEngines(true);
if (checkNeedsPost()) {
- runVoidTaskOnUiThreadBlocking(new Runnable() {
+ mFactory.runVoidTaskOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
onDraw(canvas);
@@ -1705,7 +1638,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
checkThread();
mWebViewPrivate.super_setLayoutParams(layoutParams);
if (checkNeedsPost()) {
- runVoidTaskOnUiThreadBlocking(new Runnable() {
+ mFactory.runVoidTaskOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
mAwContents.setLayoutParams(layoutParams);
@@ -1720,7 +1653,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
// crbug.com/543272.
public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onActivityResult(requestCode, resultCode, data);
@@ -1740,7 +1673,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void onConfigurationChanged(final Configuration newConfig) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onConfigurationChanged(newConfig);
@@ -1756,7 +1689,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean onDragEvent(final DragEvent event) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return onDragEvent(event);
@@ -1780,7 +1713,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean onKeyMultiple(final int keyCode, final int repeatCount, final KeyEvent event) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return onKeyMultiple(keyCode, repeatCount, event);
@@ -1795,7 +1728,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean onKeyDown(final int keyCode, final KeyEvent event) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return onKeyDown(keyCode, event);
@@ -1810,7 +1743,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean onKeyUp(final int keyCode, final KeyEvent event) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return onKeyUp(keyCode, event);
@@ -1834,7 +1767,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void onDetachedFromWindow() {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onDetachedFromWindow();
@@ -1853,7 +1786,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
if (mAwContents == null) return;
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onVisibilityChanged(changedView, visibility);
@@ -1867,7 +1800,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void onWindowFocusChanged(final boolean hasWindowFocus) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onWindowFocusChanged(hasWindowFocus);
@@ -1882,7 +1815,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public void onFocusChanged(
final boolean focused, final int direction, final Rect previouslyFocusedRect) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onFocusChanged(focused, direction, previouslyFocusedRect);
@@ -1901,7 +1834,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void onSizeChanged(final int w, final int h, final int ow, final int oh) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onSizeChanged(w, h, ow, oh);
@@ -1915,7 +1848,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override
public void onScrollChanged(final int l, final int t, final int oldl, final int oldt) {
if (checkNeedsPost()) {
- mRunQueue.addTask(new Runnable() {
+ mFactory.addTask(new Runnable() {
@Override
public void run() {
onScrollChanged(l, t, oldl, oldt);
@@ -1930,7 +1863,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean dispatchKeyEvent(final KeyEvent event) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return dispatchKeyEvent(event);
@@ -1945,7 +1878,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean onTouchEvent(final MotionEvent ev) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return onTouchEvent(ev);
@@ -1960,7 +1893,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean onHoverEvent(final MotionEvent event) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return onHoverEvent(event);
@@ -1975,7 +1908,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean onGenericMotionEvent(final MotionEvent event) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return onGenericMotionEvent(event);
@@ -1996,7 +1929,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public boolean requestFocus(final int direction, final Rect previouslyFocusedRect) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return requestFocus(direction, previouslyFocusedRect);
@@ -2013,7 +1946,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- runVoidTaskOnUiThreadBlocking(new Runnable() {
+ mFactory.runVoidTaskOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -2029,7 +1962,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
final View child, final Rect rect, final boolean immediate) {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- boolean ret = runOnUiThreadBlocking(new Callable<Boolean>() {
+ boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
@Override
public Boolean call() {
return requestChildRectangleOnScreen(child, rect, immediate);
@@ -2104,7 +2037,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public int computeHorizontalScrollRange() {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- int ret = runOnUiThreadBlocking(new Callable<Integer>() {
+ int ret = mFactory.runOnUiThreadBlocking(new Callable<Integer>() {
@Override
public Integer call() {
return computeHorizontalScrollRange();
@@ -2119,7 +2052,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public int computeHorizontalScrollOffset() {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- int ret = runOnUiThreadBlocking(new Callable<Integer>() {
+ int ret = mFactory.runOnUiThreadBlocking(new Callable<Integer>() {
@Override
public Integer call() {
return computeHorizontalScrollOffset();
@@ -2134,7 +2067,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public int computeVerticalScrollRange() {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- int ret = runOnUiThreadBlocking(new Callable<Integer>() {
+ int ret = mFactory.runOnUiThreadBlocking(new Callable<Integer>() {
@Override
public Integer call() {
return computeVerticalScrollRange();
@@ -2149,7 +2082,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public int computeVerticalScrollOffset() {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- int ret = runOnUiThreadBlocking(new Callable<Integer>() {
+ int ret = mFactory.runOnUiThreadBlocking(new Callable<Integer>() {
@Override
public Integer call() {
return computeVerticalScrollOffset();
@@ -2164,7 +2097,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public int computeVerticalScrollExtent() {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- int ret = runOnUiThreadBlocking(new Callable<Integer>() {
+ int ret = mFactory.runOnUiThreadBlocking(new Callable<Integer>() {
@Override
public Integer call() {
return computeVerticalScrollExtent();
@@ -2179,7 +2112,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
public void computeScroll() {
mFactory.startYourEngines(false);
if (checkNeedsPost()) {
- runVoidTaskOnUiThreadBlocking(new Runnable() {
+ mFactory.runVoidTaskOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
computeScroll();
« no previous file with comments | « no previous file | android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698