| Index: experimental/AndroidPathRenderer/GrAndroidPathRenderer.cpp
|
| diff --git a/experimental/AndroidPathRenderer/GrAndroidPathRenderer.cpp b/experimental/AndroidPathRenderer/GrAndroidPathRenderer.cpp
|
| index 8faf49fe66a16c811ca83082b17115d40d899136..b7ece201ab9c4a657cbfb88c5b571016f5f29105 100644
|
| --- a/experimental/AndroidPathRenderer/GrAndroidPathRenderer.cpp
|
| +++ b/experimental/AndroidPathRenderer/GrAndroidPathRenderer.cpp
|
| @@ -14,10 +14,10 @@ GrAndroidPathRenderer::GrAndroidPathRenderer() {
|
| }
|
|
|
| bool GrAndroidPathRenderer::canDrawPath(const SkPath& path,
|
| - const SkStrokeRec& stroke,
|
| + const GrStrokeInfo& stroke,
|
| const GrDrawTarget* target,
|
| bool antiAlias) const {
|
| - return ((stroke.isFillStyle() || stroke.getStyle() == SkStrokeRec::kStroke_Style)
|
| + return ((stroke.isFillStyle() || stroke.getStrokeRec().getStyle() == SkStrokeRec::kStroke_Style)
|
| && !path.isInverseFillType() && path.isConvex());
|
| }
|
|
|
| @@ -27,14 +27,14 @@ struct ColorVertex {
|
| };
|
|
|
| bool GrAndroidPathRenderer::onDrawPath(const SkPath& origPath,
|
| - const SkStrokeRec& stroke,
|
| + const GrStrokeInfo& stroke,
|
| GrDrawTarget* target,
|
| bool antiAlias) {
|
|
|
| // generate verts using Android algorithm
|
| android::uirenderer::VertexBuffer vertices;
|
| - android::uirenderer::PathRenderer::ConvexPathVertices(origPath, stroke, antiAlias, NULL,
|
| - &vertices);
|
| + android::uirenderer::PathRenderer::ConvexPathVertices(origPath, stroke.getStrokeRec(),
|
| + antiAlias, NULL, &vertices);
|
|
|
| // set vertex attributes depending on anti-alias
|
| GrDrawState* drawState = target->drawState();
|
|
|