Merge "Remove unnecessary private API" (03f156e9) · Commits · e / os / android_frameworks_base

core/java/android/view/GLES20Canvas.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -508,13 +508,6 @@ class GLES20Canvas extends HardwareCanvas {

		private static native void nSetMatrix(int renderer, int matrix);

		@Override
		public int getNativeMatrix() {
		return nGetMatrix(mRenderer);
		}

		private static native int nGetMatrix(int renderer);

		@Override
		public void getMatrix(Matrix matrix) {
		nGetMatrix(mRenderer, matrix.native_instance);

+0 −6

Original line number	Diff line number	Diff line
		@@ -289,11 +289,6 @@ static void android_view_GLES20Canvas_setMatrix(JNIEnv* env, jobject clazz,
		renderer->setMatrix(matrix);
		}

		static const float* android_view_GLES20Canvas_getNativeMatrix(JNIEnv* env,
		jobject clazz, OpenGLRenderer* renderer) {
		return renderer->getMatrix();
		}

		static void android_view_GLES20Canvas_getMatrix(JNIEnv* env, jobject clazz,
		OpenGLRenderer* renderer, SkMatrix* matrix) {
		renderer->getMatrix(matrix);
		@@ -776,7 +771,6 @@ static JNINativeMethod gMethods[] = {
		{ "nSkew", "(IFF)V", (void*) android_view_GLES20Canvas_skew },

		{ "nSetMatrix", "(II)V", (void*) android_view_GLES20Canvas_setMatrix },
		{ "nGetMatrix", "(I)I", (void*) android_view_GLES20Canvas_getNativeMatrix },
		{ "nGetMatrix", "(II)V", (void*) android_view_GLES20Canvas_getMatrix },
		{ "nConcatMatrix", "(II)V", (void*) android_view_GLES20Canvas_concatMatrix },

+0 −11

Original line number	Diff line number	Diff line
		@@ -507,17 +507,6 @@ public class Canvas {
		native_getCTM(mNativeCanvas, ctm.native_instance);
		}

		/**
		* Returns a pointer to an internal 4x4 native matrix. The returned
		* pointer is a pointer to an array of 16 floats.
		*
		* @hide
		*/
		@SuppressWarnings({"UnusedDeclaration"})
		public int getNativeMatrix() {
		return 0;
		}

		/**
		* Return a new matrix with a copy of the canvas' current transformation
		* matrix.

+0 −7

Original line number	Diff line number	Diff line
		@@ -924,13 +924,6 @@ void OpenGLRenderer::setMatrix(SkMatrix* matrix) {
		mSnapshot->transform->load(*matrix);
		}

		const float* OpenGLRenderer::getMatrix() const {
		if (mSnapshot->fbo != 0) {
		return &mSnapshot->transform->data[0];
		}
		return &mIdentity.data[0];
		}

		void OpenGLRenderer::getMatrix(SkMatrix* matrix) {
		mSnapshot->transform->copyTo(*matrix);
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,6 @@ public:
		virtual void scale(float sx, float sy);
		virtual void skew(float sx, float sy);

		const float* getMatrix() const;
		void getMatrix(SkMatrix* matrix);
		virtual void setMatrix(SkMatrix* matrix);
		virtual void concatMatrix(SkMatrix* matrix);