diff options
| author | Chris Craik <ccraik@google.com> | 2012-06-06 16:59:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-06 16:59:01 -0700 |
| commit | 37e0c3681ef403e5a43a4f3dbca954ec8a4bfb5d (patch) | |
| tree | ee4a3b80fe95351c2f0423b5c28dae7270700569 /core/java | |
| parent | 8f1f714f831bf8bf10f94211c42e36ef2851810d (diff) | |
| parent | aa3b7d88ef14b93df12904b3aa958c1d937fdaff (diff) | |
| download | frameworks_base-37e0c3681ef403e5a43a4f3dbca954ec8a4bfb5d.zip frameworks_base-37e0c3681ef403e5a43a4f3dbca954ec8a4bfb5d.tar.gz frameworks_base-37e0c3681ef403e5a43a4f3dbca954ec8a4bfb5d.tar.bz2 | |
Merge "Revert "Add temporary functor detach logging"" into jb-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 1a204eb..d1da53b 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -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); } |