From dcc3630100b406e4e6cb18f00d39059690153292 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Fri, 9 Dec 2016 15:10:39 -0500 Subject: [PATCH] Remove Rasterizer and its subclasses from the public API. Test: compile Bug: 14650725 Change-Id: I99e1942d4d1b85f4efdcb3faf3fee1aa6c839b7e --- api/current.txt | 18 ---- api/removed.txt | 24 +++++ api/system-current.txt | 18 ---- api/system-removed.txt | 24 +++++ api/test-current.txt | 18 ---- api/test-removed.txt | 24 +++++ .../android/text/style/RasterizerSpan.java | 3 + core/jni/Android.mk | 1 - core/jni/AndroidRuntime.cpp | 4 - core/jni/android/graphics/Paint.cpp | 8 -- core/jni/android/graphics/Rasterizer.cpp | 101 ------------------ .../android/graphics/LayerRasterizer.java | 18 ++-- graphics/java/android/graphics/Paint.java | 19 +--- .../java/android/graphics/Rasterizer.java | 13 +-- 14 files changed, 90 insertions(+), 203 deletions(-) delete mode 100644 core/jni/android/graphics/Rasterizer.cpp diff --git a/api/current.txt b/api/current.txt index c294d8ae4b974..5a5eb25944cc3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12245,12 +12245,6 @@ package android.graphics { enum_constant public static final android.graphics.Interpolator.Result NORMAL; } - public deprecated class LayerRasterizer extends android.graphics.Rasterizer { - ctor public LayerRasterizer(); - method public void addLayer(android.graphics.Paint, float, float); - method public void addLayer(android.graphics.Paint); - } - public class LightingColorFilter extends android.graphics.ColorFilter { ctor public LightingColorFilter(int, int); } @@ -12412,7 +12406,6 @@ package android.graphics { method public int getOffsetForAdvance(char[], int, int, int, int, boolean, float); method public int getOffsetForAdvance(java.lang.CharSequence, int, int, int, int, boolean, float); method public android.graphics.PathEffect getPathEffect(); - method public deprecated android.graphics.Rasterizer getRasterizer(); method public float getRunAdvance(char[], int, int, int, int, boolean, int); method public float getRunAdvance(java.lang.CharSequence, int, int, int, int, boolean, int); method public android.graphics.Shader getShader(); @@ -12469,7 +12462,6 @@ package android.graphics { method public void setLinearText(boolean); method public android.graphics.MaskFilter setMaskFilter(android.graphics.MaskFilter); method public android.graphics.PathEffect setPathEffect(android.graphics.PathEffect); - method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer); method public android.graphics.Shader setShader(android.graphics.Shader); method public void setShadowLayer(float, float, float, int); method public void setStrikeThruText(boolean); @@ -12776,10 +12768,6 @@ package android.graphics { ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode); } - public deprecated class Rasterizer { - ctor public Rasterizer(); - } - public final class Rect implements android.os.Parcelable { ctor public Rect(); ctor public Rect(int, int, int, int); @@ -39952,12 +39940,6 @@ package android.text.style { method public void writeToParcel(android.os.Parcel, int); } - public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance { - ctor public RasterizerSpan(android.graphics.Rasterizer); - method public android.graphics.Rasterizer getRasterizer(); - method public void updateDrawState(android.text.TextPaint); - } - public class RelativeSizeSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan { ctor public RelativeSizeSpan(float); ctor public RelativeSizeSpan(android.os.Parcel); diff --git a/api/removed.txt b/api/removed.txt index 683a695ef8a02..10e6eb5e60d86 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -78,10 +78,25 @@ package android.graphics { enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET; } + public deprecated class LayerRasterizer extends android.graphics.Rasterizer { + ctor public LayerRasterizer(); + method public void addLayer(android.graphics.Paint, float, float); + method public void addLayer(android.graphics.Paint); + } + + public class Paint { + method public deprecated android.graphics.Rasterizer getRasterizer(); + method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer); + } + public deprecated class PixelXorXfermode extends android.graphics.Xfermode { ctor public PixelXorXfermode(int); } + public class Rasterizer { + ctor public Rasterizer(); + } + } package android.location { @@ -393,6 +408,15 @@ package android.text.format { } +package android.text.style { + + public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance { + ctor public RasterizerSpan(android.graphics.Rasterizer); + method public android.graphics.Rasterizer getRasterizer(); + } + +} + package android.util { public deprecated class FloatMath { diff --git a/api/system-current.txt b/api/system-current.txt index a3672b3145b17..d71026ade09a4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -12732,12 +12732,6 @@ package android.graphics { enum_constant public static final android.graphics.Interpolator.Result NORMAL; } - public deprecated class LayerRasterizer extends android.graphics.Rasterizer { - ctor public LayerRasterizer(); - method public void addLayer(android.graphics.Paint, float, float); - method public void addLayer(android.graphics.Paint); - } - public class LightingColorFilter extends android.graphics.ColorFilter { ctor public LightingColorFilter(int, int); } @@ -12899,7 +12893,6 @@ package android.graphics { method public int getOffsetForAdvance(char[], int, int, int, int, boolean, float); method public int getOffsetForAdvance(java.lang.CharSequence, int, int, int, int, boolean, float); method public android.graphics.PathEffect getPathEffect(); - method public deprecated android.graphics.Rasterizer getRasterizer(); method public float getRunAdvance(char[], int, int, int, int, boolean, int); method public float getRunAdvance(java.lang.CharSequence, int, int, int, int, boolean, int); method public android.graphics.Shader getShader(); @@ -12956,7 +12949,6 @@ package android.graphics { method public void setLinearText(boolean); method public android.graphics.MaskFilter setMaskFilter(android.graphics.MaskFilter); method public android.graphics.PathEffect setPathEffect(android.graphics.PathEffect); - method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer); method public android.graphics.Shader setShader(android.graphics.Shader); method public void setShadowLayer(float, float, float, int); method public void setStrikeThruText(boolean); @@ -13263,10 +13255,6 @@ package android.graphics { ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode); } - public deprecated class Rasterizer { - ctor public Rasterizer(); - } - public final class Rect implements android.os.Parcelable { ctor public Rect(); ctor public Rect(int, int, int, int); @@ -43140,12 +43128,6 @@ package android.text.style { method public void writeToParcel(android.os.Parcel, int); } - public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance { - ctor public RasterizerSpan(android.graphics.Rasterizer); - method public android.graphics.Rasterizer getRasterizer(); - method public void updateDrawState(android.text.TextPaint); - } - public class RelativeSizeSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan { ctor public RelativeSizeSpan(float); ctor public RelativeSizeSpan(android.os.Parcel); diff --git a/api/system-removed.txt b/api/system-removed.txt index 98e7953b6b257..0919b8f4d275d 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -76,10 +76,25 @@ package android.graphics { enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET; } + public deprecated class LayerRasterizer extends android.graphics.Rasterizer { + ctor public LayerRasterizer(); + method public void addLayer(android.graphics.Paint, float, float); + method public void addLayer(android.graphics.Paint); + } + + public class Paint { + method public deprecated android.graphics.Rasterizer getRasterizer(); + method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer); + } + public deprecated class PixelXorXfermode extends android.graphics.Xfermode { ctor public PixelXorXfermode(int); } + public class Rasterizer { + ctor public Rasterizer(); + } + } package android.location { @@ -387,6 +402,15 @@ package android.text.format { } +package android.text.style { + + public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance { + ctor public RasterizerSpan(android.graphics.Rasterizer); + method public android.graphics.Rasterizer getRasterizer(); + } + +} + package android.util { public deprecated class FloatMath { diff --git a/api/test-current.txt b/api/test-current.txt index 11f1c5c99c11c..9f39f46288dfb 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -12276,12 +12276,6 @@ package android.graphics { enum_constant public static final android.graphics.Interpolator.Result NORMAL; } - public deprecated class LayerRasterizer extends android.graphics.Rasterizer { - ctor public LayerRasterizer(); - method public void addLayer(android.graphics.Paint, float, float); - method public void addLayer(android.graphics.Paint); - } - public class LightingColorFilter extends android.graphics.ColorFilter { ctor public LightingColorFilter(int, int); } @@ -12443,7 +12437,6 @@ package android.graphics { method public int getOffsetForAdvance(char[], int, int, int, int, boolean, float); method public int getOffsetForAdvance(java.lang.CharSequence, int, int, int, int, boolean, float); method public android.graphics.PathEffect getPathEffect(); - method public deprecated android.graphics.Rasterizer getRasterizer(); method public float getRunAdvance(char[], int, int, int, int, boolean, int); method public float getRunAdvance(java.lang.CharSequence, int, int, int, int, boolean, int); method public android.graphics.Shader getShader(); @@ -12500,7 +12493,6 @@ package android.graphics { method public void setLinearText(boolean); method public android.graphics.MaskFilter setMaskFilter(android.graphics.MaskFilter); method public android.graphics.PathEffect setPathEffect(android.graphics.PathEffect); - method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer); method public android.graphics.Shader setShader(android.graphics.Shader); method public void setShadowLayer(float, float, float, int); method public void setStrikeThruText(boolean); @@ -12807,10 +12799,6 @@ package android.graphics { ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode); } - public deprecated class Rasterizer { - ctor public Rasterizer(); - } - public final class Rect implements android.os.Parcelable { ctor public Rect(); ctor public Rect(int, int, int, int); @@ -40051,12 +40039,6 @@ package android.text.style { method public void writeToParcel(android.os.Parcel, int); } - public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance { - ctor public RasterizerSpan(android.graphics.Rasterizer); - method public android.graphics.Rasterizer getRasterizer(); - method public void updateDrawState(android.text.TextPaint); - } - public class RelativeSizeSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan { ctor public RelativeSizeSpan(float); ctor public RelativeSizeSpan(android.os.Parcel); diff --git a/api/test-removed.txt b/api/test-removed.txt index 683a695ef8a02..10e6eb5e60d86 100644 --- a/api/test-removed.txt +++ b/api/test-removed.txt @@ -78,10 +78,25 @@ package android.graphics { enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET; } + public deprecated class LayerRasterizer extends android.graphics.Rasterizer { + ctor public LayerRasterizer(); + method public void addLayer(android.graphics.Paint, float, float); + method public void addLayer(android.graphics.Paint); + } + + public class Paint { + method public deprecated android.graphics.Rasterizer getRasterizer(); + method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer); + } + public deprecated class PixelXorXfermode extends android.graphics.Xfermode { ctor public PixelXorXfermode(int); } + public class Rasterizer { + ctor public Rasterizer(); + } + } package android.location { @@ -393,6 +408,15 @@ package android.text.format { } +package android.text.style { + + public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance { + ctor public RasterizerSpan(android.graphics.Rasterizer); + method public android.graphics.Rasterizer getRasterizer(); + } + +} + package android.util { public deprecated class FloatMath { diff --git a/core/java/android/text/style/RasterizerSpan.java b/core/java/android/text/style/RasterizerSpan.java index cae96403b2e5d..f0be50ab065cd 100644 --- a/core/java/android/text/style/RasterizerSpan.java +++ b/core/java/android/text/style/RasterizerSpan.java @@ -19,6 +19,9 @@ package android.text.style; import android.graphics.Rasterizer; import android.text.TextPaint; +/** + * @removed Rasterizer is not supported for hw-accerlerated and PDF rendering + */ public class RasterizerSpan extends CharacterStyle implements UpdateAppearance { private Rasterizer mRasterizer; diff --git a/core/jni/Android.mk b/core/jni/Android.mk index e447dd25aa80d..44b6e1a71c58b 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -136,7 +136,6 @@ LOCAL_SRC_FILES:= \ android/graphics/PathEffect.cpp \ android/graphics/Picture.cpp \ android/graphics/BitmapRegionDecoder.cpp \ - android/graphics/Rasterizer.cpp \ android/graphics/Region.cpp \ android/graphics/Shader.cpp \ android/graphics/SurfaceTexture.cpp \ diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 1f810ac203ad2..d47c6b72ec0f2 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -121,13 +121,11 @@ extern int register_android_graphics_CanvasProperty(JNIEnv* env); extern int register_android_graphics_ColorFilter(JNIEnv* env); extern int register_android_graphics_DrawFilter(JNIEnv* env); extern int register_android_graphics_FontFamily(JNIEnv* env); -extern int register_android_graphics_LayerRasterizer(JNIEnv*); extern int register_android_graphics_Matrix(JNIEnv* env); extern int register_android_graphics_Paint(JNIEnv* env); extern int register_android_graphics_Path(JNIEnv* env); extern int register_android_graphics_PathMeasure(JNIEnv* env); extern int register_android_graphics_Picture(JNIEnv*); -extern int register_android_graphics_Rasterizer(JNIEnv* env); extern int register_android_graphics_Region(JNIEnv* env); extern int register_android_graphics_SurfaceTexture(JNIEnv* env); extern int register_android_graphics_drawable_AnimatedVectorDrawable(JNIEnv* env); @@ -1332,7 +1330,6 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_graphics_DrawFilter), REG_JNI(register_android_graphics_FontFamily), REG_JNI(register_android_graphics_Interpolator), - REG_JNI(register_android_graphics_LayerRasterizer), REG_JNI(register_android_graphics_MaskFilter), REG_JNI(register_android_graphics_Matrix), REG_JNI(register_android_graphics_Movie), @@ -1342,7 +1339,6 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_graphics_PathMeasure), REG_JNI(register_android_graphics_PathEffect), REG_JNI(register_android_graphics_Picture), - REG_JNI(register_android_graphics_Rasterizer), REG_JNI(register_android_graphics_Region), REG_JNI(register_android_graphics_Shader), REG_JNI(register_android_graphics_SurfaceTexture), diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index 34568391167dd..dfe809dd7d58b 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -30,7 +30,6 @@ #include "SkMaskFilter.h" #include "SkPath.h" #include "SkPathEffect.h" -#include "SkRasterizer.h" #include "SkShader.h" #include "SkBlendMode.h" #include "unicode/uloc.h" @@ -848,12 +847,6 @@ namespace PaintGlue { return 0; } - static jlong setRasterizer(jlong objHandle, jlong rasterizerHandle) { - Paint* obj = reinterpret_cast(objHandle); - obj->setRasterizer(GraphicsJNI::refNativeRasterizer(rasterizerHandle)); - return reinterpret_cast(obj->getRasterizer()); - } - static jint getTextAlign(jlong objHandle) { Paint* obj = reinterpret_cast(objHandle); return static_cast(obj->getTextAlign()); @@ -1038,7 +1031,6 @@ static const JNINativeMethod methods[] = { {"nSetPathEffect","(JJ)J", (void*) PaintGlue::setPathEffect}, {"nSetMaskFilter","(JJ)J", (void*) PaintGlue::setMaskFilter}, {"nSetTypeface","(JJ)J", (void*) PaintGlue::setTypeface}, - {"nSetRasterizer","(JJ)J", (void*) PaintGlue::setRasterizer}, {"nGetTextAlign","(J)I", (void*) PaintGlue::getTextAlign}, {"nSetTextAlign","(JI)V", (void*) PaintGlue::setTextAlign}, {"nSetTextLocalesByMinikinLangListId","(JI)V", diff --git a/core/jni/android/graphics/Rasterizer.cpp b/core/jni/android/graphics/Rasterizer.cpp deleted file mode 100644 index f4094985177c4..0000000000000 --- a/core/jni/android/graphics/Rasterizer.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/* libs/android_runtime/android/graphics/Rasterizer.cpp -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -// This file was generated from the C++ include file: SkRasterizer.h -// Any changes made to this file will be discarded by the build. -// To change this file, either edit the include, or device/tools/gluemaker/main.cpp, -// or one of the auxilary file specifications in device/tools/gluemaker. - -#include "jni.h" -#include "GraphicsJNI.h" -#include "SkLayerRasterizer.h" -#include "core_jni_helpers.h" - -#include - -// Rasterizer.java holds a pointer (jlong) to this guy -class NativeRasterizer { -public: - NativeRasterizer() {} - virtual ~NativeRasterizer() {} - - // Can return NULL, or a ref to the skia rasterizer. - virtual sk_sp refRasterizer() { return NULL; } -}; - -class NativeLayerRasterizer : public NativeRasterizer { -public: - SkLayerRasterizer::Builder fBuilder; - - virtual sk_sp refRasterizer() { - return fBuilder.snapshot(); - } -}; - -sk_sp GraphicsJNI::refNativeRasterizer(jlong rasterizerHandle) { - NativeRasterizer* nr = reinterpret_cast(rasterizerHandle); - return nr ? nr->refRasterizer() : NULL; -} - -/////////////////////////////////////////////////////////////////////////////// - -namespace android { - -class SkRasterizerGlue { -public: - static void finalizer(JNIEnv* env, jobject clazz, jlong objHandle) { - delete reinterpret_cast(objHandle); - } -}; - -static const JNINativeMethod gRasterizerMethods[] = { - {"finalizer", "(J)V", (void*) SkRasterizerGlue::finalizer} -}; - -int register_android_graphics_Rasterizer(JNIEnv* env) { - return RegisterMethodsOrDie(env, "android/graphics/Rasterizer", gRasterizerMethods, - NELEM(gRasterizerMethods)); -} - -class SkLayerRasterizerGlue { -public: - static jlong create(JNIEnv* env, jobject) { - return reinterpret_cast(new NativeLayerRasterizer); - } - - static void addLayer(JNIEnv* env, jobject, jlong layerHandle, jlong paintHandle, jfloat dx, jfloat dy) { - NativeLayerRasterizer* nr = reinterpret_cast(layerHandle); - const Paint* paint = reinterpret_cast(paintHandle); - SkASSERT(nr); - SkASSERT(paint); - nr->fBuilder.addLayer(*paint, dx, dy); - } -}; - -static const JNINativeMethod gLayerRasterizerMethods[] = { - { "nativeConstructor", "()J", (void*)SkLayerRasterizerGlue::create }, - { "nativeAddLayer", "(JJFF)V", (void*)SkLayerRasterizerGlue::addLayer } -}; - -int register_android_graphics_LayerRasterizer(JNIEnv* env) -{ - return RegisterMethodsOrDie(env, "android/graphics/LayerRasterizer", - gLayerRasterizerMethods, NELEM(gLayerRasterizerMethods)); -} - -} - diff --git a/graphics/java/android/graphics/LayerRasterizer.java b/graphics/java/android/graphics/LayerRasterizer.java index b692ecf9c7f26..25155ab284fb0 100644 --- a/graphics/java/android/graphics/LayerRasterizer.java +++ b/graphics/java/android/graphics/LayerRasterizer.java @@ -16,26 +16,20 @@ package android.graphics; +/** + * @removed feature is not supported by hw-accerlerated or PDF backends + */ @Deprecated public class LayerRasterizer extends Rasterizer { - public LayerRasterizer() { - native_instance = nativeConstructor(); - } + public LayerRasterizer() { } /** Add a new layer (above any previous layers) to the rasterizer. The layer will extract those fields that affect the mask from the specified paint, but will not retain a reference to the paint object itself, so it may be reused without danger of side-effects. */ - public void addLayer(Paint paint, float dx, float dy) { - nativeAddLayer(native_instance, paint.getNativeInstance(), dx, dy); - } + public void addLayer(Paint paint, float dx, float dy) { } - public void addLayer(Paint paint) { - nativeAddLayer(native_instance, paint.getNativeInstance(), 0, 0); - } - - private static native long nativeConstructor(); - private static native void nativeAddLayer(long native_layer, long native_paint, float dx, float dy); + public void addLayer(Paint paint) { } } diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 554e5d2614dd8..fc873c40524f0 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -61,7 +61,6 @@ public class Paint { private ColorFilter mColorFilter; private MaskFilter mMaskFilter; private PathEffect mPathEffect; - private Rasterizer mRasterizer; private Shader mShader; private Typeface mTypeface; private Xfermode mXfermode; @@ -494,7 +493,6 @@ public class Paint { mColorFilter = null; mMaskFilter = null; mPathEffect = null; - mRasterizer = null; mShader = null; mNativeShader = 0; mTypeface = null; @@ -532,7 +530,6 @@ public class Paint { mColorFilter = paint.mColorFilter; mMaskFilter = paint.mMaskFilter; mPathEffect = paint.mPathEffect; - mRasterizer = paint.mRasterizer; mShader = paint.mShader; mNativeShader = paint.mNativeShader; mTypeface = paint.mTypeface; @@ -1164,11 +1161,12 @@ public class Paint { * * @return the paint's rasterizer (or null) * - * @deprecated Rasterizer is not supported by either the HW or PDF backends. + * @deprecated Rasterizer is not supported by either the HW or PDF backends. + * @removed */ @Deprecated public Rasterizer getRasterizer() { - return mRasterizer; + return null; } /** @@ -1181,16 +1179,11 @@ public class Paint { * the paint. * @return rasterizer * - * @deprecated Rasterizer is not supported by either the HW or PDF backends. + * @deprecated Rasterizer is not supported by either the HW or PDF backends. + * @removed */ @Deprecated public Rasterizer setRasterizer(Rasterizer rasterizer) { - long rasterizerNative = 0; - if (rasterizer != null) { - rasterizerNative = rasterizer.native_instance; - } - nSetRasterizer(mNativePaint, rasterizerNative); - mRasterizer = rasterizer; return rasterizer; } @@ -2715,8 +2708,6 @@ public class Paint { @CriticalNative private static native long nSetTypeface(long paintPtr, long typeface); @CriticalNative - private static native long nSetRasterizer(long paintPtr, long rasterizer); - @CriticalNative private static native int nGetTextAlign(long paintPtr); @CriticalNative private static native void nSetTextAlign(long paintPtr, int align); diff --git a/graphics/java/android/graphics/Rasterizer.java b/graphics/java/android/graphics/Rasterizer.java index f6a38fe89eab5..29d82fa1d98bc 100644 --- a/graphics/java/android/graphics/Rasterizer.java +++ b/graphics/java/android/graphics/Rasterizer.java @@ -21,15 +21,10 @@ package android.graphics; -@Deprecated +/** + * @removed feature is not supported by hw-accerlerated or PDF backends + */ public class Rasterizer { - protected void finalize() throws Throwable { - finalizer(native_instance); - native_instance = 0; - } - - private static native void finalizer(long native_instance); - - long native_instance; + protected void finalize() throws Throwable { } }