| Index: src/gpu/GrAAConvexPathRenderer.cpp
|
| ===================================================================
|
| --- src/gpu/GrAAConvexPathRenderer.cpp (revision 11314)
|
| +++ src/gpu/GrAAConvexPathRenderer.cpp (working copy)
|
| @@ -603,12 +603,11 @@
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -bool GrAAConvexPathRenderer::canDrawPath(const SkPath& path,
|
| - const SkStrokeRec& stroke,
|
| +bool GrAAConvexPathRenderer::canDrawPath(const SkStrokeRec& stroke,
|
| const GrDrawTarget* target,
|
| bool antiAlias) const {
|
| return (target->caps()->shaderDerivativeSupport() && antiAlias &&
|
| - stroke.isFillStyle() && !path.isInverseFillType() && path.isConvex());
|
| + stroke.isFillStyle() && !fPath.isInverseFillType() && fPath.isConvex());
|
| }
|
|
|
| namespace {
|
| @@ -621,12 +620,11 @@
|
|
|
| };
|
|
|
| -bool GrAAConvexPathRenderer::onDrawPath(const SkPath& origPath,
|
| - const SkStrokeRec&,
|
| +bool GrAAConvexPathRenderer::onDrawPath(const SkStrokeRec&,
|
| GrDrawTarget* target,
|
| bool antiAlias) {
|
|
|
| - const SkPath* path = &origPath;
|
| + const SkPath* path = &fPath;
|
| if (path->isEmpty()) {
|
| return true;
|
| }
|
| @@ -643,7 +641,7 @@
|
| // segment representation.
|
| SkPath tmpPath;
|
| if (viewMatrix.hasPerspective()) {
|
| - origPath.transform(viewMatrix, &tmpPath);
|
| + fPath.transform(viewMatrix, &tmpPath);
|
| path = &tmpPath;
|
| viewMatrix = SkMatrix::I();
|
| }
|
|
|