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

include/gpu/GrPaint.h

Index: include/gpu/GrPaint.h
diff --git a/include/gpu/GrPaint.h b/include/gpu/GrPaint.h
index f31830bb2bfa6d58361d9edfaef28f542d7dd7d9..26e4508dda9631164d3988f6bfe42aca4cb2b051 100644
--- a/include/gpu/GrPaint.h
+++ b/include/gpu/GrPaint.h
@@ -51,17 +51,6 @@ public:
     ~GrPaint() {}
 
     /**
-     * Sets the blending coefficients to use to blend the final primitive color with the

[bsalomon, 2014/12/04 21:54:24]

W00000000000000000000000000000000000T

-     * destination color. Defaults to kOne for src and kZero for dst (i.e. src mode).
-     */
-    void setBlendFunc(GrBlendCoeff srcCoeff, GrBlendCoeff dstCoeff) {
-        fSrcBlendCoeff = srcCoeff;
-        fDstBlendCoeff = dstCoeff;
-    }
-    GrBlendCoeff getSrcBlendCoeff() const { return fSrcBlendCoeff; }
-    GrBlendCoeff getDstBlendCoeff() const { return fDstBlendCoeff; }
-
-    /**
      * The initial color of the drawn primitive. Defaults to solid white.
      */
     void setColor(GrColor color) { fColor = color; }
@@ -121,8 +110,6 @@ public:
     const GrFragmentStage& getCoverageStage(int s) const { return fCoverageStages[s]; }
 
     GrPaint& operator=(const GrPaint& paint) {
-        fSrcBlendCoeff = paint.fSrcBlendCoeff;
-        fDstBlendCoeff = paint.fDstBlendCoeff;
         fAntiAlias = paint.fAntiAlias;
         fDither = paint.fDither;
 
@@ -140,7 +127,6 @@ public:
      * Resets the paint to the defaults.
      */
     void reset() {
-        this->resetBlend();
         this->resetOptions();
         this->resetColor();
         this->resetStages();
@@ -211,18 +197,11 @@ private:
     SkSTArray<4, GrFragmentStage>   fColorStages;
     SkSTArray<2, GrFragmentStage>   fCoverageStages;
 
-    GrBlendCoeff                    fSrcBlendCoeff;
-    GrBlendCoeff                    fDstBlendCoeff;
     bool                            fAntiAlias;
     bool                            fDither;
 
     GrColor                         fColor;
 
-    void resetBlend() {
-        fSrcBlendCoeff = kOne_GrBlendCoeff;
-        fDstBlendCoeff = kZero_GrBlendCoeff;
-    }
-
     void resetOptions() {
         fAntiAlias = false;
         fDither = false;
@@ -232,7 +211,7 @@ private:
         fColor = GrColorPackRGBA(0xff, 0xff, 0xff, 0xff);
     }
 
-    void resetStages(); 
+    void resetStages();
 };
 
 #endif