Revert of r13384 (Stateful PathRenderer implementation)

src/gpu/GrClipMaskManager.h

Index: src/gpu/GrClipMaskManager.h
===================================================================
--- src/gpu/GrClipMaskManager.h	(revision 13407)
+++ src/gpu/GrClipMaskManager.h	(working copy)
@@ -11,7 +11,6 @@
 #include "GrClipMaskCache.h"
 #include "GrContext.h"
 #include "GrDrawState.h"
-#include "GrPathRenderer.h"
 #include "GrReducedClip.h"
 #include "GrStencil.h"
 #include "GrTexture.h"
@@ -131,18 +130,15 @@
 
     bool useSWOnlyPath(const GrReducedClip::ElementList& elements);
 
-    // Draws a filled clip path into the target alpha mask
-    bool drawFilledPath(GrTexture* target, GrPathRenderer* pathRenderer, bool isAA);
-
     // Draws a clip element into the target alpha mask. The caller should have already setup the
-    // desired blend operation.
-    bool drawElement(GrTexture* target, const SkClipStack::Element* element);
+    // desired blend operation. Optionally if the caller already selected a path renderer it can
+    // be passed. Otherwise the function will select one if the element is a path.
+    bool drawElement(GrTexture* target, const SkClipStack::Element*, GrPathRenderer* = NULL);
 
     // Determines whether it is possible to draw the element to both the stencil buffer and the
     // alpha mask simultaneously. If so and the element is a path a compatible path renderer is
     // also returned.
-    bool canStencilAndDrawElement(GrTexture* target, const SkClipStack::Element*, 
-                                  GrPathRenderer::AutoClearPath* pr);
+    bool canStencilAndDrawElement(GrTexture* target, const SkClipStack::Element*, GrPathRenderer**);
 
     void mergeMask(GrTexture* dstMask,
                    GrTexture* srcMask,