Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a95e9da7: Merge "Make the WebCore thread watchdog opt in." into jb-dev

Browse Source 
* commit 'a95e9da760198b06afe0c1bbe828c2f75b52070e':
  Make the WebCore thread watchdog opt in.
This commit is contained in:
Ben Murdoch
2012-05-24 09:33:30 -07:00
committed by Android Git Automerger
parent af239b5f74 a95e9da760
commit cde7efde0c
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/webkit/WebViewClassic.java
View File

@@ -8494,6 +8494,11 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
mWebView.postInvalidate();
}
// Note: must be called before first WebViewClassic is created.
public static void setShouldMonitorWebCoreThread() {
WebViewCore.setShouldMonitorWebCoreThread();
}
private native void nativeCreate(int ptr, String drawableDir, boolean isHighEndGfx);
private native void nativeDebugDump();
private native void nativeDestroy();

19
core/java/android/webkit/WebViewCore.java
View File

@@ -144,6 +144,11 @@ public final class WebViewCore {
private int mChromeCanFocusDirection;
private int mTextSelectionChangeReason = TextSelectionData.REASON_UNKNOWN;
// Used to determine if we should monitor the WebCore thread for responsiveness.
// If it "hangs", for example a web page enters a while(true) loop, we will
// prompt the user with a dialog allowing them to terminate the process.
private static boolean sShouldMonitorWebCoreThread;
// The thread name used to identify the WebCore thread and for use in
// debugging other classes that require operation within the WebCore thread.
/* package */ static final String THREAD_NAME = "WebViewCoreThread";
@@ -176,9 +181,13 @@ public final class WebViewCore {
Log.e(LOGTAG, Log.getStackTraceString(e));
}
// Start the singleton watchdog which will monitor the WebCore thread
// to verify it's still processing messages.
WebCoreThreadWatchdog.start(sWebCoreHandler);
if (sShouldMonitorWebCoreThread) {
// Start the singleton watchdog which will monitor the WebCore thread
// to verify it's still processing messages. Note that this is the only
// time we need to check the value as all the other public methods on
// the WebCoreThreadWatchdog are no-ops if start() is not called.
WebCoreThreadWatchdog.start(sWebCoreHandler);
}
}
// Make sure the Watchdog is aware of this new WebView.
WebCoreThreadWatchdog.registerWebView(w);
@@ -3061,6 +3070,10 @@ public final class WebViewCore {
return mDeviceOrientationService;
}
static void setShouldMonitorWebCoreThread() {
sShouldMonitorWebCoreThread = true;
}
private native void nativeSetIsPaused(int nativeClass, boolean isPaused);
private native void nativePause(int nativeClass);
private native void nativeResume(int nativeClass);