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

Commit 2fe99801 authored by Chris Craik's avatar Chris Craik
Browse files

Add temporary functor lifetime logging 

bug:6405861

Note: revert once the above bug is verified fixed

Change-Id: Iae04ec6ffa73a2711f96e128d60011bcb5864b5c
parent e849230f

core/java/android/webkit/WebViewClassic.java

+9 −2
Original line number Diff line number Diff line
@@ -2018,6 +2018,11 @@ 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) {
@@ -5434,9 +5439,11 @@ 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

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



void OpenGLRenderer::detachFunctor(Functor* functor) {

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

    mFunctors.remove(functor);

}