commit 4421a4c90df48931758cdb747d5be80edb56cd12
author joshualitt <joshualitt@chromium.org> Mon Jul 13 09:36:41 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 13 09:36:41 2015 -0700
tree fbe260ed2e8052832a8227de1f318e79b612a271
parent 2419b360ead17231c555a9e01747b7ffbbfb70e4

small cleanups after fixing const of GrPipelineBuilder on DrawTarget

Fuse AutoRestoreFragmentProcessors and AutoRestoreProcessorDataManager into new AutoRestoreFragmentProcessorState class

BUG=skia:

Review URL: https://codereview.chromium.org/1228763005

src/gpu/GrClipMaskManager.h

diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index 6dd735b..1fd3d96 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -44,9 +44,8 @@
      * 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);
 
@@ -88,7 +87,7 @@
     // 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);