From 12d434a9be03214e9c673580a6f55128eec9b3f9 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Tue, 8 May 2012 13:07:13 -0700 Subject: Revert "Add temporary functor lifetime logging" bug:6445573 This reverts commit 2fe99801e81bb7c0ff846b536cbb7a12707410ed --- core/java/android/webkit/WebViewClassic.java | 11 ++--------- libs/hwui/OpenGLRenderer.cpp | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 246ac8de899a..30229f18acf2 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -2018,11 +2018,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) { @@ -5439,11 +5434,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 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); } diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 80db6937dde9..da2192f21cb2 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -247,7 +247,6 @@ void OpenGLRenderer::resume() { } void OpenGLRenderer::detachFunctor(Functor* functor) { - ALOGD("OGLR %p detachFunctor %p", this, functor); mFunctors.remove(functor); } -- cgit v1.2.3-59-g8ed1b