[Merge M50] aw: Do not destroy functor in destroy

android_webview/glue/java/src/com/android/webview/chromium/DrawGLFunctor.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.graphics.Canvas;
 import android.os.Build;
 import android.view.View;
 
 import com.android.webview.chromium.WebViewDelegateFactory.WebViewDelegate;
 
 import org.chromium.content.common.CleanupReference;
 
 /**
  * Simple Java abstraction and wrapper for the native DrawGLFunctor flow.
  * An instance of this class can be constructed, bound to a single view context (i.e. AwContennts)
  * and then drawn and detached from the view tree any number of times (using requestDrawGL and
- * detach respectively). Then when finished with, it can be explicitly released by calling
- * destroy() or will clean itself up as required via finalizer / CleanupReference.
+ * detach respectively).
  */
 class DrawGLFunctor {
     private static final String TAG = DrawGLFunctor.class.getSimpleName();
 
     // Pointer to native side instance
     private CleanupReference mCleanupReference;
     private DestroyRunnable mDestroyRunnable;
     private final long mNativeDrawGLFunctor;
     private WebViewDelegate mWebViewDelegate;
     View mContainerView;
 
     public DrawGLFunctor(long viewContext, WebViewDelegate webViewDelegate) {
         mNativeDrawGLFunctor = nativeCreateGLFunctor(viewContext);
         mDestroyRunnable = new DestroyRunnable(mNativeDrawGLFunctor);
         mCleanupReference = new CleanupReference(this, mDestroyRunnable);
         mWebViewDelegate = webViewDelegate;
     }
 
-    public void destroy() {
-        detach();
-        if (mCleanupReference != null) {
-            mCleanupReference.cleanupNow();
-            mCleanupReference = null;
-            mDestroyRunnable = null;
-            mWebViewDelegate = null;
-            mContainerView = null;
-        }
-    }
-
     public void detach() {
         if (mWebViewDelegate != null && mContainerView != null) {
             mWebViewDelegate.detachDrawGlFunctor(mContainerView, mNativeDrawGLFunctor);
         }
     }
 
     private static final boolean sSupportFunctorReleasedCallback =
             (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) || "N".equals(Build.VERSION.CODENAME);
     public boolean requestDrawGL(Canvas canvas, View containerView, boolean waitForCompletion,
             Runnable releasedCallback) {
@@ skipping 54 matching lines @@
             assert mNativeDrawGLFunctor != 0;
             nativeDestroyGLFunctor(mNativeDrawGLFunctor);
             mNativeDrawGLFunctor = 0;
         }
     }
 
     private static native long nativeCreateGLFunctor(long viewContext);
     private static native void nativeDestroyGLFunctor(long functor);
     private static native void nativeSetChromiumAwDrawGLFunction(long functionPointer);
 }