diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-17 19:16:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-17 19:16:11 -0700 |
| commit | b8460d153a1e6dfc6a02ab127d4b5b5e82386137 (patch) | |
| tree | ab760b5b2267c2632590631cb872572080ce21d0 /core | |
| parent | 23fa0320b88bd2141742d47eaf2626369cb03b22 (diff) | |
| parent | b2e2f2470693e78baed20617f989d9a166864ed4 (diff) | |
| download | frameworks_base-b8460d153a1e6dfc6a02ab127d4b5b5e82386137.zip frameworks_base-b8460d153a1e6dfc6a02ab127d4b5b5e82386137.tar.gz frameworks_base-b8460d153a1e6dfc6a02ab127d4b5b5e82386137.tar.bz2 | |
Merge "Take into account the texture layer's transform for clipping Bug #7370212" into jb-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index 1b71b43..5d306d2 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -829,7 +829,6 @@ static void android_view_GLES20Canvas_clearLayerTexture(JNIEnv* env, jobject cla static void android_view_GLES20Canvas_setTextureLayerTransform(JNIEnv* env, jobject clazz, Layer* layer, SkMatrix* matrix) { - layer->getTransform().load(*matrix); } |