small cleanups after fixing const of GrPipelineBuilder on DrawTarget

src/gpu/GrClipMaskManager.cpp

Index: src/gpu/GrClipMaskManager.cpp
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index d7501c3adf4b8ca9b76096a99eba202ed70d8559..f70faa87286205496324ebd91b7d0f08ce8719d4 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -32,12 +32,10 @@ namespace {
 // stage matrix this also alters the vertex layout
 void setup_drawstate_aaclip(const GrPipelineBuilder& pipelineBuilder,
                             GrTexture* result,

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

arfps ?

-                            GrPipelineBuilder::AutoRestoreFragmentProcessors* arfp,
-                            GrPipelineBuilder::AutoRestoreProcessorDataManager* arpdm,
+                            GrPipelineBuilder::AutoRestoreFragmentProcessorState* arfp,
                             const SkIRect &devBound) {
-    SkASSERT(arfp && arpdm);
+    SkASSERT(arfp);
     arfp->set(&pipelineBuilder);
-    arpdm->set(&pipelineBuilder);
 
     SkMatrix mat;
     // We use device coords to compute the texture coordinates. We set our matrix to be a
@@ -49,7 +47,7 @@ void setup_drawstate_aaclip(const GrPipelineBuilder& pipelineBuilder,
     SkIRect domainTexels = SkIRect::MakeWH(devBound.width(), devBound.height());
     // This could be a long-lived effect that is cached with the alpha-mask.
     arfp->addCoverageProcessor(
-        GrTextureDomainEffect::Create(arpdm->getProcessorDataManager(),
+        GrTextureDomainEffect::Create(arfp->getProcessorDataManager(),
                                       result,
                                       mat,
                                       GrTextureDomain::MakeTexelDomain(result, domainTexels),
@@ -123,11 +121,12 @@ bool GrClipMaskManager::useSWOnlyPath(const GrPipelineBuilder& pipelineBuilder,
     return false;
 }
 
-bool GrClipMaskManager::installClipEffects(const GrPipelineBuilder& pipelineBuilder,
-                                           GrPipelineBuilder::AutoRestoreFragmentProcessors* arfp,
-                                           const GrReducedClip::ElementList& elements,
-                                           const SkVector& clipToRTOffset,
-                                           const SkRect* drawBounds) {
+bool GrClipMaskManager::installClipEffects(

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

arfps ?

+        const GrPipelineBuilder& pipelineBuilder,
+        GrPipelineBuilder::AutoRestoreFragmentProcessorState* arfp,
+        const GrReducedClip::ElementList& elements,
+        const SkVector& clipToRTOffset,
+        const SkRect* drawBounds) {
     SkRect boundsInClipSpace;
     if (drawBounds) {
         boundsInClipSpace = *drawBounds;
@@ -220,9 +219,8 @@ bool GrClipMaskManager::installClipEffects(const GrPipelineBuilder& pipelineBuil
 // sort out what kind of clip mask needs to be created: alpha, stencil,
 // scissor, or entirely software
 bool GrClipMaskManager::setupClipping(const GrPipelineBuilder& pipelineBuilder,
-                                      GrPipelineBuilder::AutoRestoreFragmentProcessors* arfp,
+                                      GrPipelineBuilder::AutoRestoreFragmentProcessorState* arfp,
                                       GrPipelineBuilder::AutoRestoreStencil* ars,
-                                      GrPipelineBuilder::AutoRestoreProcessorDataManager* arpdm,
                                       GrScissorState* scissorState,
                                       const SkRect* devBounds) {
     fCurrClipMaskType = kNone_ClipMaskType;
@@ -341,7 +339,7 @@ bool GrClipMaskManager::setupClipping(const GrPipelineBuilder& pipelineBuilder,
             // clipSpace bounds. We determine the mask's position WRT to the render target here.
             SkIRect rtSpaceMaskBounds = clipSpaceIBounds;
             rtSpaceMaskBounds.offset(-clip.origin());
-            setup_drawstate_aaclip(pipelineBuilder, result, arfp, arpdm, rtSpaceMaskBounds);
+            setup_drawstate_aaclip(pipelineBuilder, result, arfp, rtSpaceMaskBounds);
             this->setPipelineBuilderStencil(pipelineBuilder, ars);
             return true;
         }