return;
}
- if (shader->isABitmap()) {
+ if (shader->isAImage()) {
return;
}
if (shader->asACompose(nullptr)) {
flags &= ~SkPaint::kLCDRenderText_Flag;
paint->setFlags(flags);
- // Android doesn't support Xfermodes above kLighten_Mode
- SkXfermode::Mode mode;
- SkXfermode::AsMode(paint->getXfermode(), &mode);
- if (mode > SkXfermode::kLighten_Mode) {
- paint->setXfermode(nullptr);
+ // Android doesn't support blend modes above kLighten_Mode
+ if (paint->getBlendMode() > SkBlendMode::kLighten) {
+ paint->setBlendMode(SkBlendMode::kSrcOver);
}
// Force bilinear scaling or none
}
void SkAndroidSDKCanvas::onClipRect(const SkRect& rect,
- SkRegion::Op op,
+ ClipOp op,
ClipEdgeStyle style) {
fProxyTarget->clipRect(rect, op, style);
}
void SkAndroidSDKCanvas::onClipRRect(const SkRRect& rrect,
- SkRegion::Op op,
+ ClipOp op,
ClipEdgeStyle style) {
fProxyTarget->clipRRect(rrect, op, style);
}
void SkAndroidSDKCanvas::onClipPath(const SkPath& path,
- SkRegion::Op op,
+ ClipOp op,
ClipEdgeStyle style) {
fProxyTarget->clipPath(path, op, style);
}
-void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op) {
+void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, ClipOp op) {
fProxyTarget->clipRegion(region, op);
}
void didRestore() override;
void didConcat(const SkMatrix&) override;
void didSetMatrix(const SkMatrix&) override;
- void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
- void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
- void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
- void onClipRegion(const SkRegion&, SkRegion::Op) override;
+ void onClipRect(const SkRect&, ClipOp, ClipEdgeStyle) override;
+ void onClipRRect(const SkRRect&, ClipOp, ClipEdgeStyle) override;
+ void onClipPath(const SkPath&, ClipOp, ClipEdgeStyle) override;
+ void onClipRegion(const SkRegion&, ClipOp) override;
void onDiscard() override;
protected: