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

src/gpu/GrOptDrawState.h

Index: src/gpu/GrOptDrawState.h
diff --git a/src/gpu/GrOptDrawState.h b/src/gpu/GrOptDrawState.h
index 45501b49dd1c4fc4efe8ea9933d07875780cd3e4..1878d16af3b2786d1c640b6cb05660cca0f2ebc5 100644
--- a/src/gpu/GrOptDrawState.h
+++ b/src/gpu/GrOptDrawState.h
@@ -194,22 +194,20 @@ private:
     /**
      * Alter the program desc and inputs (attribs and processors) based on the blend optimization.
      */
-    void adjustProgramForBlendOpt(const GrDrawState& ds, GrDrawState::BlendOpt,
-                                  int* firstColorStageIdx, int* firstCoverageStageIdx);
-
-    /**
-     * Loop over the effect stages to determine various info like what data they will read and what
-     * shaders they require.
-     */
-    void getStageStats(const GrDrawState& ds, int firstColorStageIdx, int firstCoverageStageIdx,
-                       bool hasLocalCoords);
+    void adjustProgramFromOptimizations(const GrDrawState& ds,
+                                        GrXferProcessor::OptFlags,
+                                        const GrProcOptInfo& colorPOI,
+                                        const GrProcOptInfo& coveragePOI,
+                                        int* firstColorStageIdx,
+                                        int* firstCoverageStageIdx);
 
     /**
      * Calculates the primary and secondary output types of the shader. For certain output types
      * the function may adjust the blend coefficients. After this function is called the src and dst
      * blend coeffs will represent those used by backend API.
      */
-    void setOutputStateInfo(const GrDrawState& ds, GrDrawState::BlendOpt, const GrDrawTargetCaps&);
+    void setOutputStateInfo(const GrDrawState& ds, GrXferProcessor::OptFlags,
+                            const GrDrawTargetCaps&);
 
     enum Flags {
         kDither_Flag            = 0x1,