| Index: src/gpu/GrStencilAndCoverPathRenderer.cpp | 
| diff --git a/src/gpu/GrStencilAndCoverPathRenderer.cpp b/src/gpu/GrStencilAndCoverPathRenderer.cpp | 
| index aed1743af22216864a2aa2382a2ea724cc0c82a9..b8dcb8dafb4b9eb8476cc81964cbd69bc304854c 100644 | 
| --- a/src/gpu/GrStencilAndCoverPathRenderer.cpp | 
| +++ b/src/gpu/GrStencilAndCoverPathRenderer.cpp | 
| @@ -14,6 +14,7 @@ | 
| #include "GrPath.h" | 
| #include "GrRenderTarget.h" | 
| #include "GrRenderTargetPriv.h" | 
| +#include "GrStrokeInfo.h" | 
| #include "SkStrokeRec.h" | 
|  | 
| /* | 
| @@ -56,9 +57,9 @@ bool GrStencilAndCoverPathRenderer::canDrawPath(const GrDrawTarget* target, | 
| const GrPipelineBuilder* pipelineBuilder, | 
| const SkMatrix& viewMatrix, | 
| const SkPath& path, | 
| -                                                const SkStrokeRec& stroke, | 
| +                                                const GrStrokeInfo& stroke, | 
| bool antiAlias) const { | 
| -    return !stroke.isHairlineStyle() && | 
| +    return !stroke.getStrokeRec().isHairlineStyle() && | 
| !antiAlias && // doesn't do per-path AA, relies on the target having MSAA | 
| pipelineBuilder->getStencil().isDisabled(); | 
| } | 
| @@ -67,7 +68,7 @@ GrPathRenderer::StencilSupport | 
| GrStencilAndCoverPathRenderer::onGetStencilSupport(const GrDrawTarget*, | 
| const GrPipelineBuilder*, | 
| const SkPath&, | 
| -                                                   const SkStrokeRec&) const { | 
| +                                                   const GrStrokeInfo&) const { | 
| return GrPathRenderer::kStencilOnly_StencilSupport; | 
| } | 
|  | 
| @@ -87,10 +88,10 @@ void GrStencilAndCoverPathRenderer::onStencilPath(GrDrawTarget* target, | 
| GrPipelineBuilder* pipelineBuilder, | 
| const SkMatrix& viewMatrix, | 
| const SkPath& path, | 
| -                                                  const SkStrokeRec& stroke) { | 
| +                                                  const GrStrokeInfo& stroke) { | 
| SkASSERT(!path.isInverseFillType()); | 
| SkAutoTUnref<GrPathProcessor> pp(GrPathProcessor::Create(GrColor_WHITE, viewMatrix)); | 
| -    SkAutoTUnref<GrPath> p(get_gr_path(fGpu, path, stroke)); | 
| +    SkAutoTUnref<GrPath> p(get_gr_path(fGpu, path, stroke.getStrokeRec())); | 
| target->stencilPath(pipelineBuilder, pp, p, convert_skpath_filltype(path.getFillType())); | 
| } | 
|  | 
| @@ -99,14 +100,14 @@ bool GrStencilAndCoverPathRenderer::onDrawPath(GrDrawTarget* target, | 
| GrColor color, | 
| const SkMatrix& viewMatrix, | 
| const SkPath& path, | 
| -                                               const SkStrokeRec& stroke, | 
| +                                               const GrStrokeInfo& stroke, | 
| bool antiAlias) { | 
| SkASSERT(!antiAlias); | 
| -    SkASSERT(!stroke.isHairlineStyle()); | 
| +    SkASSERT(!stroke.getStrokeRec().isHairlineStyle()); | 
|  | 
| SkASSERT(pipelineBuilder->getStencil().isDisabled()); | 
|  | 
| -    SkAutoTUnref<GrPath> p(get_gr_path(fGpu, path, stroke)); | 
| +    SkAutoTUnref<GrPath> p(get_gr_path(fGpu, path, stroke.getStrokeRec())); | 
|  | 
| if (path.isInverseFillType()) { | 
| GR_STATIC_CONST_SAME_STENCIL(kInvertedStencilPass, | 
|  |