Transfer DrawGLFunctor ownership from AwContents to AwGLFunctor

android_webview/java/src/org/chromium/android_webview/AwGLFunctor.java

Index: android_webview/java/src/org/chromium/android_webview/AwGLFunctor.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwGLFunctor.java b/android_webview/java/src/org/chromium/android_webview/AwGLFunctor.java
index e43b840fbf980e8ebd1a83b5794acca5899a77fc..f26e66edf39ade330bdc0a7317352da304c628df 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwGLFunctor.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwGLFunctor.java
@@ -35,17 +35,18 @@ class AwGLFunctor {
     private final long mNativeAwGLFunctor;
     private final DestroyRunnable mDestroyRunnable;
     private final CleanupReference mCleanupReference;
-    private final AwContents.NativeGLDelegate mNativeGLDelegate;
+    private final AwContents.NativeDrawGLFunctor mNativeDrawGLFunctor;
     private final ViewGroup mContainerView;
     private final Runnable mFunctorReleasedCallback;
 
-    public AwGLFunctor(AwContents.NativeGLDelegate nativeGLDelegate, ViewGroup containerView) {
+    public AwGLFunctor(AwContents.NativeDrawGLFunctorFactory nativeDrawGLFunctorFactoy,
+            ViewGroup containerView) {
         mNativeAwGLFunctor = nativeCreate(this);
         mDestroyRunnable = new DestroyRunnable(mNativeAwGLFunctor);
         mCleanupReference = new CleanupReference(mDestroyRunnable, mDestroyRunnable);
-        mNativeGLDelegate = nativeGLDelegate;
+        mNativeDrawGLFunctor = nativeDrawGLFunctorFactoy.createFunctor(getAwDrawGLViewContext());
         mContainerView = containerView;
-        if (mNativeGLDelegate.supportsDrawGLFunctorReleasedCallback()) {
+        if (mNativeDrawGLFunctor.supportsDrawGLFunctorReleasedCallback()) {
             mFunctorReleasedCallback = new Runnable() {
                 @Override
                 public void run() {
@@ -71,18 +72,17 @@ class AwGLFunctor {
     }
 
     public boolean requestDrawGLForCanvas(Canvas canvas) {
-        return mNativeGLDelegate.requestDrawGL(
-                canvas, false, mContainerView, mFunctorReleasedCallback);
+        return mNativeDrawGLFunctor.requestDrawGL(mContainerView, canvas, mFunctorReleasedCallback);
     }
 
     @CalledByNative
     private boolean requestDrawGL(boolean waitForCompletion) {
-        return mNativeGLDelegate.requestDrawGL(null, waitForCompletion, mContainerView, null);
+        return mNativeDrawGLFunctor.requestDrawGL(mContainerView, waitForCompletion);
     }
 
     @CalledByNative
     private void detachFunctorFromView() {
-        mNativeGLDelegate.detachGLFunctor();
+        mNativeDrawGLFunctor.detach();
         mContainerView.invalidate();
     }