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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/debugger/SkDrawCommand.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp index 743a8d7920..27b2009bb8 100644 --- a/tools/debugger/SkDrawCommand.cpp +++ b/tools/debugger/SkDrawCommand.cpp @@ -21,8 +21,7 @@ #include "SkPicture.h" #include "SkReadBuffer.h" #include "SkRectPriv.h" -#include "SkTextBlob.h" -#include "SkTextBlobRunIterator.h" +#include "SkTextBlobPriv.h" #include "SkTHash.h" #include "SkTypeface.h" #include "SkWriteBuffer.h" @@ -1950,19 +1949,19 @@ Json::Value SkDrawTextBlobCommand::toJSON(UrlDataManager& urlDataManager) const const uint16_t* iterGlyphs = iter.glyphs(); for (uint32_t i = 0; i < iter.glyphCount(); i++) { switch (iter.positioning()) { - case SkTextBlob::kFull_Positioning: + case SkTextBlobRunIterator::kFull_Positioning: jsonPositions.append(MakeJsonPoint(iterPositions[i * 2], iterPositions[i * 2 + 1])); break; - case SkTextBlob::kHorizontal_Positioning: + case SkTextBlobRunIterator::kHorizontal_Positioning: jsonPositions.append(Json::Value(iterPositions[i])); break; - case SkTextBlob::kDefault_Positioning: + case SkTextBlobRunIterator::kDefault_Positioning: break; } jsonGlyphs.append(Json::Value(iterGlyphs[i])); } - if (iter.positioning() != SkTextBlob::kDefault_Positioning) { + if (iter.positioning() != SkTextBlobRunIterator::kDefault_Positioning) { run[SKDEBUGCANVAS_ATTRIBUTE_POSITIONS] = jsonPositions; } run[SKDEBUGCANVAS_ATTRIBUTE_GLYPHS] = jsonGlyphs; |