Revert of r13384 (Stateful PathRenderer implementation)

src/gpu/GrStencilAndCoverPathRenderer.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrStencilAndCoverPathRenderer.h"
@@ skipping 16 matching lines @@
 GrStencilAndCoverPathRenderer::GrStencilAndCoverPathRenderer(GrGpu* gpu) {
     SkASSERT(gpu->caps()->pathRenderingSupport());
     fGpu = gpu;
     gpu->ref();
 }
 
 GrStencilAndCoverPathRenderer::~GrStencilAndCoverPathRenderer() {
     fGpu->unref();
 }
 
-bool GrStencilAndCoverPathRenderer::canDrawPath(const SkStrokeRec& stroke,
+bool GrStencilAndCoverPathRenderer::canDrawPath(const SkPath& path,
+                                                const SkStrokeRec& stroke,
                                                 const GrDrawTarget* target,
                                                 bool antiAlias) const {
     return !stroke.isHairlineStyle() &&
            !antiAlias && // doesn't do per-path AA, relies on the target having MSAA
            NULL != target->getDrawState().getRenderTarget()->getStencilBuffer() &&
            target->getDrawState().getStencil().isDisabled();
 }
 
 GrPathRenderer::StencilSupport GrStencilAndCoverPathRenderer::onGetStencilSupport(
+                                                        const SkPath&,
                                                         const SkStrokeRec& ,
                                                         const GrDrawTarget*) const {
     return GrPathRenderer::kStencilOnly_StencilSupport;
 }
 
-void GrStencilAndCoverPathRenderer::onStencilPath(const SkStrokeRec& stroke,
+void GrStencilAndCoverPathRenderer::onStencilPath(const SkPath& path,
+                                                  const SkStrokeRec& stroke,
                                                   GrDrawTarget* target) {
-    SkASSERT(!this->path().isInverseFillType());
-    SkAutoTUnref<GrPath> p(fGpu->getContext()->createPath(this->path(), stroke));
-    target->stencilPath(p, this->path().getFillType());
+    SkASSERT(!path.isInverseFillType());
+    SkAutoTUnref<GrPath> p(fGpu->getContext()->createPath(path, stroke));
+    target->stencilPath(p, path.getFillType());
 }
 
-bool GrStencilAndCoverPathRenderer::onDrawPath(const SkStrokeRec& stroke,
+bool GrStencilAndCoverPathRenderer::onDrawPath(const SkPath& path,
+                                               const SkStrokeRec& stroke,
                                                GrDrawTarget* target,
                                                bool antiAlias) {
     SkASSERT(!antiAlias);
     SkASSERT(!stroke.isHairlineStyle());
 
     GrDrawState* drawState = target->drawState();
     SkASSERT(drawState->getStencil().isDisabled());
 
-    SkAutoTUnref<GrPath> p(fGpu->getContext()->createPath(this->path(), stroke));
+    SkAutoTUnref<GrPath> p(fGpu->getContext()->createPath(path, stroke));
 
-    if (this->path().isInverseFillType()) {
+    if (path.isInverseFillType()) {
         GR_STATIC_CONST_SAME_STENCIL(kInvertedStencilPass,
             kZero_StencilOp,
             kZero_StencilOp,
             // We know our rect will hit pixels outside the clip and the user bits will be 0
             // outside the clip. So we can't just fill where the user bits are 0. We also need to
             // check that the clip bit is set.
             kEqualIfInClip_StencilFunc,
             0xffff,
             0x0000,
             0xffff);
 
         *drawState->stencil() = kInvertedStencilPass;
     } else {
         GR_STATIC_CONST_SAME_STENCIL(kStencilPass,
             kZero_StencilOp,
             kZero_StencilOp,
             kNotEqual_StencilFunc,
             0xffff,
             0x0000,
             0xffff);
 
         *drawState->stencil() = kStencilPass;
     }
 
-    target->drawPath(p, this->path().getFillType());
+    target->drawPath(p, path.getFillType());
 
     target->drawState()->stencil()->setDisabled();
     return true;
 }