From 1266692b307e1496b31dfc3c1f7e202babf7eb41 Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
Date: Mon, 30 Apr 2012 13:13:41 -0700
Subject: [PATCH] never attach null functor

bug:6412902

Change-Id: I26a5f80ae13cc19df3daa4d4e7e5401778f76dbb
---
 core/java/android/webkit/WebViewClassic.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index b6fe6d8de29ad..a9b32b887adc1 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -7890,7 +7890,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
         ViewRootImpl viewRoot = mWebView.getViewRootImpl();
         if (mWebView.isHardwareAccelerated() && viewRoot != null) {
             functor = nativeGetDrawGLFunction(mNativeClass);
-            viewRoot.attachFunctor(functor);
+            if (functor != 0) {
+                viewRoot.attachFunctor(functor);
+            }
         }
 
         if (functor == 0