small cleanups after fixing const of GrPipelineBuilder on DrawTarget

src/gpu/GrDrawTarget.cpp

Index: src/gpu/GrDrawTarget.cpp
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index ba06c66e8b063c542cb523d53174204ce9d8e9d2..30938994182ca2eaadaa555d32b84c5bdff5baec 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -131,10 +131,9 @@ void GrDrawTarget::drawBatch(const GrPipelineBuilder& pipelineBuilder, GrBatch*
 
     // Setup clip
     GrScissorState scissorState;

[robertphillips, 2015/07/13 16:16:09]

arfps ?

-    GrPipelineBuilder::AutoRestoreFragmentProcessors arfp;
+    GrPipelineBuilder::AutoRestoreFragmentProcessorState arfp;
     GrPipelineBuilder::AutoRestoreStencil ars;
-    GrPipelineBuilder::AutoRestoreProcessorDataManager arpdm;
-    if (!this->setupClip(pipelineBuilder, &arfp, &ars, &arpdm, &scissorState, &batch->bounds())) {
+    if (!this->setupClip(pipelineBuilder, &arfp, &ars, &scissorState, &batch->bounds())) {
         return;
     }
 
@@ -197,10 +196,9 @@ void GrDrawTarget::stencilPath(const GrPipelineBuilder& pipelineBuilder,
 
     // Setup clip
     GrScissorState scissorState;

[robertphillips, 2015/07/13 16:16:09]

arfps ?

-    GrPipelineBuilder::AutoRestoreFragmentProcessors arfp;
+    GrPipelineBuilder::AutoRestoreFragmentProcessorState arfp;
     GrPipelineBuilder::AutoRestoreStencil ars;
-    GrPipelineBuilder::AutoRestoreProcessorDataManager arpdm;
-    if (!this->setupClip(pipelineBuilder, &arfp, &ars, &arpdm, &scissorState, NULL)) {
+    if (!this->setupClip(pipelineBuilder, &arfp, &ars, &scissorState, NULL)) {
         return;
     }
 
@@ -226,10 +224,9 @@ void GrDrawTarget::drawPath(const GrPipelineBuilder& pipelineBuilder,
 
     // Setup clip
     GrScissorState scissorState;
-    GrPipelineBuilder::AutoRestoreFragmentProcessors arfp;
+    GrPipelineBuilder::AutoRestoreFragmentProcessorState arfp;
     GrPipelineBuilder::AutoRestoreStencil ars;
-    GrPipelineBuilder::AutoRestoreProcessorDataManager arpdm;
-    if (!this->setupClip(pipelineBuilder, &arfp, &ars, &arpdm, &scissorState, &devBounds)) {
+    if (!this->setupClip(pipelineBuilder, &arfp, &ars, &scissorState, &devBounds)) {
        return;
     }
 
@@ -265,10 +262,9 @@ void GrDrawTarget::drawPaths(const GrPipelineBuilder& pipelineBuilder,
 
     // Setup clip
     GrScissorState scissorState;
-    GrPipelineBuilder::AutoRestoreFragmentProcessors arfp;
+    GrPipelineBuilder::AutoRestoreFragmentProcessorState arfp;
     GrPipelineBuilder::AutoRestoreStencil ars;
-    GrPipelineBuilder::AutoRestoreProcessorDataManager arpdm;
-    if (!this->setupClip(pipelineBuilder, &arfp, &ars, &arpdm, &scissorState, NULL)) {
+    if (!this->setupClip(pipelineBuilder, &arfp, &ars, &scissorState, NULL)) {
         return;
     }
 
@@ -500,15 +496,13 @@ GrClipTarget::GrClipTarget(GrContext* context)
 
 
 bool GrClipTarget::setupClip(const GrPipelineBuilder& pipelineBuilder,
-                             GrPipelineBuilder::AutoRestoreFragmentProcessors* arfp,
+                             GrPipelineBuilder::AutoRestoreFragmentProcessorState* arfp,
                              GrPipelineBuilder::AutoRestoreStencil* ars,
-                             GrPipelineBuilder::AutoRestoreProcessorDataManager* arpdm,
                              GrScissorState* scissorState,
                              const SkRect* devBounds) {
     return fClipMaskManager->setupClipping(pipelineBuilder,
                                            arfp,
                                            ars,
-                                           arpdm,
                                            scissorState,
                                            devBounds);
 }