Alter SkXfermode's asFragmentProcessor & asXPFactory contracts

src/effects/SkAvoidXfermode.cpp

Index: src/effects/SkAvoidXfermode.cpp
diff --git a/src/effects/SkAvoidXfermode.cpp b/src/effects/SkAvoidXfermode.cpp
index 30da0ad7d3dc58de0be3d7abdfd7460e32ee7c3e..43d80c981038a095de050b3fe718f0c949816740 100644
--- a/src/effects/SkAvoidXfermode.cpp
+++ b/src/effects/SkAvoidXfermode.cpp
@@ -521,19 +521,13 @@ const GrXPFactory* GrAvoidXPFactory::TestCreate(GrProcessorTestData* d) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SkAvoidXfermode::asFragmentProcessor(const GrFragmentProcessor** output,
-                                          const GrFragmentProcessor* dst) const {
-    if (output) {
-        *output = AvoidFP::Create(fOpColor, fTolerance, fMode, dst);
-    }
-    return true;
+const GrFragmentProcessor* SkAvoidXfermode::getFragmentProcessorForImageFilter(
+                                                            const GrFragmentProcessor* dst) const {
+    return AvoidFP::Create(fOpColor, fTolerance, fMode, dst);
 }
 
-bool SkAvoidXfermode::asXPFactory(GrXPFactory** xpf) const {
-    if (xpf) {
-        *xpf = GrAvoidXPFactory::Create(fOpColor, fTolerance, fMode);
-    }
-    return true;
+GrXPFactory* SkAvoidXfermode::asXPFactory() const {
+    return GrAvoidXPFactory::Create(fOpColor, fTolerance, fMode);
 }
 #endif