Merge "check for null ViewRootImpl" into jb-dev

ChrisCraik · Android (Google) Code Review · commit 02d7e489b2e1 · 2012-04-30T11:27:35.000-07:00
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
@@ -87,6 +87,7 @@
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.ViewParent;
+import android.view.ViewRootImpl;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
@@ -5435,8 +5436,9 @@ public void onDetachedFromWindow() {
 
         if (mWebView.isHardwareAccelerated()) {
             int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);
-            if (drawGLFunction != 0) {
-                mWebView.getViewRootImpl().detachFunctor(drawGLFunction);
+            ViewRootImpl viewRoot = mWebView.getViewRootImpl();
+            if (drawGLFunction != 0 && viewRoot != null) {
+                viewRoot.detachFunctor(drawGLFunction);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@`
`87`	`87`	`import android.view.ViewConfiguration;`
`88`	`88`	`import android.view.ViewGroup;`
`89`	`89`	`import android.view.ViewParent;`
	`90`	`+import android.view.ViewRootImpl;`
`90`	`91`	`import android.view.ViewTreeObserver;`
`91`	`92`	`import android.view.WindowManager;`
`92`	`93`	`import android.view.accessibility.AccessibilityEvent;`
`@@ -5435,8 +5436,9 @@ public void onDetachedFromWindow() {`
`5435`	`5436`
`5436`	`5437`	`if (mWebView.isHardwareAccelerated()) {`
`5437`	`5438`	`int drawGLFunction = nativeGetDrawGLFunction(mNativeClass);`
`5438`		`- if (drawGLFunction != 0) {`
`5439`		`- mWebView.getViewRootImpl().detachFunctor(drawGLFunction);`
	`5439`	`+ ViewRootImpl viewRoot = mWebView.getViewRootImpl();`
	`5440`	`+ if (drawGLFunction != 0 && viewRoot != null) {`
	`5441`	`+ viewRoot.detachFunctor(drawGLFunction);`
`5440`	`5442`	`}`
`5441`	`5443`	`}`
`5442`	`5444`	`}`