Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89c352cf authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 5045 

* changes:
  remove deprecated use of porterduff
parents 1b28d26a 47c0d4ea

core/jni/android/graphics/Canvas.cpp

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "SkGLCanvas.h"

#include "SkGraphics.h"

#include "SkImageRef_GlobalPool.h"

#include "SkPorterDuff.h"

#include "SkShader.h"

#include "SkTemplates.h"
@@ -324,7 +325,7 @@ public: 
 

    static void drawColor__II(JNIEnv* env, jobject, SkCanvas* canvas,

                              jint color, SkPorterDuff::Mode mode) {

        canvas->drawColor(color, mode);

        canvas->drawColor(color, SkPorterDuff::ToXfermodeMode(mode));

    }

 

    static void drawPaint(JNIEnv* env, jobject, SkCanvas* canvas,

core/jni/android/graphics/ColorFilter.cpp

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include "SkColorFilter.h"

#include "SkColorMatrixFilter.h"

#include "SkPorterDuff.h"



namespace android {
@@ -32,8 +33,9 @@ public: 
    }



    static SkColorFilter* CreatePorterDuffFilter(JNIEnv* env, jobject,

                            jint srcColor, SkPorterDuff::Mode porterDuffMode) {

        return SkColorFilter::CreatePorterDuffFilter(srcColor, porterDuffMode);

                            jint srcColor, SkPorterDuff::Mode mode) {

        return SkColorFilter::CreateModeFilter(srcColor,

                                           SkPorterDuff::ToXfermodeMode(mode));

    }

 

    static SkColorFilter* CreateLightingFilter(JNIEnv* env, jobject,