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

Merge "stop GL drawing thread before killing WebCore" into honeycomb

Browse Source
This commit is contained in:
Cary Clark
2011-02-03 08:48:24 -08:00
committed by Android (Google) Code Review
parent b732e6d205 d9fd857ca9
commit aa7dc92838
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/WebView.java
View File

@@ -1461,6 +1461,7 @@ public class WebView extends AbsoluteLayout
mListBoxDialog.dismiss(); mListBoxDialog.dismiss();
mListBoxDialog = null; mListBoxDialog = null;
} }
if (mNativeClass != 0) nativeStopGL();
if (mWebViewCore != null) { if (mWebViewCore != null) {
// Set the handlers to null before destroying WebViewCore so no // Set the handlers to null before destroying WebViewCore so no
// more messages will be posted. // more messages will be posted.
@@ -8309,6 +8310,7 @@ public class WebView extends AbsoluteLayout
private native void nativeSetSelectionPointer(boolean set, private native void nativeSetSelectionPointer(boolean set,
float scale, int x, int y); float scale, int x, int y);
private native boolean nativeStartSelection(int x, int y); private native boolean nativeStartSelection(int x, int y);
private native void nativeStopGL();
private native Rect nativeSubtractLayers(Rect content); private native Rect nativeSubtractLayers(Rect content);
private native int nativeTextGeneration(); private native int nativeTextGeneration();
// Never call this version except by updateCachedTextfield(String) - // Never call this version except by updateCachedTextfield(String) -