Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 859563eb authored by Cary Clark's avatar Cary Clark Committed by Android Git Automerger
Browse files

am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb 

* commit 'aa7dc928':
  stop GL drawing thread before killing WebCore
parents 7d75cd65 aa7dc928

core/java/android/webkit/WebView.java

+2 −0
Original line number Diff line number Diff line
@@ -1461,6 +1461,7 @@ public class WebView extends AbsoluteLayout 
            mListBoxDialog.dismiss();

            mListBoxDialog = null;

        }

        if (mNativeClass != 0) nativeStopGL();

        if (mWebViewCore != null) {

            // Set the handlers to null before destroying WebViewCore so no

            // more messages will be posted.
@@ -8309,6 +8310,7 @@ public class WebView extends AbsoluteLayout 
    private native void     nativeSetSelectionPointer(boolean set,

            float scale, int x, int y);

    private native boolean  nativeStartSelection(int x, int y);

    private native void     nativeStopGL();

    private native Rect     nativeSubtractLayers(Rect content);

    private native int      nativeTextGeneration();

    // Never call this version except by updateCachedTextfield(String) -