diff options
| author | Chris Craik <ccraik@google.com> | 2015-03-06 18:16:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-06 18:16:45 +0000 |
| commit | fdbf68ff6c5e45da4971352775d614e6790cc991 (patch) | |
| tree | 7a4dcec6b82eaac58019865153c579304cccca6c /core/jni/android_graphics_Canvas.cpp | |
| parent | f045198fb3b008e0341f0b9761e4ef96310e7333 (diff) | |
| parent | 26b4f598c8b1e99b43261614a6861785638c8c00 (diff) | |
| download | frameworks_base-fdbf68ff6c5e45da4971352775d614e6790cc991.zip frameworks_base-fdbf68ff6c5e45da4971352775d614e6790cc991.tar.gz frameworks_base-fdbf68ff6c5e45da4971352775d614e6790cc991.tar.bz2 | |
Merge "Revert "Remove references to SkPorterDuff as it is deprecated.""
Diffstat (limited to 'core/jni/android_graphics_Canvas.cpp')
| -rw-r--r-- | core/jni/android_graphics_Canvas.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_graphics_Canvas.cpp b/core/jni/android_graphics_Canvas.cpp index c337a9f..86c2511 100644 --- a/core/jni/android_graphics_Canvas.cpp +++ b/core/jni/android_graphics_Canvas.cpp @@ -185,8 +185,8 @@ static jboolean clipRegion(JNIEnv* env, jobject, jlong canvasHandle, jlong devic } static void drawColor(JNIEnv* env, jobject, jlong canvasHandle, jint color, jint modeHandle) { - SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(modeHandle); - get_canvas(canvasHandle)->drawColor(color, mode); + SkPorterDuff::Mode mode = static_cast<SkPorterDuff::Mode>(modeHandle); + get_canvas(canvasHandle)->drawColor(color, SkPorterDuff::ToXfermodeMode(mode)); } static void drawPaint(JNIEnv* env, jobject, jlong canvasHandle, jlong paintHandle) { |