Do more cleanup from xp changes

src/core/SkXfermode.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 "SkXfermode.h"
 #include "SkXfermode_opts_SSE2.h"
@@ skipping 669 matching lines @@
 }
 
 bool SkXfermode::asXPFactory(GrXPFactory**) const {
     return false;
 }
 
 
 #if SK_SUPPORT_GPU
 #include "effects/GrPorterDuffXferProcessor.h"
 
-bool SkXfermode::AsFragmentProcessorOrXPFactory(SkXfermode* xfermode,
-                                                GrFragmentProcessor** fp,
-                                                GrXPFactory** xpf) {
-    Coeff src, dst;
-    Mode mode;
+bool SkXfermode::AsXPFactory(SkXfermode* xfermode, GrXPFactory** xpf) {
     if (NULL == xfermode) {
-        *xpf = GrPorterDuffXPFactory::Create(kSrcOver_Mode);
-        return true;
-    } else if (xfermode->asMode(&mode) && mode <= kLastCoeffMode) {
-        *xpf = GrPorterDuffXPFactory::Create(mode);
-        return true;
-    } else if (xfermode->asCoeff(&src, &dst)) {
-        *xpf = GrPorterDuffXPFactory::Create(src, dst);
-        return true;
-    } else if (xfermode->asXPFactory(xpf)) {
+        if (xpf) {
+            *xpf = GrPorterDuffXPFactory::Create(kSrcOver_Mode);
+        }
         return true;
     } else {
-        return xfermode->asFragmentProcessor(fp, NULL);
+        return xfermode->asXPFactory(xpf);
     }
 }
 #else
-bool SkXfermode::AsFragmentProcessorOrXPFactory(SkXfermode* xfermode,
-                                                GrFragmentProcessor** fp,
-                                                GrXPFactory** xpf) {
+bool SkXfermode::AsXPFactory(SkXfermode* xfermode, GrXPFactory** xpf) {
     return false;
 }
 #endif
 
 SkPMColor SkXfermode::xferColor(SkPMColor src, SkPMColor dst) const{
     // no-op. subclasses should override this
     return dst;
 }
 
 void SkXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
@@ skipping 203 matching lines @@
         if (fp) {
             *fp = GrCustomXfermode::CreateFP(fMode, background);
             SkASSERT(*fp);
         }
         return true;
     }
     return false;
 }
 
 bool SkProcCoeffXfermode::asXPFactory(GrXPFactory** xp) const {
+    if (CANNOT_USE_COEFF != fSrcCoeff) {
+        if (xp) {
+            *xp = GrPorterDuffXPFactory::Create(fMode);
+            SkASSERT(*xp);
+        }
+        return true;
+    }
+
     if (GrCustomXfermode::IsSupportedMode(fMode)) {
         if (xp) {
             *xp = GrCustomXfermode::CreateXPFactory(fMode);
             SkASSERT(*xp);
         }
         return true;
     }
     return false;
 }
 #endif
@@ skipping 551 matching lines @@
         } else {
             proc16 = rec.fProc16_General;
         }
     }
     return proc16;
 }
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkProcCoeffXfermode)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END