Revert of Add choke point for modifying non-AA rect draws (e.g., applying clipping)

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 "GrReducedClip.h"
@@ skipping 29 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. devBounds is optional but can help optimize
      * clipping.
      */
     static bool SetupClipping(GrContext*, const GrPipelineBuilder&, GrDrawContext*,
                               const GrClipStackClip&, const SkRect* devBounds, GrAppliedClip*);
 
 private:
+    static void DrawNonAARect(GrDrawContext* drawContext,
+                              const GrFixedClip& clip,
+                              const SkMatrix& viewMatrix,
+                              const SkRect& rect,
+                              bool isAA,
+                              const GrUserStencilSettings* stencilSettings);
+
     static bool PathNeedsSWRenderer(GrContext* context,
                                     bool hasUserStencilSettings,
                                     const GrDrawContext*,
                                     const SkMatrix& viewMatrix,
                                     const SkClipStack::Element* element,
                                     GrPathRenderer** prOut,
                                     bool needsStencil);
 
     // Draws the clip into the stencil buffer
     static bool CreateStencilClipMask(GrContext*,
@@ skipping 25 matching lines @@
                              const GrPipelineBuilder&,
                              const GrDrawContext*,
                              const SkVector& clipToMaskOffset,
                              const GrReducedClip::ElementList& elements);
 
     static GrTexture* CreateCachedMask(int width, int height, const GrUniqueKey& key,
                                        bool renderTarget);
 };
 
 #endif // GrClipMaskManager_DEFINED