am 0e693b24: am 3421f9fd: Merge "Add temporary functor lifetime logging" into jb-dev (78cd30ef) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebViewClassic.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -2017,6 +2017,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) {
		@@ -5429,9 +5434,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);
		}

+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);
		}