Revert of Separate user and raw stencil settings

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 "GrPipelineBuilder.h"
 #include "GrReducedClip.h"
+#include "GrStencil.h"
 #include "GrTexture.h"
 #include "SkClipStack.h"
 #include "SkDeque.h"
 #include "SkPath.h"
 #include "SkRefCnt.h"
 #include "SkTLList.h"
 #include "SkTypes.h"
 
 class GrDrawTarget;
 class GrPathRenderer;
 class GrPathRendererChain;
 class GrResourceProvider;
 class GrTexture;
 class SkPath;
 
 /**
  * Produced by GrClipMaskManager. It provides a set of modifications to the drawing state that
  * are used to create the final GrPipeline for a GrBatch. This is a work in progress. It will
  * eventually encapsulate all mechanisms for modifying the scissor, shaders, and stencil state
  * to implement clipping.
  */
 class GrAppliedClip : public SkNoncopyable {
 public:
-    GrAppliedClip() : fHasStencilClip(false) {}
+    GrAppliedClip() {}
     const GrFragmentProcessor* clipCoverageFragmentProcessor() const { return fClipCoverageFP; }
     const GrScissorState& scissorState() const { return fScissorState; }
-    bool hasStencilClip() const { return fHasStencilClip; }
 
 private:
     SkAutoTUnref<const GrFragmentProcessor> fClipCoverageFP;
     GrScissorState                          fScissorState;
-    bool                                    fHasStencilClip;
     friend class GrClipMaskManager;
 
     typedef SkNoncopyable INHERITED;
 };
 
 /**
  * The clip mask creator handles the generation of the clip mask. If anti
  * aliasing is requested it will (in the future) generate a single channel
  * (8bit) mask. If no anti aliasing is requested it will generate a 1-bit
  * mask in the stencil buffer. In the non anti-aliasing case, if the clip
  * mask can be represented as a rectangle then scissoring is used. In all
  * cases scissoring is used to bound the range of the clip mask.
  */
 class GrClipMaskManager : SkNoncopyable {
 public:
     GrClipMaskManager(GrDrawTarget* owner, bool debugClipBatchToBounds);
 
     /**
      * 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. devBounds is optional but can help optimize
-     * clipping.
+     * 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&, const SkRect* devBounds, GrAppliedClip*);
+    bool setupClipping(const GrPipelineBuilder&,
+                       GrPipelineBuilder::AutoRestoreStencil*,
+                       const SkRect* devBounds,
+                       GrAppliedClip*);
 
     bool setupScissorClip(const GrPipelineBuilder& pipelineBuilder,
+                          GrPipelineBuilder::AutoRestoreStencil* ars,
                           const SkIRect& scissor,
                           const SkRect* devBounds,
                           GrAppliedClip* out);
 
+    void adjustPathStencilParams(const GrStencilAttachment*, GrStencilSettings*);
+
 private:
     inline GrContext* getContext();
     inline const GrCaps* caps() const;
     inline GrResourceProvider* resourceProvider();
 
     static bool PathNeedsSWRenderer(GrContext* context,
-                                    bool hasUserStencilSettings,
+                                    bool isStencilDisabled,
                                     const GrRenderTarget* rt,
                                     const SkMatrix& viewMatrix,
                                     const SkClipStack::Element* element,
                                     GrPathRenderer** prOut,
                                     bool needsStencil);
     static GrPathRenderer* GetPathRenderer(GrContext* context,
                                            GrTexture* texture,
                                            const SkMatrix& viewMatrix,
                                            const SkClipStack::Element* element);
 
@@ skipping 46 matching lines @@
                                              const GrReducedClip::ElementList& elements,
                                              const SkVector& clipToMaskOffset,
                                              const SkIRect& clipSpaceIBounds);
 
    static bool UseSWOnlyPath(GrContext*,
                              const GrPipelineBuilder&,
                              const GrRenderTarget* rt,
                              const SkVector& clipToMaskOffset,
                              const GrReducedClip::ElementList& elements);
 
+    /**
+     * Called prior to return control back the GrGpu in setupClipping. It updates the
+     * GrPipelineBuilder with stencil settings that account for stencil-based clipping.
+     */
+    void setPipelineBuilderStencil(const GrPipelineBuilder&,
+                                   GrPipelineBuilder::AutoRestoreStencil*);
+
+    /**
+     * Adjusts the stencil settings to account for interaction with stencil
+     * clipping.
+     */
+    void adjustStencilParams(GrStencilSettings* settings,
+                             StencilClipMode mode,
+                             int stencilBitCnt);
+
     GrTexture* createCachedMask(int width, int height, const GrUniqueKey& key, bool renderTarget);
 
     static const int kMaxAnalyticElements = 4;
 
     GrDrawTarget*   fDrawTarget;    // This is our owning draw target.
     StencilClipMode fClipMode;
     bool            fDebugClipBatchToBounds;
 
     typedef SkNoncopyable INHERITED;
 };
 #endif // GrClipMaskManager_DEFINED