Stateful PathRenderer implementation

src/gpu/GrContext.cpp

Index: src/gpu/GrContext.cpp
===================================================================
--- src/gpu/GrContext.cpp	(revision 13379)
+++ src/gpu/GrContext.cpp	(working copy)
@@ -1148,16 +1148,18 @@
 
     GrPathRendererChain::DrawType type =
         useCoverageAA ? GrPathRendererChain::kColorAntiAlias_DrawType :
-                           GrPathRendererChain::kColor_DrawType;
+                        GrPathRendererChain::kColor_DrawType;
 
     const SkPath* pathPtr = &path;
     SkTLazy<SkPath> tmpPath;
     SkTCopyOnFirstWrite<SkStrokeRec> stroke(origStroke);
 
     // Try a 1st time without stroking the path and without allowing the SW renderer
-    GrPathRenderer* pr = this->getPathRenderer(*pathPtr, *stroke, target, false, type);
+    GrPathRenderer::AutoClearPath acp(this->getPathRenderer(*pathPtr, *stroke, 
+                                      target, false, type,
+                                      pathPtr->getFillType()));
 
-    if (NULL == pr) {
+    if (NULL == acp.renderer()) {
         if (!GrPathRenderer::IsStrokeHairlineOrEquivalent(*stroke, this->getMatrix(), NULL)) {
             // It didn't work the 1st time, so try again with the stroked path
             if (stroke->applyToPath(tmpPath.init(), *pathPtr)) {
@@ -1170,17 +1172,18 @@
         }
 
         // This time, allow SW renderer
-        pr = this->getPathRenderer(*pathPtr, *stroke, target, true, type);
+        acp.set(this->getPathRenderer(*pathPtr, *stroke, target, true, type,
+                                      pathPtr->getFillType()));
     }
 
-    if (NULL == pr) {
+    if (NULL == acp.renderer()) {
 #ifdef SK_DEBUG
         GrPrintf("Unable to find path renderer compatible with path.\n");
 #endif
         return;
     }
 
-    pr->drawPath(*pathPtr, *stroke, target, useCoverageAA);
+    acp->drawPath(*stroke, target, useCoverageAA);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1676,6 +1679,7 @@
                                            const GrDrawTarget* target,
                                            bool allowSW,
                                            GrPathRendererChain::DrawType drawType,
+                                           SkPath::FillType fillType,
                                            GrPathRendererChain::StencilSupport* stencilSupport) {
 
     if (NULL == fPathRendererChain) {
@@ -1686,6 +1690,7 @@
                                                              stroke,
                                                              target,
                                                              drawType,
+                                                             fillType,
                                                              stencilSupport);
 
     if (NULL == pr && allowSW) {
@@ -1693,6 +1698,7 @@
             fSoftwarePathRenderer = SkNEW_ARGS(GrSoftwarePathRenderer, (this));
         }
         pr = fSoftwarePathRenderer;
+        pr->setPath(path, fillType);
     }
 
     return pr;