Alter SkXfermode's asFragmentProcessor & asXPFactory contracts
TBR=bsalomon@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1674673002
Review URL: https://codereview.chromium.org/1674673002
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index e4dc467..df65e45 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -489,10 +489,15 @@
}
}
- SkXfermode* mode = skPaint.getXfermode();
- GrXPFactory* xpFactory = nullptr;
- SkXfermode::AsXPFactory(mode, &xpFactory);
- SkSafeUnref(grPaint->setXPFactory(xpFactory));
+ // When the xfermode is null on the SkPaint (meaning kSrcOver) we need the XPFactory field on
+ // the GrPaint to also be null (also kSrcOver).
+ SkASSERT(!grPaint->getXPFactory());
+ SkXfermode* xfermode = skPaint.getXfermode();
+ if (xfermode) {
+ // SafeUnref in case a new xfermode is added that returns null.
+ // In such cases we will fall back to kSrcOver_Mode.
+ SkSafeUnref(grPaint->setXPFactory(xfermode->asXPFactory()));
+ }
#ifndef SK_IGNORE_GPU_DITHER
if (skPaint.isDither() && grPaint->numColorFragmentProcessors() > 0) {