Make GrBatch carry its own GrPipeline

src/gpu/GrImmediateDrawTarget.h

Index: src/gpu/GrImmediateDrawTarget.h
diff --git a/src/gpu/GrImmediateDrawTarget.h b/src/gpu/GrImmediateDrawTarget.h
index 77b807bc965f3b03ecacde5e84aa48fdbe910bed..997a31b594f593b8fb2fbb815c8d63fc8694f9bc 100644
--- a/src/gpu/GrImmediateDrawTarget.h
+++ b/src/gpu/GrImmediateDrawTarget.h
@@ -17,7 +17,6 @@
  */
 class GrImmediateDrawTarget : public GrClipTarget {
 public:
-
     /**
      * Creates a GrImmediateDrawTarget
      *
@@ -38,7 +37,7 @@ private:
     void onFlush() override;
 
     // overrides from GrDrawTarget
-    void onDrawBatch(GrBatch*, const PipelineInfo&) override;
+    void onDrawBatch(GrBatch*) override;
     void onStencilPath(const GrPipelineBuilder&,
                        const GrPathProcessor*,
                        const GrPath*,
@@ -73,12 +72,6 @@ private:
 
     bool isIssued(uint32_t drawID) override { return drawID != fDrawID; }
 
-    bool SK_WARN_UNUSED_RESULT setupPipelineAndShouldDraw(void* pipelineAddr,
-                                                          const GrDrawTarget::PipelineInfo&,
-                                                          GrPipelineOptimizations* opts);
-
-    void recordXferBarrierIfNecessary(const GrPipeline*);
-
     GrBatchTarget fBatchTarget;
     uint32_t fDrawID;