diff options
| author | Romain Guy <romainguy@google.com> | 2011-01-04 15:00:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-04 15:00:48 -0800 |
| commit | 6b1f6e6ac1d8c8cff778ee161f430e077a82082e (patch) | |
| tree | 0c43c7fc3334879ad8f480d134759bf75fe1d0ba /core/jni | |
| parent | b794a5e53a8a954d7f8c2be1d321f1c87bfc556f (diff) | |
| parent | a9ebfa6bcce62d7fee69693fe3dee6027afd3f0e (diff) | |
| download | frameworks_base-6b1f6e6ac1d8c8cff778ee161f430e077a82082e.zip frameworks_base-6b1f6e6ac1d8c8cff778ee161f430e077a82082e.tar.gz frameworks_base-6b1f6e6ac1d8c8cff778ee161f430e077a82082e.tar.bz2 | |
Merge "Keep a reference to the local matrix. Bug #3299324"
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android/graphics/Shader.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/core/jni/android/graphics/Shader.cpp b/core/jni/android/graphics/Shader.cpp index 4be1321..3efc41d 100644 --- a/core/jni/android/graphics/Shader.cpp +++ b/core/jni/android/graphics/Shader.cpp @@ -64,11 +64,6 @@ static void Shader_destructor(JNIEnv* env, jobject o, SkShader* shader, SkiaShad #endif } -static bool Shader_getLocalMatrix(JNIEnv* env, jobject, const SkShader* shader, SkMatrix* matrix) -{ - return shader ? shader->getLocalMatrix(matrix) : false; -} - static void Shader_setLocalMatrix(JNIEnv* env, jobject o, SkShader* shader, SkiaShader* skiaShader, const SkMatrix* matrix) { @@ -471,7 +466,6 @@ static JNINativeMethod gColorMethods[] = { static JNINativeMethod gShaderMethods[] = { { "nativeDestructor", "(II)V", (void*)Shader_destructor }, - { "nativeGetLocalMatrix", "(II)Z", (void*)Shader_getLocalMatrix }, { "nativeSetLocalMatrix", "(III)V", (void*)Shader_setLocalMatrix } }; |