Do more cleanup from xp changes

include/core/SkXfermode.h

Index: include/core/SkXfermode.h
diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h
index 9d72cef74548a5447c574681ef6ac445e2cda0d0..ed93953b03b347a01209e9d867d0642c0915e393 100644
--- a/include/core/SkXfermode.h
+++ b/include/core/SkXfermode.h
@@ -207,14 +207,12 @@ public:
      */
     virtual bool asXPFactory(GrXPFactory** xpf) const;
 
-    /** Returns true if the xfermode can be expressed as an xfer processor factory (xpFactory),
-        or a fragment processor. This helper calls the asCoeff(), asXPFactory(),
-        and asFragmentProcessor() virtuals. If the xfermode is NULL, it is treated as kSrcOver_Mode.
-        It is legal to call this with all params NULL to simply test the return value.
-        fp and xpf must both be NULL or all non-NULL.
+    /** Returns true if the xfermode can be expressed as an xfer processor factory (xpFactory).
+        This helper calls the asMode(), asCoeff() and asXPFactory() virtuals. If the xfermode is

[bsalomon, 2015/01/20 14:59:34]

Do we still need asMode() and asCoeff() or can those be supplanted by asFP and
asXPF?

[egdaniel, 2015/01/20 16:03:11]

Removed the need to check these in this function.

+        NULL, it is treated as kSrcOver_Mode. It is legal to call this with xpf param NULL to simply
+        test the return value.
      */
-    static bool AsFragmentProcessorOrXPFactory(SkXfermode*, GrFragmentProcessor**,
-                                               GrXPFactory**);
+    static bool AsXPFactory(SkXfermode*, GrXPFactory**);
 
     SK_TO_STRING_PUREVIRT()
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()