aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkGlyphRun.h
diff options
context:
space:
mode:
authorGravatar Florin Malita <fmalita@chromium.org>2018-07-27 09:47:15 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-27 14:10:17 +0000
commitab54e7394d81438f5256b632c71724b480a7f66b (patch)
treeaedbae9659b1d67b069751ae730fb8c09e73f96d /src/core/SkGlyphRun.h
parent504dd052b94c318afeadc5c68e1c3b233d7571c1 (diff)
Hide SkTextBlob::GlyphPositioning from public API
Make private, add corresponding SkTextBlobRunIterator enum. Also move SkTextBlobRunIterator to SkTextBlobPriv.h. Change-Id: If3e0beabb0e8484b1ac73c6fc0827e920ca1f93b Reviewed-on: https://skia-review.googlesource.com/142501 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Herb Derby <herb@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
Diffstat (limited to 'src/core/SkGlyphRun.h')
-rw-r--r--src/core/SkGlyphRun.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/SkGlyphRun.h b/src/core/SkGlyphRun.h
index b2d1aad265..1456e6c290 100644
--- a/src/core/SkGlyphRun.h
+++ b/src/core/SkGlyphRun.h
@@ -19,7 +19,7 @@
#include "SkPoint.h"
#include "SkSurfaceProps.h"
#include "SkTemplates.h"
-#include "SkTextBlob.h"
+#include "SkTextBlobPriv.h"
#include "SkTypes.h"
class SkBaseDevice;
@@ -203,7 +203,9 @@ public:
const SkScalar* pos() const { return (const SkScalar*)fList[fIndex].positions().data(); }
const SkPoint& offset() const { return fZero; }
void applyFontToPaint(SkPaint* paint) const { *paint = fList[fIndex].paint(); }
- SkTextBlob::GlyphPositioning positioning() const { return SkTextBlob::kFull_Positioning; }
+ SkTextBlobRunIterator::GlyphPositioning positioning() const {
+ return SkTextBlobRunIterator::kFull_Positioning;
+ }
const uint32_t* clusters() const { return fList[fIndex].clusters().data(); }
uint32_t textSize() const { return fList[fIndex].text().size(); }
const char* text() const { return fList[fIndex].text().data(); }