| Index: src/gpu/GrAAConvexPathRenderer.cpp
|
| diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
|
| index 1813803d8ad7ea41a7556ee1d32b01c366be8f60..a95af6f10d67e0d38385de5fae1242c54896c132 100644
|
| --- a/src/gpu/GrAAConvexPathRenderer.cpp
|
| +++ b/src/gpu/GrAAConvexPathRenderer.cpp
|
| @@ -18,6 +18,7 @@
|
| #include "GrPathUtils.h"
|
| #include "GrProcessor.h"
|
| #include "GrPipelineBuilder.h"
|
| +#include "GrStrokeInfo.h"
|
| #include "SkGeometry.h"
|
| #include "SkString.h"
|
| #include "SkStrokeRec.h"
|
| @@ -682,10 +683,10 @@ bool GrAAConvexPathRenderer::canDrawPath(const GrDrawTarget* target,
|
| const GrPipelineBuilder*,
|
| const SkMatrix& viewMatrix,
|
| const SkPath& path,
|
| - const SkStrokeRec& stroke,
|
| + const GrStrokeInfo& stroke,
|
| bool antiAlias) const {
|
| return (target->caps()->shaderDerivativeSupport() && antiAlias &&
|
| - stroke.isFillStyle() && !path.isInverseFillType() && path.isConvex());
|
| + stroke.getStrokeRec().isFillStyle() && !path.isInverseFillType() && path.isConvex());
|
| }
|
|
|
| class AAConvexPathBatch : public GrBatch {
|
| @@ -869,7 +870,7 @@ bool GrAAConvexPathRenderer::onDrawPath(GrDrawTarget* target,
|
| GrColor color,
|
| const SkMatrix& vm,
|
| const SkPath& path,
|
| - const SkStrokeRec&,
|
| + const GrStrokeInfo&,
|
| bool antiAlias) {
|
| if (path.isEmpty()) {
|
| return true;
|
|
|