Remove GrPathCmd

src/gpu/GrPathUtils.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrPathUtils.h"
@@ skipping 140 matching lines @@
         tol = gMinCurveTol;
     }
     GrAssert(tol > 0);
 
     int pointCount = 0;
     *subpaths = 1;
 
     bool first = true;
 
     SkPath::Iter iter(path, false);
-    GrPathCmd cmd;
+    SkPath::Verb verb;
 
     GrPoint pts[4];
-    while ((cmd = (GrPathCmd)iter.next(pts)) != kEnd_PathCmd) {
+    while ((verb = iter.next(pts)) != SkPath::kDone_Verb) {
 
-        switch (cmd) {
-            case kLine_PathCmd:
+        switch (verb) {
+            case SkPath::kLine_Verb:
                 pointCount += 1;
                 break;
-            case kQuadratic_PathCmd:
+            case SkPath::kQuad_Verb:
                 pointCount += quadraticPointCount(pts, tol);
                 break;
-            case kCubic_PathCmd:
+            case SkPath::kCubic_Verb:
                 pointCount += cubicPointCount(pts, tol);
                 break;
-            case kMove_PathCmd:
+            case SkPath::kMove_Verb:
                 pointCount += 1;
                 if (!first) {
                     ++(*subpaths);
                 }
                 break;
             default:
                 break;
         }
         first = false;
     }
@@ skipping 283 matching lines @@
     // base tolerance is 1 pixel.
     static const SkScalar kTolerance = SK_Scalar1;
     const SkScalar tolSqd = SkScalarSquare(SkScalarMul(tolScale, kTolerance));
 
     for (int i = 0; i < count; ++i) {
         SkPoint* cubic = chopped + 3*i;
         convert_noninflect_cubic_to_quads(cubic, tolSqd, constrainWithinTangents, dir, quads);
     }
 
 }