Index: src/gpu/GrAAConvexPathRenderer.cpp |
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp |
index eb52b61923ef4adc7a925d240e6f0ee8f0076368..a0e72e5e6e676fcfd1860fbaeb77f99f41a94e6b 100644 |
--- a/src/gpu/GrAAConvexPathRenderer.cpp |
+++ b/src/gpu/GrAAConvexPathRenderer.cpp |
@@ -243,13 +243,13 @@ bool get_segments(const SkPath& path, |
for (;;) { |
GrPoint pts[4]; |
- GrPathCmd cmd = (GrPathCmd)iter.next(pts); |
- switch (cmd) { |
- case kMove_PathCmd: |
+ SkPath::Verb verb = iter.next(pts); |
+ switch (verb) { |
+ case SkPath::kMove_Verb: |
m.mapPoints(pts, 1); |
update_degenerate_test(°enerateData, pts[0]); |
break; |
- case kLine_PathCmd: { |
+ case SkPath::kLine_Verb: { |
m.mapPoints(pts + 1, 1); |
update_degenerate_test(°enerateData, pts[1]); |
segments->push_back(); |
@@ -257,7 +257,7 @@ bool get_segments(const SkPath& path, |
segments->back().fPts[0] = pts[1]; |
break; |
} |
- case kQuadratic_PathCmd: |
+ case SkPath::kQuad_Verb: |
m.mapPoints(pts + 1, 2); |
update_degenerate_test(°enerateData, pts[1]); |
update_degenerate_test(°enerateData, pts[2]); |
@@ -266,7 +266,7 @@ bool get_segments(const SkPath& path, |
segments->back().fPts[0] = pts[1]; |
segments->back().fPts[1] = pts[2]; |
break; |
- case kCubic_PathCmd: { |
+ case SkPath::kCubic_Verb: { |
m.mapPoints(pts, 4); |
update_degenerate_test(°enerateData, pts[1]); |
update_degenerate_test(°enerateData, pts[2]); |
@@ -284,7 +284,7 @@ bool get_segments(const SkPath& path, |
} |
break; |
}; |
- case kEnd_PathCmd: |
+ case SkPath::kDone_Verb: |
if (degenerateData.isDegenerate()) { |
return false; |
} else { |