Merge "never attach null functor" into jb-dev

Author: jreck

core/java/android/webkit/WebViewClassic.java

@@ -7890,7 +7890,9 @@ void setNewPicture(final WebViewCore.DrawData draw, boolean updateBaseLayer) {
         ViewRootImpl viewRoot = mWebView.getViewRootImpl();
         if (mWebView.isHardwareAccelerated() && viewRoot != null) {
             functor = nativeGetDrawGLFunction(mNativeClass);
-            viewRoot.attachFunctor(functor);
+            if (functor != 0) {
+                viewRoot.attachFunctor(functor);
+            }
         }
 
         if (functor == 0