Alter SkXfermode's asFragmentProcessor & asXPFactory contracts

src/effects/SkAvoidXfermode.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAvoidXfermode.h"
 #include "SkColorPriv.h"
 #include "SkReadBuffer.h"
@@ skipping 503 matching lines @@
 const GrXPFactory* GrAvoidXPFactory::TestCreate(GrProcessorTestData* d) {
     SkColor opColor = d->fRandom->nextU();
     uint8_t tolerance = d->fRandom->nextBits(8);
     SkAvoidXfermode::Mode mode = d->fRandom->nextBool() ? SkAvoidXfermode::kAvoidColor_Mode
                                                         : SkAvoidXfermode::kTargetColor_Mode;
     return GrAvoidXPFactory::Create(opColor, tolerance, mode);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-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
 
 #ifndef SK_IGNORE_TO_STRING
 void SkAvoidXfermode::toString(SkString* str) const {
     str->append("AvoidXfermode: opColor: ");
     str->appendHex(fOpColor);
     str->appendf("tolerance: %d ", fTolerance);
 
     static const char* gModeStrings[] = { "Avoid", "Target" };
 
     str->appendf("mode: %s", gModeStrings[fMode]);
 }
 #endif