Merge "ColorFilter::getFlags() is deprecated" into sc-dev am: 0cdeb3b994

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13825822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86650bd7e3d8b28e09853bc1577b68ccc2601d4d
This commit is contained in:
TreeHugger Robot
2021-03-11 21:22:26 +00:00
committed by Automerger Merge Worker

View File

@@ -52,18 +52,10 @@ public:
return mode == SkBlendMode::kSrcOver || mode == SkBlendMode::kSrc;
}
static bool isBlendedShader(const SkShader* shader) {
if (shader == nullptr) {
return false;
}
return !shader->isOpaque();
}
static bool isBlendedShader(const SkShader* shader) { return shader && !shader->isOpaque(); }
static bool isBlendedColorFilter(const SkColorFilter* filter) {
if (filter == nullptr) {
return false;
}
return (filter->getFlags() & SkColorFilter::kAlphaUnchanged_Flag) == 0;
return filter && !filter->isAlphaUnchanged();
}
static inline SkBlendMode getBlendModeDirect(const SkPaint* paint) {