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

Author: ChrisCraik

core/java/android/webkit/WebViewClassic.java

@@ -2017,6 +2017,11 @@ public void destroy() {
     }
 
     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) {
@@ -5429,9 +5434,11 @@ public void onDetachedFromWindow() {
         removeAccessibilityApisFromJavaScript();
         updateHwAccelerated();
 
+        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()) {
-            int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);
-            ViewRootImpl viewRoot = mWebView.getViewRootImpl();
             if (drawGLFunction != 0 && viewRoot != null) {
                 viewRoot.detachFunctor(drawGLFunction);
             }

libs/hwui/OpenGLRenderer.cpp

@@ -247,6 +247,7 @@ void OpenGLRenderer::resume() {
 }
 
 void OpenGLRenderer::detachFunctor(Functor* functor) {
+    ALOGD("OGLR %p detachFunctor %p", this, functor);
     mFunctors.remove(functor);
 }