commit 5aaa69e4339e229adfb05e96084a8ec0a590238b
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 04 20:29:08 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 04 20:29:08 2011 +0000
tree 0a4c274694b62f8e908d73adaa0d28215fd9fe7b
parent f7c2c4544f866ae65cd9a4eee4da563f6d653d20

Fixups for clipstack, convexity test for paths.

Review URL http://codereview.appspot.com/4250056/

git-svn-id: http://skia.googlecode.com/svn/trunk@891 2bbb7eff-a529-9590-31e7-b0007b416f81

include/gpu/SkGr.h

diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h
index d6a3fab..a7c0c1d 100644
--- a/include/gpu/SkGr.h
+++ b/include/gpu/SkGr.h
@@ -91,14 +91,14 @@
 
 #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 @@
 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;