Move clip off of draw target

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 34 matching lines @@
      * 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(GrPipelineBuilder*,
                        GrPipelineBuilder::AutoRestoreEffects*,
                        GrPipelineBuilder::AutoRestoreStencil*,
                        GrScissorState*,
-                       const GrClipData* clipDataIn,
                        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 {
         return kStencil_ClipMaskType == fCurrClipMaskType;
@@ skipping 124 matching lines @@
         kAlpha_ClipMaskType,
     } fCurrClipMaskType;
 
     GrClipMaskCache fAACache;       // cache for the AA path
     GrClipTarget*   fClipTarget;
     StencilClipMode fClipMode;
 
     typedef SkNoncopyable INHERITED;
 };
 #endif // GrClipMaskManager_DEFINED