Skip to content

Commit 12d434a

Browse files
ChrisCraikAndroid (Google) Code Review
authored andcommitted
Revert "Add temporary functor lifetime logging"
bug:6445573 This reverts commit 2fe9980
1 parent 2fe9980 commit 12d434a

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

core/java/android/webkit/WebViewClassic.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2018,11 +2018,6 @@ public void destroy() {
20182018
}
20192019

20202020
private void destroyImpl() {
2021-
int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);
2022-
ViewRootImpl viewRoot = mWebView.getViewRootImpl();
2023-
Log.d(LOGTAG, String.format("destroyImpl, drawGLFunction %x, viewroot == null %b, isHWAccel %b",
2024-
drawGLFunction, (viewRoot == null), mWebView.isHardwareAccelerated()));
2025-
20262021
mCallbackProxy.blockMessages();
20272022
clearHelpers();
20282023
if (mListBoxDialog != null) {
@@ -5439,11 +5434,9 @@ public void onDetachedFromWindow() {
54395434
removeAccessibilityApisFromJavaScript();
54405435
updateHwAccelerated();
54415436

5442-
int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);
5443-
ViewRootImpl viewRoot = mWebView.getViewRootImpl();
5444-
Log.d(LOGTAG, String.format("onDetachedFromWindow, drawGLFunction %x, viewroot == null %b, isHWAccel %b",
5445-
drawGLFunction, (viewRoot == null), mWebView.isHardwareAccelerated()));
54465437
if (mWebView.isHardwareAccelerated()) {
5438+
int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);
5439+
ViewRootImpl viewRoot = mWebView.getViewRootImpl();
54475440
if (drawGLFunction != 0 && viewRoot != null) {
54485441
viewRoot.detachFunctor(drawGLFunction);
54495442
}

libs/hwui/OpenGLRenderer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ void OpenGLRenderer::resume() {
247247
}
248248

249249
void OpenGLRenderer::detachFunctor(Functor* functor) {
250-
ALOGD("OGLR %p detachFunctor %p", this, functor);
251250
mFunctors.remove(functor);
252251
}
253252

0 commit comments

Comments
 (0)