Revert of Move DstCopy on gpu into the GrXferProcessor.

src/effects/SkArithmeticMode_gpu.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkArithmeticMode_gpu.h"
 
 #if SK_SUPPORT_GPU
@@ skipping 148 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 class GLArithmeticXP : public GrGLXferProcessor {
 public:
     GLArithmeticXP(const GrProcessor&)
         : fEnforcePMColor(true) {
     }
 
     ~GLArithmeticXP() SK_OVERRIDE {}
 
+    void emitCode(const EmitArgs& args) SK_OVERRIDE {
+        GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder();
+
+        const char* dstColor = fsBuilder->dstColor();
+
+        fKUni = args.fPB->addUniform(GrGLProgramBuilder::kFragment_Visibility,
+                                     kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                     "k");
+        const char* kUni = args.fPB->getUniformCStr(fKUni);
+
+        add_arithmetic_code(fsBuilder, args.fInputColor, dstColor, args.fOutputPrimary, kUni, 
+                            fEnforcePMColor);
+
+        fsBuilder->codeAppendf("%s = %s * %s + (vec4(1.0) - %s) * %s;",
+                               args.fOutputPrimary, args.fOutputPrimary, args.fInputCoverage,
+                               args.fInputCoverage, dstColor);
+    }
+
+    void setData(const GrGLProgramDataManager& pdman,
+                 const GrXferProcessor& processor) SK_OVERRIDE {
+        const GrArithmeticXP& arith = processor.cast<GrArithmeticXP>();
+        pdman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4());
+        fEnforcePMColor = arith.enforcePMColor();
+    };
+
     static void GenKey(const GrProcessor& processor, const GrGLCaps& caps,
                        GrProcessorKeyBuilder* b) {
         const GrArithmeticXP& arith = processor.cast<GrArithmeticXP>();
         uint32_t key = arith.enforcePMColor() ? 1 : 0;
         b->add32(key);
     }
 
 private:
-    void onEmitCode(const EmitArgs& args) SK_OVERRIDE {
-        GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder();
-
-        const char* dstColor = fsBuilder->dstColor();
-
-        fKUni = args.fPB->addUniform(GrGLProgramBuilder::kFragment_Visibility,
-                                     kVec4f_GrSLType, kDefault_GrSLPrecision,
-                                     "k");
-        const char* kUni = args.fPB->getUniformCStr(fKUni);
-
-        add_arithmetic_code(fsBuilder, args.fInputColor, dstColor, args.fOutputPrimary, kUni, 
-                            fEnforcePMColor);
-
-        fsBuilder->codeAppendf("%s = %s * %s + (vec4(1.0) - %s) * %s;",
-                               args.fOutputPrimary, args.fOutputPrimary, args.fInputCoverage,
-                               args.fInputCoverage, dstColor);
-    }
-
-    void onSetData(const GrGLProgramDataManager& pdman,
-                   const GrXferProcessor& processor) SK_OVERRIDE {
-        const GrArithmeticXP& arith = processor.cast<GrArithmeticXP>();
-        pdman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4());
-        fEnforcePMColor = arith.enforcePMColor();
-    };
-
     GrGLProgramDataManager::UniformHandle fKUni;
     bool fEnforcePMColor;
 
     typedef GrGLXferProcessor INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GrArithmeticXP::GrArithmeticXP(float k1, float k2, float k3, float k4, bool enforcePMColor,
-                               const GrDeviceCoordTexture* dstCopy, bool willReadDstColor)
-    : INHERITED(dstCopy, willReadDstColor)
-    , fK1(k1)
+GrArithmeticXP::GrArithmeticXP(float k1, float k2, float k3, float k4, bool enforcePMColor)
+    : fK1(k1)
     , fK2(k2)
     , fK3(k3)
     , fK4(k4)
     , fEnforcePMColor(enforcePMColor) {
     this->initClassID<GrPorterDuffXferProcessor>();
+    this->setWillReadDstColor();
 }
 
-void GrArithmeticXP::onGetGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const {
+void GrArithmeticXP::getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const {
     GLArithmeticXP::GenKey(*this, caps, b);
 }
 
 GrGLXferProcessor* GrArithmeticXP::createGLInstance() const {
     return SkNEW_ARGS(GLArithmeticXP, (*this));
 }
 
 GrXferProcessor::OptFlags GrArithmeticXP::getOptimizations(const GrProcOptInfo& colorPOI,
                                                            const GrProcOptInfo& coveragePOI,
                                                            bool doesStencilWrite,
@@ skipping 30 matching lines @@
     float k1 = random->nextF();
     float k2 = random->nextF();
     float k3 = random->nextF();
     float k4 = random->nextF();
     bool enforcePMColor = random->nextBool();
 
     return GrArithmeticXPFactory::Create(k1, k2, k3, k4, enforcePMColor);
 }
 
 #endif