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

1 files changed, 9 insertions, 3 deletions

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index d1da53be517e..1a204ebf87bb 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -2069,13 +2069,16 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
     }
 
     private void destroyImpl() {
+        int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);
         ViewRootImpl viewRoot = mWebView.getViewRootImpl();
+        Log.d(LOGTAG, String.format(this + "destroyImpl, drawGLFunction %x,  viewroot == null %b, isHWAccel %b",
+                                    drawGLFunction, (viewRoot == null), mWebView.isHardwareAccelerated()));
+
         if (viewRoot != null) {
             Log.e(LOGTAG, "Error: WebView.destroy() called while still attached!");
         }
 
         if (mWebView.isHardwareAccelerated()) {
-            int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);
             if (drawGLFunction != 0 && viewRoot != null) {
                 // functor should have been detached in onDetachedFromWindow, do
                 // additionally here for safety
@@ -5313,9 +5316,12 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
 
         updateHwAccelerated();
 
+        int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);
+        ViewRootImpl viewRoot = mWebView.getViewRootImpl();
+        Log.d(LOGTAG, String.format(this + "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);
             }