Make GrBatch carry its own GrPipeline

src/gpu/GrCommandBuilder.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrCommandBuilder_DEFINED
 #define GrCommandBuilder_DEFINED
 
 #include "GrTargetCommands.h"
 
 class GrBufferedDrawTarget;
 
 class GrCommandBuilder : ::SkNoncopyable {
 public:
-    typedef GrTargetCommands::Cmd Cmd;
-    typedef GrTargetCommands::State State;
+    typedef GrTargetCommands::Cmd               Cmd;
+    typedef GrTargetCommands::StateForPathDraw  State;
 
     static GrCommandBuilder* Create(GrGpu* gpu, bool reorder);
 
     virtual ~GrCommandBuilder() {}
 
     void reset() { fCommands.reset(); }
     void flush(GrBufferedDrawTarget* bufferedDrawTarget) { fCommands.flush(bufferedDrawTarget); }
 
     virtual Cmd* recordClearStencilClip(const SkIRect& rect,
                                         bool insideClip,
                                         GrRenderTarget* renderTarget);
     virtual Cmd* recordDiscard(GrRenderTarget*);
-    virtual Cmd* recordDrawBatch(const State*, const GrPipelineOptimizations&, GrBatch*) = 0;
+    virtual Cmd* recordDrawBatch(GrBatch*) = 0;
     virtual Cmd* recordStencilPath(const GrPipelineBuilder&,
                                    const GrPathProcessor*,
                                    const GrPath*,
                                    const GrScissorState&,
                                    const GrStencilSettings&) = 0;
     virtual Cmd* recordDrawPath(State*,
                                 const GrPathProcessor*,
                                 const GrPath*,
                                 const GrStencilSettings&) = 0;
     virtual Cmd* recordDrawPaths(State*,
@@ skipping 30 matching lines @@
 
     GrTargetCommands::CmdBuffer* cmdBuffer() { return fCommands.cmdBuffer(); }
     GrBatchTarget* batchTarget() { return fCommands.batchTarget(); }
 
 private:
     GrTargetCommands fCommands;
 
 };
 
 #endif