Make GrBatch carry its own GrPipeline

src/gpu/GrCommandBuilder.h

Index: src/gpu/GrCommandBuilder.h
diff --git a/src/gpu/GrCommandBuilder.h b/src/gpu/GrCommandBuilder.h
index 72c83e58dc1fb437852bda4007ebd0decbb9205b..1b6d5e0a224c38baa9310e051b1c18952b91d074 100644
--- a/src/gpu/GrCommandBuilder.h
+++ b/src/gpu/GrCommandBuilder.h
@@ -14,8 +14,8 @@ 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);
 
@@ -28,7 +28,7 @@ public:
                                         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*,