Clip mask manager moved to ClipTarget

src/gpu/GrGpu.h

Index: src/gpu/GrGpu.h
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h
index de90b4d06136593bbbce54539eb9eb7e31cd1c5a..34f57b69644f056890c2a8c5b512261425c4518b 100644
--- a/src/gpu/GrGpu.h
+++ b/src/gpu/GrGpu.h
@@ -9,7 +9,6 @@
 #define GrGpu_DEFINED
 
 #include "GrDrawTarget.h"
-#include "GrClipMaskManager.h"
 #include "GrPathRendering.h"
 #include "SkPath.h"
 
@@ -298,16 +297,6 @@ public:
         return fResetTimestamp;
     }
 
-    enum PrivateDrawStateStateBits {
-        kFirstBit = (GrDrawState::kLastPublicStateBit << 1),
-
-        kModifyStencilClip_StateBit = kFirstBit, // allows draws to modify
-                                                 // stencil bits used for
-                                                 // clipping.
-    };
-
-    void getPathStencilSettingsForFillType(SkPath::FillType fill, GrStencilSettings* outStencilSettings);
-
     enum DrawType {
         kDrawPoints_DrawType,
         kDrawLines_DrawType,
@@ -358,8 +347,6 @@ protected:
                                           unsigned int* ref,
                                           unsigned int* mask);
 
-    GrClipMaskManager           fClipMaskManager;
-
     GrContext::GPUStats         fGPUStats;
 
     struct GeometryPoolState {