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

Commit aa997294 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add temporary functor lifetime logging"" into jb-dev

parents 59f3f585 12d434a9

core/java/android/webkit/WebViewClassic.java

+2 −9
Original line number Diff line number Diff line
@@ -2000,11 +2000,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
    }



    private void destroyImpl() {

        int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);

        ViewRootImpl viewRoot = mWebView.getViewRootImpl();

        Log.d(LOGTAG, String.format("destroyImpl, drawGLFunction %x,  viewroot == null %b, isHWAccel %b",

                                    drawGLFunction, (viewRoot == null), mWebView.isHardwareAccelerated()));



        mCallbackProxy.blockMessages();

        clearHelpers();

        if (mListBoxDialog != null) {
@@ -5392,11 +5387,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
        removeAccessibilityApisFromJavaScript();

        updateHwAccelerated();



        if (mWebView.isHardwareAccelerated()) {

            int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);

            ViewRootImpl viewRoot = mWebView.getViewRootImpl();

        Log.d(LOGTAG, String.format("onDetachedFromWindow, drawGLFunction %x,  viewroot == null %b, isHWAccel %b",

                                    drawGLFunction, (viewRoot == null), mWebView.isHardwareAccelerated()));

        if (mWebView.isHardwareAccelerated()) {

            if (drawGLFunction != 0 && viewRoot != null) {

                viewRoot.detachFunctor(drawGLFunction);

            }

libs/hwui/OpenGLRenderer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ void OpenGLRenderer::resume() { 
}



void OpenGLRenderer::detachFunctor(Functor* functor) {

    ALOGD("OGLR %p detachFunctor %p", this, functor);

    mFunctors.remove(functor);

}