Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SkPaint::getBlendMode() is deprecated

Browse Source 
Test: make

Bug: 178700363
Change-Id: Ib55dba5683e97ed9e72de7782f573025bd4d7461
This commit is contained in:
Mike Reed
2021-07-10 10:01:20 -04:00
parent 74bb4c14c4
commit 5743fa1fb6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
View File

@@ -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);
}
}

4
libs/hwui/utils/PaintUtils.h
View File

@@ -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) {