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

android_webview/java/src/org/chromium/android_webview/AwContents.java

 // Copyright 2012 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.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
@@ skipping 304 matching lines @@
     // Do not use directly, call isDestroyed() instead.
     private boolean mIsDestroyed = false;
 
     private static String sCurrentLocale = "";
 
     private static final class DestroyRunnable implements Runnable {
         private final long mNativeAwContents;
         // Hold onto a reference to the window (via its wrapper), so that it is not destroyed
         // until we are done here.
         private final WindowAndroidWrapper mWindowAndroid;
-        private final Runnable mAwGLFunctorDestroyRunnable;
+        private final Object mAwGLFunctorNativeLifetimeObject;
 
         private DestroyRunnable(long nativeAwContents, WindowAndroidWrapper windowAndroid,
                 AwGLFunctor awGLFunctor) {
             mNativeAwContents = nativeAwContents;
             mWindowAndroid = windowAndroid;
-            mAwGLFunctorDestroyRunnable = awGLFunctor.getDestroyRunnable();
+            mAwGLFunctorNativeLifetimeObject = awGLFunctor.getNativeLifetimeObject();
         }
         @Override
         public void run() {
             nativeDestroy(mNativeAwContents);
-            mAwGLFunctorDestroyRunnable.run();
         }
     }
 
     /**
      * A class that stores the state needed to enter and exit fullscreen.
      */
     private static class FullScreenTransitionsState {
         private final ViewGroup mInitialContainerView;
         private final InternalAccessDelegate mInitialInternalAccessAdapter;
         private final AwViewMethods mInitialAwViewMethods;
@@ skipping 2949 matching lines @@
             long resources);
 
     private native void nativePostMessageToFrame(long nativeAwContents, String frameId,
             String message, String targetOrigin, int[] msgPorts);
 
     private native void nativeCreateMessageChannel(long nativeAwContents, AwMessagePort[] ports);
 
     private native void nativeGrantFileSchemeAccesstoChildProcess(long nativeAwContents);
     private native void nativeResumeLoadingCreatedPopupWebContents(long nativeAwContents);
 }