Revert of r13384 (Stateful PathRenderer implementation)

src/gpu/GrPathRendererChain.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrPathRendererChain.h"
@@ skipping 17 matching lines @@
 GrPathRenderer* GrPathRendererChain::addPathRenderer(GrPathRenderer* pr) {
     fChain.push_back() = pr;
     pr->ref();
     return pr;
 }
 
 GrPathRenderer* GrPathRendererChain::getPathRenderer(const SkPath& path,
                                                      const SkStrokeRec& stroke,
                                                      const GrDrawTarget* target,
                                                      DrawType drawType,
-                                                     SkPath::FillType fillType,
                                                      StencilSupport* stencilSupport) {
     if (!fInit) {
         this->init();
     }
     bool antiAlias = (kColorAntiAlias_DrawType == drawType ||
                       kStencilAndColorAntiAlias_DrawType == drawType);
 
     GR_STATIC_ASSERT(GrPathRenderer::kNoSupport_StencilSupport <
                      GrPathRenderer::kStencilOnly_StencilSupport);
     GR_STATIC_ASSERT(GrPathRenderer::kStencilOnly_StencilSupport <
                      GrPathRenderer::kNoRestriction_StencilSupport);
     GrPathRenderer::StencilSupport minStencilSupport;
     if (kStencilOnly_DrawType == drawType) {
         minStencilSupport = GrPathRenderer::kStencilOnly_StencilSupport;
     } else if (kStencilAndColor_DrawType == drawType ||
                kStencilAndColorAntiAlias_DrawType == drawType) {
         minStencilSupport = GrPathRenderer::kNoRestriction_StencilSupport;
     } else {
         minStencilSupport = GrPathRenderer::kNoSupport_StencilSupport;
     }
 
+
     for (int i = 0; i < fChain.count(); ++i) {
-        fChain[i]->setPath(path, fillType);
-        if (fChain[i]->canDrawPath(stroke, target, antiAlias)) {
+        if (fChain[i]->canDrawPath(path, stroke, target, antiAlias)) {
             if (GrPathRenderer::kNoSupport_StencilSupport != minStencilSupport) {
-                GrPathRenderer::StencilSupport support = fChain[i]->getStencilSupport(stroke,
+                GrPathRenderer::StencilSupport support = fChain[i]->getStencilSupport(path,
+                                                                                      stroke,
                                                                                       target);
                 if (support < minStencilSupport) {
                     continue;
                 } else if (NULL != stencilSupport) {
                     *stencilSupport = support;
                 }
             }
             return fChain[i];
         }
-        fChain[i]->resetPath();
     }
     return NULL;
 }
 
 void GrPathRendererChain::init() {
     SkASSERT(!fInit);
     GrGpu* gpu = fOwner->getGpu();
     bool twoSided = gpu->caps()->twoSidedStencilSupport();
     bool wrapOp = gpu->caps()->stencilWrapOpsSupport();
     GrPathRenderer::AddPathRenderers(fOwner, this);
     this->addPathRenderer(SkNEW_ARGS(GrDefaultPathRenderer,
                                      (twoSided, wrapOp)))->unref();
     fInit = true;
 }