use SkPath for GrPath, removing GrPathIter entirely
http://codereview.appspot.com/4515071/
git-svn-id: http://skia.googlecode.com/svn/trunk@1335 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/include/GrPath.h b/gpu/include/GrPath.h
index f958329..c23cfc4 100644
--- a/gpu/include/GrPath.h
+++ b/gpu/include/GrPath.h
@@ -18,91 +18,10 @@
#ifndef GrPath_DEFINED
#define GrPath_DEFINED
-#include "GrPathSink.h"
-#include "GrPathIter.h"
-#include "GrTDArray.h"
-#include "GrPoint.h"
-#include "GrRect.h"
+#include "GrTypes.h"
+#include "SkPath.h"
-class GrPath : public GrPathSink {
-public:
- GrPath();
- GrPath(const GrPath&);
- explicit GrPath(GrPathIter&);
- virtual ~GrPath();
-
- GrConvexHint getConvexHint() const { return fConvexHint; }
- void setConvexHint(GrConvexHint hint) { fConvexHint = hint; }
-
- const GrRect& getConservativeBounds() const { return fConservativeBounds; }
-
- void resetFromIter(GrPathIter*);
-
- bool operator ==(const GrPath& path) const;
- bool operator !=(const GrPath& path) const { return !(*this == path); }
- // overrides from GrPathSink
-
- virtual void moveTo(GrScalar x, GrScalar y);
- virtual void lineTo(GrScalar x, GrScalar y);
- virtual void quadTo(GrScalar x0, GrScalar y0, GrScalar x1, GrScalar y1);
- virtual void cubicTo(GrScalar x0, GrScalar y0, GrScalar x1, GrScalar y1,
- GrScalar x2, GrScalar y2);
- virtual void close();
-
- /**
- * Offset the path by (tx, ty), adding tx to the horizontal position
- * and adds ty to the vertical position of every point.
- */
- void offset(GrScalar tx, GrScalar ty);
-
- class Iter : public GrPathIter {
- public:
- /**
- * Creates an uninitialized iterator
- */
- Iter();
-
- Iter(const GrPath& path);
-
- // overrides from GrPathIter
- virtual GrPathCmd next(GrPoint points[]);
- virtual GrConvexHint convexHint() const;
- virtual GrPathCmd next();
- virtual void rewind();
- virtual bool getConservativeBounds(GrRect* rect) const;
-
- /**
- * Sets iterator to begining of path
- */
- void reset(const GrPath& path);
- private:
- const GrPath* fPath;
- GrPoint fLastPt;
- int fCmdIndex;
- int fPtIndex;
- };
-
- static void ConvexUnitTest();
-
-private:
-
- GrTDArray<GrPathCmd> fCmds;
- GrTDArray<GrPoint> fPts;
- GrConvexHint fConvexHint;
- GrRect fConservativeBounds;
-
- // this ensures we have a moveTo at the start of each contour
- inline void ensureMoveTo();
-
- bool wasLastVerb(GrPathCmd cmd) const {
- int count = fCmds.count();
- return count > 0 && cmd == fCmds[count - 1];
- }
-
- friend class Iter;
-
- typedef GrPathSink INHERITED;
-};
+typedef SkPath GrPath;
#endif