Clip mask manager moved to ClipTarget

src/gpu/GrDrawTarget.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawTarget_DEFINED
 #define GrDrawTarget_DEFINED
 
@@ skipping 487 matching lines @@
     /**
      * For subclass internal use to invoke a call to onDrawPaths().
      */
     void executeDrawPaths(const GrPathRange* pathRange,
                           const uint32_t indices[], int count,
                           const float transforms[], PathTransformType transformsType,
                           SkPath::FillType fill,
                           const GrDeviceCoordTexture* dstCopy) {
         this->onDrawPaths(pathRange, indices, count, transforms, transformsType, fill, dstCopy);
     }
+
     ////////////////////////////////////////////////////////////////////////////
 
     /**
      * See AutoStateRestore below.
      */
     enum ASRInit {
         kPreserve_ASRInit,
         kReset_ASRInit
     };
 
@@ skipping 416 matching lines @@
     // The context owns us, not vice-versa, so this ptr is not ref'ed by DrawTarget.
     GrContext*                                                      fContext;
     // To keep track that we always have at least as many debug marker adds as removes
     int                                                             fGpuTraceMarkerCount;
     GrTraceMarkerSet                                                fActiveTraceMarkers;
     GrTraceMarkerSet                                                fStoredTraceMarkers;
 
     typedef SkRefCnt INHERITED;
 };
 
 class GrClipTarget : public GrDrawTarget {

[bsalomon, 2014/10/28 17:53:28]

This class needs a comment about why it exists.

 public:
-    GrClipTarget(GrContext* context) : INHERITED(context) {}
+    GrClipTarget(GrContext* context) : INHERITED(context) {
+        fClipMaskManager.setClipTarget(this);
+    }
+
+    void getPathStencilSettingsForFillType(SkPath::FillType, GrStencilSettings*);
+
+    /* Clip mask manager needs access to the context.
+     * TODO we only need a very small subset of context in the CMM.
+     */
+    GrContext* getContext() { return INHERITED::getContext(); }
+    const GrContext* getContext() const { return INHERITED::getContext(); }
+
     /**
      * Clip Mask Manager(and no one else) needs to clear private stencil bits.
      * ClipTarget subclass sets clip bit in the stencil buffer. The subclass
      * is free to clear the remaining bits to zero if masked clears are more
      * expensive than clearing all bits.
      */
     virtual void clearStencilClip(const SkIRect& rect, bool insideClip, GrRenderTarget* = NULL) = 0;
 
+protected:
+    GrClipMaskManager           fClipMaskManager;
+
 private:
     typedef GrDrawTarget INHERITED;
 };
 
 #endif