diff options
| -rw-r--r-- | api/system-current.txt | 10 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewDelegate.java | 13 | ||||
| -rw-r--r-- | graphics/java/android/graphics/RecordingCanvas.java | 4 |
3 files changed, 21 insertions, 6 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 7518bb795b97..ae0670688715 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9637,16 +9637,16 @@ package android.webkit { public final class WebViewDelegate { method public void addWebViewAssetPath(android.content.Context); - method public void callDrawGlFunction(android.graphics.Canvas, long); - method public void callDrawGlFunction(@NonNull android.graphics.Canvas, long, @Nullable Runnable); - method public boolean canInvokeDrawGlFunctor(android.view.View); - method public void detachDrawGlFunctor(android.view.View, long); + method @Deprecated public void callDrawGlFunction(android.graphics.Canvas, long); + method @Deprecated public void callDrawGlFunction(@NonNull android.graphics.Canvas, long, @Nullable Runnable); + method @Deprecated public boolean canInvokeDrawGlFunctor(android.view.View); + method @Deprecated public void detachDrawGlFunctor(android.view.View, long); method public void drawWebViewFunctor(@NonNull android.graphics.Canvas, int); method public android.app.Application getApplication(); method public String getDataDirectorySuffix(); method public String getErrorString(android.content.Context, int); method public int getPackageId(android.content.res.Resources, String); - method public void invokeDrawGlFunctor(android.view.View, long, boolean); + method @Deprecated public void invokeDrawGlFunctor(android.view.View, long, boolean); method public boolean isMultiProcessEnabled(); method public boolean isTraceTagEnabled(); method public void setOnTraceEnabledChangeListener(android.webkit.WebViewDelegate.OnTraceEnabledChangeListener); diff --git a/core/java/android/webkit/WebViewDelegate.java b/core/java/android/webkit/WebViewDelegate.java index ef69b6333cce..3d3d94198448 100644 --- a/core/java/android/webkit/WebViewDelegate.java +++ b/core/java/android/webkit/WebViewDelegate.java @@ -79,7 +79,10 @@ public final class WebViewDelegate { /** * Returns {@code true} if the draw GL functor can be invoked (see {@link #invokeDrawGlFunctor}) * and {@code false} otherwise. + * + * @deprecated Use {@link #drawWebViewFunctor(Canvas, int)} */ + @Deprecated public boolean canInvokeDrawGlFunctor(View containerView) { return true; } @@ -90,7 +93,9 @@ public final class WebViewDelegate { * * @param nativeDrawGLFunctor the pointer to the native functor that implements * system/core/include/utils/Functor.h + * @deprecated Use {@link #drawWebViewFunctor(Canvas, int)} */ + @Deprecated public void invokeDrawGlFunctor(View containerView, long nativeDrawGLFunctor, boolean waitForCompletion) { ViewRootImpl.invokeFunctor(nativeDrawGLFunctor, waitForCompletion); @@ -105,7 +110,9 @@ public final class WebViewDelegate { * @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 + * @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. @@ -126,7 +133,9 @@ public final class WebViewDelegate { * @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 + * @deprecated Use {@link #drawWebViewFunctor(Canvas, int)} */ + @Deprecated public void callDrawGlFunction(@NonNull Canvas canvas, long nativeDrawGLFunctor, @Nullable Runnable releasedRunnable) { if (!(canvas instanceof RecordingCanvas)) { @@ -139,7 +148,7 @@ public final class WebViewDelegate { /** * Call webview draw functor. See API in draw_fn.h. - * @param canvas a hardware accelerated canvas (see {@link Canvas#isHardwareAccelerated()}). + * @param canvas a {@link RecordingCanvas}. * @param functor created by AwDrawFn_CreateFunctor in draw_fn.h. */ public void drawWebViewFunctor(@NonNull Canvas canvas, int functor) { @@ -156,7 +165,9 @@ public final class WebViewDelegate { * * @param nativeDrawGLFunctor the pointer to the native functor that implements * system/core/include/utils/Functor.h + * @deprecated Use {@link #drawWebViewFunctor(Canvas, int)} */ + @Deprecated public void detachDrawGlFunctor(View containerView, long nativeDrawGLFunctor) { ViewRootImpl viewRootImpl = containerView.getViewRootImpl(); if (nativeDrawGLFunctor != 0 && viewRootImpl != null) { diff --git a/graphics/java/android/graphics/RecordingCanvas.java b/graphics/java/android/graphics/RecordingCanvas.java index 30466e1f6b1f..c0e0a24583ec 100644 --- a/graphics/java/android/graphics/RecordingCanvas.java +++ b/graphics/java/android/graphics/RecordingCanvas.java @@ -166,7 +166,9 @@ public final class RecordingCanvas extends DisplayListCanvas { * @param drawGLFunction A native function pointer * * @hide + * @deprecated Use {@link #drawWebViewFunctor(int)} */ + @Deprecated public void callDrawGLFunction2(long drawGLFunction) { nCallDrawGLFunction(mNativeCanvasWrapper, drawGLFunction, null); } @@ -184,7 +186,9 @@ public final class RecordingCanvas extends DisplayListCanvas { * canvas's display list has been released. * * @hide + * @deprecated Use {@link #drawWebViewFunctor(int)} */ + @Deprecated public void drawGLFunctor2(long drawGLFunctor, @Nullable Runnable releasedCallback) { nCallDrawGLFunction(mNativeCanvasWrapper, drawGLFunctor, releasedCallback); } |