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

Commit 5743fa1f authored by Mike Reed's avatar Mike Reed
Browse files

SkPaint::getBlendMode() is deprecated 

Test: make

Bug: 178700363
Change-Id: Ib55dba5683e97ed9e72de7782f573025bd4d7461
parent 74bb4c14

libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void SkiaRecordingCanvas::drawVectorDrawable(VectorDrawableRoot* tree) { 
void SkiaRecordingCanvas::FilterForImage(SkPaint& paint) {

    // kClear blend mode is drawn as kDstOut on HW for compatibility with Android O and

    // older.

    if (sApiLevel <= 27 && paint.getBlendMode() == SkBlendMode::kClear) {

    if (sApiLevel <= 27 && paint.asBlendMode() == SkBlendMode::kClear) {

        paint.setBlendMode(SkBlendMode::kDstOut);

    }

}

libs/hwui/utils/PaintUtils.h

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public: 
        }



        // Only let simple srcOver / src blending modes declare opaque, since behavior is clear.

        SkBlendMode mode = paint->getBlendMode();

        const auto mode = paint->asBlendMode();

        return mode == SkBlendMode::kSrcOver || mode == SkBlendMode::kSrc;

    }
@@ -59,7 +59,7 @@ public: 
    }



    static inline SkBlendMode getBlendModeDirect(const SkPaint* paint) {

        return paint ? paint->getBlendMode() : SkBlendMode::kSrcOver;

        return paint ? paint->getBlendMode_or(SkBlendMode::kSrcOver) : SkBlendMode::kSrcOver;

    }



    static inline int getAlphaDirect(const SkPaint* paint) {