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

Commit 3ea87619 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix crash in setNewPicture" into jb-dev

parents 02d7e489 579f4e93

core/java/android/webkit/WebViewClassic.java

+5 −5
Original line number Diff line number Diff line
@@ -7887,14 +7887,14 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
        mSendScrollEvent = true;



        int functor = 0;

        if (mWebView.isHardwareAccelerated()

                || mWebView.getLayerType() != View.LAYER_TYPE_HARDWARE) {

        ViewRootImpl viewRoot = mWebView.getViewRootImpl();

        if (mWebView.isHardwareAccelerated() && viewRoot != null) {

            functor = nativeGetDrawGLFunction(mNativeClass);

            viewRoot.attachFunctor(functor);

        }



        if (functor != 0) {

            mWebView.getViewRootImpl().attachFunctor(functor);

        } else {

        if (functor == 0

                || mWebView.getLayerType() != View.LAYER_TYPE_NONE) {

            // invalidate the screen so that the next repaint will show new content

            // TODO: partial invalidate

            mWebView.invalidate();