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/SkPaint.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/SkPaint.cpp')
| -rw-r--r-- | src/core/SkPaint.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 0fdf58b6e5..9b8431e591 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -33,7 +33,7 @@ #include "SkSurfacePriv.h" #include "SkTLazy.h" #include "SkTextBlob.h" -#include "SkTextBlobRunIterator.h" +#include "SkTextBlobPriv.h" #include "SkTextFormatParams.h" #include "SkTextToPathIter.h" #include "SkTo.h" @@ -1095,15 +1095,15 @@ int SkPaint::getTextBlobIntercepts(const SkTextBlob* blob, const SkScalar bounds SkScalar* runIntervals = intervals ? intervals + count : nullptr; switch (it.positioning()) { - case SkTextBlob::kDefault_Positioning: + case SkTextBlobRunIterator::kDefault_Positioning: count += runPaint.getTextIntercepts(it.glyphs(), runByteCount, it.offset().x(), it.offset().y(), bounds, runIntervals); break; - case SkTextBlob::kHorizontal_Positioning: + case SkTextBlobRunIterator::kHorizontal_Positioning: count += runPaint.getPosTextHIntercepts(it.glyphs(), runByteCount, it.pos(), it.offset().y(), bounds, runIntervals); break; - case SkTextBlob::kFull_Positioning: + case SkTextBlobRunIterator::kFull_Positioning: count += runPaint.getPosTextIntercepts(it.glyphs(), runByteCount, reinterpret_cast<const SkPoint*>(it.pos()), bounds, runIntervals); |