@@ -2069,16 +2069,13 @@ public void destroy() {
20692069 }
20702070
20712071 private void destroyImpl () {
2072- int drawGLFunction = nativeGetDrawGLFunction (mNativeClass );
20732072 ViewRootImpl viewRoot = mWebView .getViewRootImpl ();
2074- Log .d (LOGTAG , String .format (this + "destroyImpl, drawGLFunction %x, viewroot == null %b, isHWAccel %b" ,
2075- drawGLFunction , (viewRoot == null ), mWebView .isHardwareAccelerated ()));
2076-
20772073 if (viewRoot != null ) {
20782074 Log .e (LOGTAG , "Error: WebView.destroy() called while still attached!" );
20792075 }
20802076
20812077 if (mWebView .isHardwareAccelerated ()) {
2078+ int drawGLFunction = nativeGetDrawGLFunction (mNativeClass );
20822079 if (drawGLFunction != 0 && viewRoot != null ) {
20832080 // functor should have been detached in onDetachedFromWindow, do
20842081 // additionally here for safety
@@ -5316,12 +5313,9 @@ public void onDetachedFromWindow() {
53165313
53175314 updateHwAccelerated ();
53185315
5319- int drawGLFunction = nativeGetDrawGLFunction (mNativeClass );
5320- ViewRootImpl viewRoot = mWebView .getViewRootImpl ();
5321- Log .d (LOGTAG , String .format (this + "onDetachedFromWindow, drawGLFunction %x, viewroot == null %b, isHWAccel %b" ,
5322- drawGLFunction , (viewRoot == null ), mWebView .isHardwareAccelerated ()));
5323-
53245316 if (mWebView .isHardwareAccelerated ()) {
5317+ int drawGLFunction = nativeGetDrawGLFunction (mNativeClass );
5318+ ViewRootImpl viewRoot = mWebView .getViewRootImpl ();
53255319 if (drawGLFunction != 0 && viewRoot != null ) {
53265320 viewRoot .detachFunctor (drawGLFunction );
53275321 }
0 commit comments