Merge "Revert "add null check on ViewRootImpl"" into jb-dev

jreck · Android (Google) Code Review · commit 47f88d6b5229 · 2012-04-27T18:05:39.000-07:00
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
@@ -7890,7 +7890,7 @@ void setNewPicture(final WebViewCore.DrawData draw, boolean updateBaseLayer) {
             functor = nativeGetDrawGLFunction(mNativeClass);
         }
 
-        if (functor != 0 && mWebView.getViewRootImpl()) {
+        if (functor != 0) {
             mWebView.getViewRootImpl().attachFunctor(functor);
         } else {
             // invalidate the screen so that the next repaint will show new content

Original file line number	Diff line number	Diff line change
`@@ -7890,7 +7890,7 @@ void setNewPicture(final WebViewCore.DrawData draw, boolean updateBaseLayer) {`
`7890`	`7890`	`functor = nativeGetDrawGLFunction(mNativeClass);`
`7891`	`7891`	`}`
`7892`	`7892`
`7893`		`- if (functor != 0 && mWebView.getViewRootImpl()) {`
	`7893`	`+ if (functor != 0) {`
`7894`	`7894`	`mWebView.getViewRootImpl().attachFunctor(functor);`
`7895`	`7895`	`} else {`
`7896`	`7896`	`// invalidate the screen so that the next repaint will show new content`