diff options
| author | Chris Craik <ccraik@google.com> | 2015-03-06 18:15:39 +0000 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-03-06 18:15:39 +0000 |
| commit | 26b4f598c8b1e99b43261614a6861785638c8c00 (patch) | |
| tree | bc6e64c7dc08fcbda6e1d65c7423d003426f6d6c /core/jni/android/graphics/PorterDuff.cpp | |
| parent | a9aded1f6253afbea7906509992a8a3721f731ab (diff) | |
| download | frameworks_base-26b4f598c8b1e99b43261614a6861785638c8c00.zip frameworks_base-26b4f598c8b1e99b43261614a6861785638c8c00.tar.gz frameworks_base-26b4f598c8b1e99b43261614a6861785638c8c00.tar.bz2 | |
Revert "Remove references to SkPorterDuff as it is deprecated."
bug:19627342
This reverts commit a9aded1f6253afbea7906509992a8a3721f731ab.
Change-Id: Ic865edfbd31c9e24d18a1397a1d346633376e20a
Diffstat (limited to 'core/jni/android/graphics/PorterDuff.cpp')
| -rw-r--r-- | core/jni/android/graphics/PorterDuff.cpp | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/core/jni/android/graphics/PorterDuff.cpp b/core/jni/android/graphics/PorterDuff.cpp index d65864d..73b1691 100644 --- a/core/jni/android/graphics/PorterDuff.cpp +++ b/core/jni/android/graphics/PorterDuff.cpp @@ -24,7 +24,7 @@ #include "GraphicsJNI.h" #include "core_jni_helpers.h" -#include "SkXfermode.h" +#include "SkPorterDuff.h" namespace android { @@ -32,28 +32,8 @@ class SkPorterDuffGlue { public: static jlong CreateXfermode(JNIEnv* env, jobject, jint modeHandle) { - // validate that the Java enum values match our expectations - SK_COMPILE_ASSERT(0 == SkXfermode::kClear_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(1 == SkXfermode::kSrc_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(2 == SkXfermode::kDst_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(3 == SkXfermode::kSrcOver_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(4 == SkXfermode::kDstOver_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(5 == SkXfermode::kSrcIn_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(6 == SkXfermode::kDstIn_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(7 == SkXfermode::kSrcOut_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(8 == SkXfermode::kDstOut_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(9 == SkXfermode::kSrcATop_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(10 == SkXfermode::kDstATop_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(11 == SkXfermode::kXor_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(16 == SkXfermode::kDarken_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(17 == SkXfermode::kLighten_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(13 == SkXfermode::kModulate_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(14 == SkXfermode::kScreen_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(12 == SkXfermode::kPlus_Mode, xfermode_mismatch); - SK_COMPILE_ASSERT(15 == SkXfermode::kOverlay_Mode, xfermode_mismatch); - - SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(modeHandle); - return reinterpret_cast<jlong>(SkXfermode::Create(mode)); + SkPorterDuff::Mode mode = static_cast<SkPorterDuff::Mode>(modeHandle); + return reinterpret_cast<jlong>(SkPorterDuff::CreateXfermode(mode)); } }; |