Make all blending up to GrOptDrawState be handled by the xp/xp factory.

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 671 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, Coeff* dst) {
+                                                GrXPFactory** xpf) {
+    Coeff src, dst;
     Mode mode;
     if (NULL == xfermode) {
-        SkAssertResult(ModeAsCoeff(kSrcOver_Mode, src, dst));
-        *xpf = GrPorterDuffXPFactory::Create(*src, *dst);
+        *xpf = GrPorterDuffXPFactory::Create(kSrcOver_Mode);
         return true;
     } else if (xfermode->asMode(&mode) && mode <= kLastCoeffMode) {
         *xpf = GrPorterDuffXPFactory::Create(mode);
-        // TODO: This Line will be removed in follow up cl that handles blending and thus we won't
-        // have to set coeffs here.
-        SkAssertResult(ModeAsCoeff(mode, src, dst));
         return true;
-    } else if (xfermode->asCoeff(src, dst)) {
-        *xpf = GrPorterDuffXPFactory::Create(*src, *dst);
+    } else if (xfermode->asCoeff(&src, &dst)) {
+        *xpf = GrPorterDuffXPFactory::Create(src, dst);
         return true;
     } else if (xfermode->asXPFactory(xpf)) {
-        *src = SkXfermode::kOne_Coeff;
-        *dst = SkXfermode::kZero_Coeff;
         return true;
     } else {
         return xfermode->asFragmentProcessor(fp);
     }
 }
 #else
 bool SkXfermode::AsFragmentProcessorOrXPFactory(SkXfermode* xfermode,
                                                 GrFragmentProcessor** fp,
-                                                GrXPFactory** xpf,
-                                                Coeff* src, Coeff* dst) {
+                                                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 1228 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