diff options
| author | Chris Craik <ccraik@google.com> | 2013-03-20 22:22:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-20 22:22:44 +0000 |
| commit | 4494599e5a4931426d5649e1d1c4f9db83824ae8 (patch) | |
| tree | 987a2176952a5e871b80d2f9ab0468be9fb24d7d /core/jni/android_view_GLES20Canvas.cpp | |
| parent | fd81f91052d54c0354834fcd4f423025f2d8c93e (diff) | |
| parent | a08f95cfeca7217f9c533b03663bf0dceedd259a (diff) | |
| download | frameworks_base-4494599e5a4931426d5649e1d1c4f9db83824ae8.zip frameworks_base-4494599e5a4931426d5649e1d1c4f9db83824ae8.tar.gz frameworks_base-4494599e5a4931426d5649e1d1c4f9db83824ae8.tar.bz2 | |
Merge "Use snapshot alpha for layers" into jb-mr2-dev
Diffstat (limited to 'core/jni/android_view_GLES20Canvas.cpp')
| -rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index 10c92ba..3a23aa1 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -869,7 +869,8 @@ static void android_view_GLES20Canvas_destroyLayerDeferred(JNIEnv* env, static void android_view_GLES20Canvas_drawLayer(JNIEnv* env, jobject clazz, OpenGLRenderer* renderer, Layer* layer, jfloat x, jfloat y, SkPaint* paint) { - renderer->drawLayer(layer, x, y, paint); + // TODO: don't pass the paint from java + renderer->drawLayer(layer, x, y); } static jboolean android_view_GLES20Canvas_copyLayer(JNIEnv* env, jobject clazz, |