From aa3b7d88ef14b93df12904b3aa958c1d937fdaff Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Wed, 6 Jun 2012 16:45:53 -0700 Subject: Revert "Add temporary functor detach logging" bug:6608646 This reverts commit f98851ab37c07b243c485168cca201b07a22e6c7 --- core/java/android/webkit/WebViewClassic.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'core/java/android/webkit/WebViewClassic.java') diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 1a204ebf87bb..d1da53be517e 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -2069,16 +2069,13 @@ 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 @@ -5316,12 +5313,9 @@ 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); } -- cgit v1.2.3