Remove legacy callDrawGlFunction2 from HWUI

Bug: 151439970
Test: CtsUiRenderingTestCases passes

Change-Id: I1c29df17bb6e8b078467edf73cb3547db6948cdd

1 files changed, 8 insertions, 40 deletions

diff --git a/core/java/android/webkit/WebViewDelegate.java b/core/java/android/webkit/WebViewDelegate.java
index df86926a95dc..950dc7300ba9 100644
--- a/core/java/android/webkit/WebViewDelegate.java
+++ b/core/java/android/webkit/WebViewDelegate.java
@@ -77,73 +77,41 @@ public final class WebViewDelegate {
     }
 
     /**
-     * Returns {@code true} if the draw GL functor can be invoked (see {@link #invokeDrawGlFunctor})
-     * and {@code false} otherwise.
-     *
+     * Throws {@link UnsupportedOperationException}
      * @deprecated Use {@link #drawWebViewFunctor(Canvas, int)}
      */
     @Deprecated
     public boolean canInvokeDrawGlFunctor(View containerView) {
-        return true;
+        throw new UnsupportedOperationException();
     }
 
     /**
-     * Invokes the draw GL functor. If waitForCompletion is {@code false} the functor
-     * may be invoked asynchronously.
-     *
-     * @param nativeDrawGLFunctor the pointer to the native functor that implements
-     *        system/core/include/utils/Functor.h
+     * Throws {@link UnsupportedOperationException}
      * @deprecated Use {@link #drawWebViewFunctor(Canvas, int)}
      */
     @Deprecated
     public void invokeDrawGlFunctor(View containerView, long nativeDrawGLFunctor,
             boolean waitForCompletion) {
-        ViewRootImpl.invokeFunctor(nativeDrawGLFunctor, waitForCompletion);
+        throw new UnsupportedOperationException();
     }
 
     /**
-     * Calls the function specified with the nativeDrawGLFunctor functor pointer. This
-     * functionality is used by the WebView for calling into their renderer from the
-     * framework display lists.
-     *
-     * @param canvas a hardware accelerated canvas (see {@link Canvas#isHardwareAccelerated()})
-     * @param nativeDrawGLFunctor the pointer to the native functor that implements
-     *        system/core/include/utils/Functor.h
-     * @throws IllegalArgumentException if the canvas is not hardware accelerated
+     * Throws {@link UnsupportedOperationException}
      * @deprecated Use {@link #drawWebViewFunctor(Canvas, int)}
      */
     @Deprecated
     public void callDrawGlFunction(Canvas canvas, long nativeDrawGLFunctor) {
-        if (!(canvas instanceof RecordingCanvas)) {
-            // Canvas#isHardwareAccelerated() is only true for subclasses of HardwareCanvas.
-            throw new IllegalArgumentException(canvas.getClass().getName()
-                    + " is not a DisplayList canvas");
-        }
-        ((RecordingCanvas) canvas).drawGLFunctor2(nativeDrawGLFunctor, null);
+        throw new UnsupportedOperationException();
     }
 
     /**
-     * Calls the function specified with the nativeDrawGLFunctor functor pointer. This
-     * functionality is used by the WebView for calling into their renderer from the
-     * framework display lists.
-     *
-     * @param canvas a hardware accelerated canvas (see {@link Canvas#isHardwareAccelerated()})
-     * @param nativeDrawGLFunctor the pointer to the native functor that implements
-     *        system/core/include/utils/Functor.h
-     * @param releasedRunnable Called when this nativeDrawGLFunctor is no longer referenced by this
-     *        canvas, so is safe to be destroyed.
-     * @throws IllegalArgumentException if the canvas is not hardware accelerated
+     * Throws {@link UnsupportedOperationException}
      * @deprecated Use {@link #drawWebViewFunctor(Canvas, int)}
      */
     @Deprecated
     public void callDrawGlFunction(@NonNull Canvas canvas, long nativeDrawGLFunctor,
             @Nullable Runnable releasedRunnable) {
-        if (!(canvas instanceof RecordingCanvas)) {
-            // Canvas#isHardwareAccelerated() is only true for subclasses of HardwareCanvas.
-            throw new IllegalArgumentException(canvas.getClass().getName()
-                    + " is not a DisplayList canvas");
-        }
-        ((RecordingCanvas) canvas).drawGLFunctor2(nativeDrawGLFunctor, releasedRunnable);
+        throw new UnsupportedOperationException();
     }
 
     /**