move SkTextToPathIter into private header
git-svn-id: http://skia.googlecode.com/svn/trunk@4977 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkDraw.h b/include/core/SkDraw.h
index 925a21d..b31f4f5 100644
--- a/include/core/SkDraw.h
+++ b/include/core/SkDraw.h
@@ -125,34 +125,6 @@
#endif
};
-class SkGlyphCache;
-
-class SkTextToPathIter {
-public:
- SkTextToPathIter(const char text[], size_t length, const SkPaint& paint,
- bool applyStrokeAndPathEffects);
- ~SkTextToPathIter();
-
- const SkPaint& getPaint() const { return fPaint; }
- SkScalar getPathScale() const { return fScale; }
-
- const SkPath* next(SkScalar* xpos); //!< returns nil when there are no more paths
-
-private:
- SkGlyphCache* fCache;
- SkPaint fPaint;
- SkScalar fScale;
- SkFixed fPrevAdvance;
- const char* fText;
- const char* fStop;
- SkMeasureCacheProc fGlyphCacheProc;
-
- const SkPath* fPath; // returned in next
- SkScalar fXPos; // accumulated xpos, returned in next
- SkAutoKern fAutoKern;
- int fXYIndex; // cache for horizontal -vs- vertical text
-};
-
#endif
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index a060bbb..83cec4b 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -1284,6 +1284,7 @@
#include "SkScalerContext.h"
#include "SkGlyphCache.h"
+#include "SkTextToPathIter.h"
#include "SkUtils.h"
static void measure_text(SkGlyphCache* cache, SkDrawCacheProc glyphCacheProc,
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 134aa56..5fd4288 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -20,6 +20,7 @@
#include "SkScalerContext.h"
#include "SkStroke.h"
#include "SkTextFormatParams.h"
+#include "SkTextToPathIter.h"
#include "SkTypeface.h"
#include "SkXfermode.h"
#include "SkAutoKern.h"
diff --git a/src/core/SkTextToPathIter.h b/src/core/SkTextToPathIter.h
new file mode 100644
index 0000000..0d8c4b2
--- /dev/null
+++ b/src/core/SkTextToPathIter.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTextToPathIter_DEFINED
+#define SkTextToPathIter_DEFINED
+
+#include "SkAutoKern.h"
+#include "SkPaint.h"
+
+class SkGlyphCache;
+
+class SkTextToPathIter {
+public:
+ SkTextToPathIter(const char text[], size_t length, const SkPaint& paint,
+ bool applyStrokeAndPathEffects);
+ ~SkTextToPathIter();
+
+ const SkPaint& getPaint() const { return fPaint; }
+ SkScalar getPathScale() const { return fScale; }
+
+ const SkPath* next(SkScalar* xpos); //!< returns nil when there are no more paths
+
+private:
+ SkGlyphCache* fCache;
+ SkPaint fPaint;
+ SkScalar fScale;
+ SkFixed fPrevAdvance;
+ const char* fText;
+ const char* fStop;
+ SkMeasureCacheProc fGlyphCacheProc;
+
+ const SkPath* fPath; // returned in next
+ SkScalar fXPos; // accumulated xpos, returned in next
+ SkAutoKern fAutoKern;
+ int fXYIndex; // cache for horizontal -vs- vertical text
+};
+
+#endif