diff options
| author |  Florin Malita <fmalita@chromium.org> | 2018-07-27 09:47:15 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-27 14:10:17 +0000 |
| commit | ab54e7394d81438f5256b632c71724b480a7f66b (patch) | |
| tree | aedbae9659b1d67b069751ae730fb8c09e73f96d /src/core/SkRemoteGlyphCache.cpp | |
| parent | 504dd052b94c318afeadc5c68e1c3b233d7571c1 (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/SkRemoteGlyphCache.cpp')
| -rw-r--r-- | src/core/SkRemoteGlyphCache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkRemoteGlyphCache.cpp b/src/core/SkRemoteGlyphCache.cpp index 58422627f5..9aa43ad049 100644 --- a/src/core/SkRemoteGlyphCache.cpp +++ b/src/core/SkRemoteGlyphCache.cpp @@ -267,7 +267,7 @@ private: FAIL_AND_RETURN } - if (it.positioning() == SkTextBlob::kDefault_Positioning) { + if (it.positioning() == SkTextBlobRunIterator::kDefault_Positioning) { // Default positioning needs advances. Can't do that. TRACE_EVENT0("skia", "kDefault_Positioning"); FAIL_AND_RETURN @@ -291,13 +291,13 @@ private: SkSTArenaAlloc<120> arena; SkFindAndPlaceGlyph::MapperInterface* mapper = nullptr; switch (it.positioning()) { - case SkTextBlob::kHorizontal_Positioning: + case SkTextBlobRunIterator::kHorizontal_Positioning: posFn = [](int index, const SkScalar* pos) { return SkPoint{pos[index], 0}; }; mapper = SkFindAndPlaceGlyph::CreateMapper( runMatrix, SkPoint::Make(position.x(), position.y() + it.offset().y()), 1, &arena); break; - case SkTextBlob::kFull_Positioning: + case SkTextBlobRunIterator::kFull_Positioning: posFn = [](int index, const SkScalar* pos) { return SkPoint{pos[2 * index], pos[2 * index + 1]}; }; |