Transfer DrawGLFunctor ownership from AwContents to AwGLFunctor

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview;
 
 import android.graphics.Canvas;
 import android.view.ViewGroup;
 
 import org.chromium.base.annotations.CalledByNative;
@@ skipping 18 matching lines @@
         @Override
         public void run() {
             nativeDestroy(mNativeAwGLFunctor);
         }
     }
 
     private final long mNativeAwGLFunctor;
     // Same gc-life time as this, but does not reference any members like |mContainerView|.
     private final Object mLifetimeObject;
     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 nativeDrawGLFunctorFactory,
+            ViewGroup containerView) {
         mNativeAwGLFunctor = nativeCreate(this);
         mLifetimeObject = new Object();
         mCleanupReference =
                 new CleanupReference(mLifetimeObject, new DestroyRunnable(mNativeAwGLFunctor));
-        mNativeGLDelegate = nativeGLDelegate;
+        mNativeDrawGLFunctor = nativeDrawGLFunctorFactory.createFunctor(getAwDrawGLViewContext());
         mContainerView = containerView;
-        if (mNativeGLDelegate.supportsDrawGLFunctorReleasedCallback()) {
+        if (mNativeDrawGLFunctor.supportsDrawGLFunctorReleasedCallback()) {
             mFunctorReleasedCallback = new Runnable() {
                 @Override
                 public void run() {
                     // Deliberate no-op. This Runnable is holding a strong reference back to the
                     // AwGLFunctor, which serves its purpose for now.
                 }
             };
         } else {
             mFunctorReleasedCallback = null;
         }
     }
 
     public static long getAwDrawGLFunction() {
         return nativeGetAwDrawGLFunction();
     }
 
     public long getNativeAwGLFunctor() {
         return mNativeAwGLFunctor;
     }
 
     public Object getNativeLifetimeObject() {
         return mLifetimeObject;
     }
 
     public boolean requestDrawGLForCanvas(Canvas canvas) {
-        return mNativeGLDelegate.requestDrawGL(
-                canvas, false, mContainerView, mFunctorReleasedCallback);
+        return mNativeDrawGLFunctor.requestDrawGL(canvas, mFunctorReleasedCallback);
     }
 
     @CalledByNative
-    private boolean requestDrawGL(boolean waitForCompletion) {
-        return mNativeGLDelegate.requestDrawGL(null, waitForCompletion, mContainerView, null);
+    private boolean requestInvokeGL(boolean waitForCompletion) {
+        return mNativeDrawGLFunctor.requestInvokeGL(mContainerView, waitForCompletion);
     }
 
     @CalledByNative
     private void detachFunctorFromView() {
-        mNativeGLDelegate.detachGLFunctor();
+        mNativeDrawGLFunctor.detach(mContainerView);
         mContainerView.invalidate();
     }
 
     public void deleteHardwareRenderer() {
         nativeDeleteHardwareRenderer(mNativeAwGLFunctor);
     }
 
     public long getAwDrawGLViewContext() {
         return nativeGetAwDrawGLViewContext(mNativeAwGLFunctor);
     }
 
     private native void nativeDeleteHardwareRenderer(long nativeAwGLFunctor);
     private native long nativeGetAwDrawGLViewContext(long nativeAwGLFunctor);
 
     private static native long nativeGetAwDrawGLFunction();
     private static native void nativeDestroy(long nativeAwGLFunctor);
     private static native long nativeCreate(AwGLFunctor javaProxy);
 }