summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-06-04 13:33:10 -0700
committerChris Craik <ccraik@google.com>2012-06-04 13:42:33 -0700
commitf98851ab37c07b243c485168cca201b07a22e6c7 (patch)
tree419ee3149bcb1e055855a054a59a2598d2aa2d40
parent51df04b93e8e362edd867abd7efaf1659b8b8b82 (diff)
downloadframeworks_base-f98851ab37c07b243c485168cca201b07a22e6c7.zip
frameworks_base-f98851ab37c07b243c485168cca201b07a22e6c7.tar.gz
frameworks_base-f98851ab37c07b243c485168cca201b07a22e6c7.tar.bz2
Add temporary functor detach logging
bug:6596807 Change-Id: I22342079cdf238a933d62e9cbef58bc5af80522b
-rw-r--r--core/java/android/webkit/WebViewClassic.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index d1da53b..1a204eb 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -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);
}