drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ca5a1489: Merge "Add temporary functor detach logging" into jb-dev

Browse Source 
* commit 'ca5a1489e22be07d2641e2a10456fa9e616fc4ed':
  Add temporary functor detach logging
This commit is contained in:
Chris Craik
2012-06-04 15:53:02 -07:00
committed by Android Git Automerger
parent b536cf936d ca5a1489e2
commit 9238e5b9db
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2069,13 +2069,16 @@ 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
@ -5313,9 +5316,12 @@ 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);
}