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

Commit d9fd857c authored by Cary Clark's avatar Cary Clark
Browse files

stop GL drawing thread before killing WebCore 

The TexturesGenerator thread references pictures owned by the
WebCore thread, so must be stopped before the WebCore thread
is deleted.

Requires a companion change in external/webkit

bug:3406185
Change-Id: I5b2f8b3b52367b05301c76e5bd22a95fcd0338d5
parent 47b8c96b

core/java/android/webkit/WebView.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -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.
@@ -8299,6 +8300,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) -