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>

1 files changed, 4 insertions, 6 deletions

diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index f0829dc4da..b52a82efc1 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -26,7 +26,7 @@
 #include "SkShader.h"
 #include "SkSpecialImage.h"
 #include "SkTLazy.h"
-#include "SkTextBlobRunIterator.h"
+#include "SkTextBlobPriv.h"
 #include "SkTextToPathIter.h"
 #include "SkTo.h"
 #include "SkUtils.h"
@@ -153,7 +153,7 @@ void SkBaseDevice::drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
         it.applyFontToPaint(&runPaint);
 
         switch (it.positioning()) {
-        case SkTextBlob::kDefault_Positioning: {
+        case SkTextBlobRunIterator::kDefault_Positioning: {
             auto origin = SkPoint::Make(x + offset.x(), y + offset.y());
             SkGlyphRunBuilder builder;
             builder.drawText(runPaint, (const char*) it.glyphs(), textLen, origin);
@@ -161,16 +161,14 @@ void SkBaseDevice::drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
             glyphRunList.temporaryShuntToDrawPosText(this, SkPoint::Make(0, 0));
         }
         break;
-        case SkTextBlob::kHorizontal_Positioning:
+        case SkTextBlobRunIterator::kHorizontal_Positioning:
             this->drawPosText(it.glyphs(), textLen, it.pos(), 1,
                               SkPoint::Make(x, y + offset.y()), runPaint);
             break;
-        case SkTextBlob::kFull_Positioning:
+        case SkTextBlobRunIterator::kFull_Positioning:
             this->drawPosText(it.glyphs(), textLen, it.pos(), 2,
                               SkPoint::Make(x, y), runPaint);
             break;
-        default:
-            SK_ABORT("unhandled positioning mode");
         }
     }
 }