From d443f36957a2f8a6aa295bd88a5bf7886d56a064 Mon Sep 17 00:00:00 2001
From: Bo Liu <boliu@google.com>
Date: Fri, 22 Apr 2016 13:21:55 -0700
Subject: Revert "Expose setDrawGLFunctionDetachedCallback to webview"

This reverts commit ee34ef1633592e31d4ea99c3a41492a82a970c11.

This API is no longer needed by webview since 51.0.2704.22.
So remove this API. Note that this system API has never shipped
so it's ok to simply remove it.

Original description:
> Expose setDrawGLFunctionDetachedCallback to webview
>
> Add WebViewDelegate.setDrawGLFunctionDetachedCallback system API that's
> used for webview to receive the functor detach callback.
>
> BUG: 27709981
> Change-Id: Ie6b5e445c0090a181f94fcd2ec1ea77095c9cb03

BUG: 27709981
Change-Id: I9920dbedc6a280b4a19a8715832c4d2f64a7a7be
---
 api/system-current.txt                        |  1 -
 core/java/android/view/View.java              | 15 ---------------
 core/java/android/webkit/WebViewDelegate.java | 18 ------------------
 3 files changed, 34 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 06d95efe91be..c89d55be84c1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -48895,7 +48895,6 @@ package android.webkit {
     method public int getPackageId(android.content.res.Resources, java.lang.String);
     method public void invokeDrawGlFunctor(android.view.View, long, boolean);
     method public boolean isTraceTagEnabled();
-    method public java.lang.Runnable setDrawGlFunctionDetachedCallback(android.view.View, java.lang.Runnable);
     method public void setOnTraceEnabledChangeListener(android.webkit.WebViewDelegate.OnTraceEnabledChangeListener);
   }
 
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 6e0175f3f0a4..d0cd4fc6e24e 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -3899,7 +3899,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      * cleanup.
      */
     final RenderNode mRenderNode;
-    private Runnable mRenderNodeDetachedCallback;
 
     /**
      * Set to true when the view is sending hover accessibility events because it
@@ -16058,20 +16057,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      * @hide
      */
     public void onRenderNodeDetached(RenderNode renderNode) {
-        if (renderNode == mRenderNode && mRenderNodeDetachedCallback != null) {
-            mRenderNodeDetachedCallback.run();
-        }
-    }
-
-    /**
-     * Set callback for functor detach. Exposed to WebView through WebViewDelegate.
-     * Should not be used otherwise.
-     * @hide
-     */
-    public final Runnable setRenderNodeDetachedCallback(@Nullable Runnable callback) {
-        Runnable oldCallback = mRenderNodeDetachedCallback;
-        mRenderNodeDetachedCallback = callback;
-        return oldCallback;
     }
 
     /**
diff --git a/core/java/android/webkit/WebViewDelegate.java b/core/java/android/webkit/WebViewDelegate.java
index 85d7cd0ced60..9e73af273c35 100644
--- a/core/java/android/webkit/WebViewDelegate.java
+++ b/core/java/android/webkit/WebViewDelegate.java
@@ -130,24 +130,6 @@ public final class WebViewDelegate {
         ((DisplayListCanvas) canvas).drawGLFunctor2(nativeDrawGLFunctor, releasedRunnable);
     }
 
-    /**
-     * Set the Runnable callback the DrawGlFunction functor is detached and free to be destroyed.
-     * This will replace the previous callback, if any.
-     *
-     * @param view The view to set the callback. Should be the view where onDraw inserted
-     *        DrawGLFunctor.
-     * @param callback The new callback to set on the view.
-     * @throws IllegalArgumentException if view is null.
-     * @return The previous callback on this view.
-     */
-    public Runnable setDrawGlFunctionDetachedCallback(
-        @NonNull View view, @Nullable Runnable callback) {
-        if (view == null) {
-            throw new IllegalArgumentException("View cannot be null");
-        }
-        return view.setRenderNodeDetachedCallback(callback);
-    }
-
     /**
      * Detaches the draw GL functor.
      *
-- 
cgit v1.2.3-59-g8ed1b