Transfer DrawGLFunctor ownership from AwContents to AwGLFunctor

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

 // Copyright 2014 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 com.android.webview.chromium;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.assist.AssistStructure.ViewNode;
 import android.content.Context;
@@ skipping 254 matching lines @@
                 }
             }
         });
     }
 
     private void initForReal() {
         AwContentsStatics.setRecordFullDocument(sRecordWholeDocumentEnabledByApi
                 || mAppTargetSdkVersion < Build.VERSION_CODES.LOLLIPOP);
 
         mAwContents = new AwContents(mFactory.getBrowserContext(), mWebView, mContext,
-                new InternalAccessAdapter(), new WebViewNativeGLDelegate(), mContentsClientAdapter,
-                mWebSettings.getAwSettings());
+                new InternalAccessAdapter(), new WebViewNativeDrawGLFunctorFactory(),
+                mContentsClientAdapter, mWebSettings.getAwSettings());
 
         if (mAppTargetSdkVersion >= Build.VERSION_CODES.KITKAT) {
             // On KK and above, favicons are automatically downloaded as the method
             // old apps use to enable that behavior is deprecated.
             AwContents.setShouldDownloadFavicons();
         }
 
         if (mAppTargetSdkVersion < Build.VERSION_CODES.LOLLIPOP) {
             // Prior to Lollipop, JavaScript objects injected via addJavascriptInterface
             // were not inspectable.
@@ skipping 1946 matching lines @@
             return;
         }
         mAwContents.computeScroll();
     }
 
     @Override
     public PrintDocumentAdapter createPrintDocumentAdapter(String documentName) {
         checkThread();
         return new AwPrintDocumentAdapter(mAwContents.getPdfExporter(), documentName);
     }
-
-    // AwContents.NativeGLDelegate implementation --------------------------------------
-    private class WebViewNativeGLDelegate implements AwContents.NativeGLDelegate {
+    // AwContents.NativeDrawGLFunctorFactory implementation ----------------------------------
+    private class WebViewNativeDrawGLFunctorFactory
+            implements AwContents.NativeDrawGLFunctorFactory {
         @Override
-        public boolean supportsDrawGLFunctorReleasedCallback() {
-            return DrawGLFunctor.supportsDrawGLFunctorReleasedCallback();
-        }
-
-        @Override
-        public boolean requestDrawGL(Canvas canvas, boolean waitForCompletion, View containerView,
-                Runnable releasedCallback) {
-            if (mGLfunctor == null) {
-                mGLfunctor = new DrawGLFunctor(
-                        mAwContents.getAwDrawGLViewContext(), mFactory.getWebViewDelegate());
-            }
-            return mGLfunctor.requestDrawGL(
-                    canvas, containerView, waitForCompletion, releasedCallback);
-        }
-
-        @Override
-        public void detachGLFunctor() {
-            if (mGLfunctor != null) {
-                mGLfunctor.detach();
-            }
+        public AwContents.NativeDrawGLFunctor createFunctor(long context) {
+            return new DrawGLFunctor(context, mFactory.getWebViewDelegate());
         }
     }
 
     // AwContents.InternalAccessDelegate implementation --------------------------------------
     private class InternalAccessAdapter implements AwContents.InternalAccessDelegate {
         @Override
         public boolean super_onKeyUp(int arg0, KeyEvent arg1) {
             // Intentional no-op
             return false;
         }
@@ skipping 85 matching lines @@
         mAwContents.extractSmartClipData(x, y, width, height);
     }
 
     // Implements SmartClipProvider
     @Override
     public void setSmartClipResultHandler(final Handler resultHandler) {
         checkThread();
         mAwContents.setSmartClipResultHandler(resultHandler);
     }
 }