diff options
| author | 2013-02-05 18:17:19 +0000 | |
|---|---|---|
| committer | 2013-02-05 18:17:56 +0000 | |
| commit | f5db9b8ed42cace00d4e84b4a7e2e63a7c654b35 (patch) | |
| tree | ba1e2ba36db9f22cd827b63dc603dec372e101e8 | |
| parent | 63af7a113b9f47d9865a4c64488dd73a40711b7a (diff) | |
| parent | d81ec456bb097a712bcbc093c5a1e0075434158e (diff) | |
Merge "Changes needed to roll Skia to r7527." into master-chromium
| -rw-r--r-- | core/jni/Android.mk | 2 | ||||
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 0555b6a658c1..44e87573af93 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -161,7 +161,7 @@ LOCAL_C_INCLUDES += \ external/skia/include/images \ external/skia/include/ports \ external/skia/src/core \ - external/skia/src/ports \ + external/skia/src/images \ external/skia/include/utils \ external/sqlite/dist \ external/sqlite/android \ diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 45569ace79d5..1fdd97d10fd1 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -80,7 +80,7 @@ static const Blender gBlends[] = { { SkXfermode::kDstATop_Mode, GL_ONE_MINUS_DST_ALPHA, GL_SRC_ALPHA }, { SkXfermode::kXor_Mode, GL_ONE_MINUS_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA }, { SkXfermode::kPlus_Mode, GL_ONE, GL_ONE }, - { SkXfermode::kMultiply_Mode, GL_ZERO, GL_SRC_COLOR }, + { SkXfermode::kModulate_Mode, GL_ZERO, GL_SRC_COLOR }, { SkXfermode::kScreen_Mode, GL_ONE, GL_ONE_MINUS_SRC_COLOR } }; @@ -101,7 +101,7 @@ static const Blender gBlendsSwap[] = { { SkXfermode::kDstATop_Mode, GL_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA }, { SkXfermode::kXor_Mode, GL_ONE_MINUS_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA }, { SkXfermode::kPlus_Mode, GL_ONE, GL_ONE }, - { SkXfermode::kMultiply_Mode, GL_DST_COLOR, GL_ZERO }, + { SkXfermode::kModulate_Mode, GL_DST_COLOR, GL_ZERO }, { SkXfermode::kScreen_Mode, GL_ONE_MINUS_DST_COLOR, GL_ONE } }; |