From 5743fa1fb6cd5d0905511e57d098b4bf221ca6cc Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Sat, 10 Jul 2021 10:01:20 -0400 Subject: [PATCH] SkPaint::getBlendMode() is deprecated Test: make Bug: 178700363 Change-Id: Ib55dba5683e97ed9e72de7782f573025bd4d7461 --- libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp | 2 +- libs/hwui/utils/PaintUtils.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp index 76c4a03d3a914..7b962cc22d3f5 100644 --- a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp +++ b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp @@ -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); } } diff --git a/libs/hwui/utils/PaintUtils.h b/libs/hwui/utils/PaintUtils.h index a8f2d9a28d671..f0fb068938361 100644 --- a/libs/hwui/utils/PaintUtils.h +++ b/libs/hwui/utils/PaintUtils.h @@ -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) {