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, 7 deletions

diff --git a/src/core/SkOverdrawCanvas.cpp b/src/core/SkOverdrawCanvas.cpp
index 35656e0829..249723e494 100644
--- a/src/core/SkOverdrawCanvas.cpp
+++ b/src/core/SkOverdrawCanvas.cpp
@@ -19,7 +19,7 @@
 #include "SkRSXform.h"
 #include "SkStrikeCache.h"
 #include "SkTextBlob.h"
-#include "SkTextBlobRunIterator.h"
+#include "SkTextBlobPriv.h"
 #include "SkTo.h"
 
 namespace {
@@ -154,20 +154,17 @@ void SkOverdrawCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScal
         const SkPoint& offset = it.offset();
         it.applyFontToPaint(&runPaint);
         switch (it.positioning()) {
-            case SkTextBlob::kDefault_Positioning:
+            case SkTextBlobRunIterator::kDefault_Positioning:
                 this->onDrawText(it.glyphs(), textLen, x + offset.x(), y + offset.y(), runPaint);
                 break;
-            case SkTextBlob::kHorizontal_Positioning:
+            case SkTextBlobRunIterator::kHorizontal_Positioning:
                 this->drawPosTextCommon(it.glyphs(), textLen, it.pos(), 1,
                                         SkPoint::Make(x, y + offset.y()), runPaint);
                 break;
-            case SkTextBlob::kFull_Positioning:
+            case SkTextBlobRunIterator::kFull_Positioning:
                 this->drawPosTextCommon(it.glyphs(), textLen, it.pos(), 2, SkPoint::Make(x, y),
                                         runPaint);
                 break;
-            default:
-                SkASSERT(false);
-                break;
         }
     }
 }