Pass in ProcOptInfos into willNeedDstCopy on XPs

src/gpu/GrPipeline.h

Index: src/gpu/GrPipeline.h
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 8480c0045856ba4f3b7977d22d7a0955e62754ed..61b40d0c4d3c98c143d8f978c8ed96f1a189f0d5 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -29,14 +29,13 @@ class GrPipeline {
 public:
     SK_DECLARE_INST_COUNT(GrPipeline)
 
-    // TODO get rid of this version of the constructor when we use batch everywhere
-    GrPipeline(const GrPipelineBuilder& pipelineBuilder, const GrPrimitiveProcessor*,
-               const GrDrawTargetCaps&, const GrScissorState&,
+    GrPipeline(const GrPipelineBuilder&,
+               const GrProcOptInfo& colorPOI,
+               const GrProcOptInfo& coveragePOI,
+               const GrDrawTargetCaps&,
+               const GrScissorState&,
                const GrDeviceCoordTexture* dstCopy);
 
-    GrPipeline(GrBatch*, const GrPipelineBuilder&, const GrDrawTargetCaps&,
-               const GrScissorState&, const GrDeviceCoordTexture* dstCopy);
-
     /*
      * Returns true if it is possible to combine the two GrPipelines and it will update 'this'
      * to subsume 'that''s draw.
@@ -137,14 +136,6 @@ public:
     const GrPipelineInfo& getInitBatchTracker() const { return fInitBT; }
 
 private:
-    // TODO we can have one constructor once GrBatch is complete
-    void internalConstructor(const GrPipelineBuilder&,
-                             const GrProcOptInfo& colorPOI,
-                             const GrProcOptInfo& coveragePOI,
-                             const GrDrawTargetCaps&,
-                             const GrScissorState&,
-                             const GrDeviceCoordTexture* dstCopy);
-
     /**
      * Alter the program desc and inputs (attribs and processors) based on the blend optimization.
      */