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

src/gpu/SkGr.cpp

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 4c7bf6c..54d64a3 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -115,7 +115,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-SkGrPathIter::Command SkGrPathIter::next(GrPoint pts[]) {
+GrPathCmd SkGrPathIter::next(GrPoint pts[]) {
     GrAssert(NULL != pts);
 #if SK_SCALAR_IS_GR_SCALAR
     return sk_path_verb_to_gr_path_command(fIter.next((SkPoint*)pts));
@@ -130,7 +130,7 @@
 #endif
 }
 
-SkGrPathIter::Command SkGrPathIter::next() {
+GrPathCmd SkGrPathIter::next() {
     return sk_path_verb_to_gr_path_command(fIter.next(NULL));
 }
 
@@ -138,9 +138,9 @@
     fIter.setPath(*fPath, false);
 }
 
-GrPathIter::ConvexHint SkGrPathIter::hint() const {
-    return fPath->isConvex() ? GrPathIter::kConvex_ConvexHint :
-                               GrPathIter::kNone_ConvexHint;
+GrConvexHint SkGrPathIter::hint() const {
+    return fPath->isConvex() ? kConvex_ConvexHint :
+                               kNone_ConvexHint;
 }
 
 ///////////////////////////////////////////////////////////////////////////////