aw: Use functor callback for lifetime management

android_webview/glue/java/src/com/android/webview/chromium/WebViewDelegateFactory.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.TargetApi;
 import android.app.Application;
 import android.content.Context;
 import android.content.ContextWrapper;
@@ skipping 41 matching lines @@
         /** @see android.webkit.WebViewDelegate#isTraceTagEnabled */
         boolean isTraceTagEnabled();
 
         /** @see android.webkit.WebViewDelegate#canInvokeDrawGlFunctor */
         boolean canInvokeDrawGlFunctor(View containerView);
 
         /** @see android.webkit.WebViewDelegate#invokeDrawGlFunctor */
         void invokeDrawGlFunctor(
                 View containerView, long nativeDrawGLFunctor, boolean waitForCompletion);
 
-        /** @see android.webkit.WebViewDelegate#callDrawGlFunction */
+        /** @see android.webkit.WebViewDelegate#callDrawGlFunction. Available API level 23 and
+         * below.
+         */
         void callDrawGlFunction(Canvas canvas, long nativeDrawGLFunctor);
 
+        /** @see android.webkit.WebViewDelegate#callDrawGlFunction. Available above API level 23
+         * only. */
+        void callDrawGlFunction(Canvas canvas, long nativeDrawGLFunctor, Runnable releasedRunnable);
+
         /** @see android.webkit.WebViewDelegate#detachDrawGlFunctor */
         void detachDrawGlFunctor(View containerView, long nativeDrawGLFunctor);
 
         /** @see android.webkit.WebViewDelegate#getPackageId */
         int getPackageId(Resources resources, String packageName);
 
         /** @see android.webkit.WebViewDelegate#getApplication */
         Application getApplication();
 
         /** @see android.webkit.WebViewDelegate#getErrorString */
@@ skipping 62 matching lines @@
                 View containerView, long nativeDrawGLFunctor, boolean waitForCompletion) {
             mDelegate.invokeDrawGlFunctor(containerView, nativeDrawGLFunctor, waitForCompletion);
         }
 
         @Override
         public void callDrawGlFunction(Canvas canvas, long nativeDrawGLFunctor) {
             mDelegate.callDrawGlFunction(canvas, nativeDrawGLFunctor);
         }
 
         @Override
+        public void callDrawGlFunction(
+                Canvas canvas, long nativeDrawGLFunctor, Runnable releasedRunnable) {
+            throw new RuntimeException("Call not supported");
+        }
+
+        @Override
         public void detachDrawGlFunctor(View containerView, long nativeDrawGLFunctor) {
             mDelegate.detachDrawGlFunctor(containerView, nativeDrawGLFunctor);
         }
 
         @Override
         public int getPackageId(Resources resources, String packageName) {
             return mDelegate.getPackageId(resources, packageName);
         }
 
         @Override
@@ skipping 141 matching lines @@
         @Override
         public void callDrawGlFunction(Canvas canvas, long nativeDrawGLFunctor) {
             try {
                 mCallDrawGLFunctionMethod.invoke(canvas, nativeDrawGLFunctor);
             } catch (Exception e) {
                 throw new RuntimeException("Invalid reflection", e);
             }
         }
 
         @Override
+        public void callDrawGlFunction(
+                Canvas canvas, long nativeDrawGLFunctor, Runnable releasedRunnable) {
+            throw new RuntimeException("Call not supported");
+        }
+
+        @Override
         public void detachDrawGlFunctor(View containerView, long nativeDrawGLFunctor) {
             try {
                 Object viewRootImpl = mGetViewRootImplMethod.invoke(containerView);
                 if (viewRootImpl != null) {
                     mDetachFunctorMethod.invoke(viewRootImpl, nativeDrawGLFunctor);
                 }
             } catch (Exception e) {
                 throw new RuntimeException("Invalid reflection", e);
             }
         }
@@ skipping 42 matching lines @@
                 // Avoid calling the ContextWrapper.getAssets() proxy
                 // chain, which can return an unexpected AssetManager.
                 mAddAssetPathMethod.invoke(
                         context.getResources().getAssets(), info.applicationInfo.sourceDir);
             } catch (Exception e) {
                 throw new RuntimeException("Invalid reflection", e);
             }
         }
     }
 }