small cleanups after fixing const of GrPipelineBuilder on DrawTarget

src/gpu/GrClipMaskManager.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef GrClipMaskManager_DEFINED
 #define GrClipMaskManager_DEFINED
 
 #include "GrClipMaskCache.h"
@@ skipping 26 matching lines @@
     GrClipMaskManager(GrClipTarget* owner);
 
     /**
      * Creates a clip mask if necessary as a stencil buffer or alpha texture
      * and sets the GrGpu's scissor and stencil state. If the return is false
      * then the draw can be skipped. The AutoRestoreEffects is initialized by
      * the manager when it must install additional effects to implement the
      * clip. devBounds is optional but can help optimize clipping.
      */
     bool setupClipping(const GrPipelineBuilder&,
-                       GrPipelineBuilder::AutoRestoreFragmentProcessors*,
+                       GrPipelineBuilder::AutoRestoreFragmentProcessorState*,
                        GrPipelineBuilder::AutoRestoreStencil*,
-                       GrPipelineBuilder::AutoRestoreProcessorDataManager*,
                        GrScissorState*,
                        const SkRect* devBounds);
 
     /**
      * Purge resources to free up memory. TODO: This class shouldn't hold any long lived refs
      * which will allow Resourcecache to automatically purge anything this class has created.
      */
     void purgeResources();
 
     bool isClipInStencil() const {
@@ skipping 21 matching lines @@
         // Clip against the existing representation of the clip in the high bit
         // of the stencil buffer.
         kRespectClip_StencilClipMode,
         // Neither writing to nor clipping against the clip bit.
         kIgnoreClip_StencilClipMode,
     };
 
     // Attempts to install a series of coverage effects to implement the clip. Return indicates
     // whether the element list was successfully converted to effects.
     bool installClipEffects(const GrPipelineBuilder&,
-                            GrPipelineBuilder::AutoRestoreFragmentProcessors*,
+                            GrPipelineBuilder::AutoRestoreFragmentProcessorState*,
                             const GrReducedClip::ElementList&,
                             const SkVector& clipOffset,
                             const SkRect* devBounds);
 
     // Draws the clip into the stencil buffer
     bool createStencilClipMask(GrRenderTarget*,
                                int32_t elementsGenID,
                                GrReducedClip::InitialState initialState,
                                const GrReducedClip::ElementList& elements,
                                const SkIRect& clipSpaceIBounds,
@@ skipping 82 matching lines @@
         kAlpha_ClipMaskType,
     } fCurrClipMaskType;
 
     GrClipMaskCache fAACache;       // cache for the AA path
     GrClipTarget*   fClipTarget;    // This is our owning clip target.
     StencilClipMode fClipMode;
 
     typedef SkNoncopyable INHERITED;
 };
 #endif // GrClipMaskManager_DEFINED