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

am 37e0c368: Merge "Revert "Add temporary functor detach logging"" into jb-dev

Browse Source 
* commit '37e0c3681ef403e5a43a4f3dbca954ec8a4bfb5d':
  Revert "Add temporary functor detach logging"
This commit is contained in:
Chris Craik
2012-06-06 17:01:27 -07:00
committed by Android Git Automerger
parent 6d99a02464 37e0c3681e
commit 0df6d579db
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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