diff options
Diffstat (limited to 'include/gpu/SkGr.h')
| -rw-r--r-- | include/gpu/SkGr.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h index d6a3fab8cc..a7c0c1d880 100644 --- a/include/gpu/SkGr.h +++ b/include/gpu/SkGr.h @@ -91,14 +91,14 @@ GR_STATIC_ASSERT((int)kIDA_BlendCoeff == (int)SkXfermode::kIDA_Coeff); #define sk_blend_to_grblend(X) ((GrBlendCoeff)(X)) -GR_STATIC_ASSERT((int)SkPath::kMove_Verb == (int)GrPathIter::kMove_Command); -GR_STATIC_ASSERT((int)SkPath::kLine_Verb == (int)GrPathIter::kLine_Command); -GR_STATIC_ASSERT((int)SkPath::kQuad_Verb == (int)GrPathIter::kQuadratic_Command); -GR_STATIC_ASSERT((int)SkPath::kCubic_Verb == (int)GrPathIter::kCubic_Command); -GR_STATIC_ASSERT((int)SkPath::kClose_Verb == (int)GrPathIter::kClose_Command); -GR_STATIC_ASSERT((int)SkPath::kDone_Verb == (int)GrPathIter::kEnd_Command); +GR_STATIC_ASSERT((int)SkPath::kMove_Verb == (int)kMove_PathCmd); +GR_STATIC_ASSERT((int)SkPath::kLine_Verb == (int)kLine_PathCmd); +GR_STATIC_ASSERT((int)SkPath::kQuad_Verb == (int)kQuadratic_PathCmd); +GR_STATIC_ASSERT((int)SkPath::kCubic_Verb == (int)kCubic_PathCmd); +GR_STATIC_ASSERT((int)SkPath::kClose_Verb == (int)kClose_PathCmd); +GR_STATIC_ASSERT((int)SkPath::kDone_Verb == (int)kEnd_PathCmd); -#define sk_path_verb_to_gr_path_command(X) ((GrPathIter::Command)(X)) +#define sk_path_verb_to_gr_path_command(X) ((GrPathCmd)(X)) /////////////////////////////////////////////////////////////////////////////// @@ -173,10 +173,10 @@ class SkGrPathIter : public GrPathIter { public: SkGrPathIter() { fPath = NULL; } SkGrPathIter(const SkPath& path) { reset(path); } - virtual Command next(GrPoint pts[]); - virtual Command next(); + virtual GrPathCmd next(GrPoint pts[]); + virtual GrPathCmd next(); virtual void rewind(); - virtual ConvexHint hint() const; + virtual GrConvexHint hint() const; void reset(const SkPath& path) { fPath = &path; |