Make DrawGLFunctor work on 64-bit platforms.

The change to disable the functor for 64-bit platforms was merged
from chromium-dev where it was necessary since chromium-dev is
pinned to a 32-bit only version of frameworks/base.
This restriction can be lifted in master where frameworks/base
supports 64-bit.

Change-Id: Ibb5b3327387c7e0c22174fa9ecd91b66cf29249d
diff --git a/chromium/java/com/android/webview/chromium/DrawGLFunctor.java b/chromium/java/com/android/webview/chromium/DrawGLFunctor.java
index 93ae5d1..4fb0e26 100644
--- a/chromium/java/com/android/webview/chromium/DrawGLFunctor.java
+++ b/chromium/java/com/android/webview/chromium/DrawGLFunctor.java
@@ -59,13 +59,13 @@
         }
         mDestroyRunnable.mViewRootImpl = viewRootImpl;
         if (canvas != null) {
-            int ret = canvas.callDrawGLFunction(mDestroyRunnable.nativeDrawGLFunctor());
+            int ret = canvas.callDrawGLFunction(mDestroyRunnable.mNativeDrawGLFunctor);
             if (ret != DisplayList.STATUS_DONE) {
                 Log.e(TAG, "callDrawGLFunction error: " + ret);
                 return false;
             }
         } else {
-            viewRootImpl.attachFunctor(mDestroyRunnable.nativeDrawGLFunctor());
+            viewRootImpl.attachFunctor(mDestroyRunnable.mNativeDrawGLFunctor);
         }
         return true;
     }
@@ -79,20 +79,11 @@
     // instance, as that will defeat GC of that object.
     private static final class DestroyRunnable implements Runnable {
         ViewRootImpl mViewRootImpl;
-        private long mNativeDrawGLFunctor;
+        long mNativeDrawGLFunctor;
         DestroyRunnable(long nativeDrawGLFunctor) {
             mNativeDrawGLFunctor = nativeDrawGLFunctor;
         }
 
-        int nativeDrawGLFunctor() {
-            if (mNativeDrawGLFunctor <= Integer.MAX_VALUE &&
-                    mNativeDrawGLFunctor >= Integer.MIN_VALUE) {
-                return (int)mNativeDrawGLFunctor;
-            } else {
-                throw new RuntimeException("64bit not supported yet");
-            }
-        }
-
         // Called when the outer DrawGLFunctor instance has been GC'ed, i.e this is its finalizer.
         @Override
         public void run() {
@@ -103,7 +94,7 @@
 
         void detachNativeFunctor() {
             if (mNativeDrawGLFunctor != 0 && mViewRootImpl != null) {
-                mViewRootImpl.detachFunctor(nativeDrawGLFunctor());
+                mViewRootImpl.detachFunctor(mNativeDrawGLFunctor);
             }
             mViewRootImpl = null;
         }