Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am aa997294: Merge "Revert "Add temporary functor lifetime logging"" into jb-dev

Browse Source 
* commit 'aa9972943cab627db9b10e5c9c4bb80f99f8a4bd':
  Revert "Add temporary functor lifetime logging"
This commit is contained in:
Chris Craik
2012-05-09 01:48:04 -07:00
committed by Android Git Automerger
parent aecb9b59e6 aa9972943c
commit d9155605ab
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/webkit/WebViewClassic.java
View File

@@ -2000,11 +2000,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
} }
private void destroyImpl() { 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(); mCallbackProxy.blockMessages();
clearHelpers(); clearHelpers();
if (mListBoxDialog != null) { if (mListBoxDialog != null) {
@@ -5392,11 +5387,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
removeAccessibilityApisFromJavaScript(); removeAccessibilityApisFromJavaScript();
updateHwAccelerated(); 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()) { if (mWebView.isHardwareAccelerated()) {
int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);
ViewRootImpl viewRoot = mWebView.getViewRootImpl();
if (drawGLFunction != 0 && viewRoot != null) { if (drawGLFunction != 0 && viewRoot != null) {
viewRoot.detachFunctor(drawGLFunction); viewRoot.detachFunctor(drawGLFunction);
} }

1
libs/hwui/OpenGLRenderer.cpp
View File

@@ -247,7 +247,6 @@ void OpenGLRenderer::resume() {
} }
void OpenGLRenderer::detachFunctor(Functor* functor) { void OpenGLRenderer::detachFunctor(Functor* functor) {
ALOGD("OGLR %p detachFunctor %p", this, functor);
mFunctors.remove(functor); mFunctors.remove(functor);
} }