Revert of Fix mixed samples stencil clip

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"
@@ skipping 15 matching lines @@
 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() : fIsCoCenteredMultisampledDraw(false) {}
-
+    GrAppliedClip() {}
     const GrFragmentProcessor* clipCoverageFragmentProcessor() const { return fClipCoverageFP; }
     const GrScissorState& scissorState() const { return fScissorState; }
 
-    /**
-     * This is used to perform a multisampled clip test when the draw requires MSAA to be disabled.
-     * It will allow the stencil test to run multisampled by turning on hardware MSAA, but co-locate
-     * the draw's samples at pixel center so it will still feel like MSAA is disabled.
-     */
-    bool isCoCenteredMultisampledDraw() const { return fIsCoCenteredMultisampledDraw; }
-
 private:
     SkAutoTUnref<const GrFragmentProcessor> fClipCoverageFP;
     GrScissorState                          fScissorState;
-    bool                                    fIsCoCenteredMultisampledDraw;
-
     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
@@ skipping 115 matching lines @@
     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;
 
     typedef SkNoncopyable INHERITED;
 };
 #endif // GrClipMaskManager_DEFINED