Make SkTextBlob::RunIterator public.

src/core/SkTextBlob.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#include "SkTextBlob.h"
+#include "SkTextBlobRunIterator.h"
 
 #include "SkReadBuffer.h"
 #include "SkTypeface.h"
 #include "SkWriteBuffer.h"
 
 namespace {
 
 // TODO(fmalita): replace with SkFont.
 class RunFont : SkNoncopyable {
 public:
@@ skipping 194 matching lines @@
     }
 }
 
 void SkTextBlob::flatten(SkWriteBuffer& buffer) const {
     int runCount = fRunCount;
 
     buffer.write32(runCount);
     buffer.writeRect(fBounds);
 
     SkPaint runPaint;
-    RunIterator it(this);
+    SkTextBlobRunIterator it(this);
     while (!it.done()) {
         SkASSERT(it.glyphCount() > 0);
 
         buffer.write32(it.glyphCount());
         buffer.write32(it.positioning());
         buffer.writePoint(it.offset());
         // This should go away when switching to SkFont
         it.applyFontToPaint(&runPaint);
         buffer.writePaint(runPaint);
 
@@ skipping 53 matching lines @@
 
     return blobBuilder.build();
 }
 
 unsigned SkTextBlob::ScalarsPerGlyph(GlyphPositioning pos) {
     // GlyphPositioning values are directly mapped to scalars-per-glyph.
     SkASSERT(pos <= 2);
     return pos;
 }
 
-SkTextBlob::RunIterator::RunIterator(const SkTextBlob* blob)
-    : fCurrentRun(RunRecord::First(blob))
+SkTextBlobRunIterator::SkTextBlobRunIterator(const SkTextBlob* blob)
+    : fCurrentRun(SkTextBlob::RunRecord::First(blob))
     , fRemainingRuns(blob->fRunCount) {
     SkDEBUGCODE(fStorageTop = (uint8_t*)blob + blob->fStorageSize;)
 }
 
-bool SkTextBlob::RunIterator::done() const {
+bool SkTextBlobRunIterator::done() const {
     return fRemainingRuns <= 0;
 }
 
-void SkTextBlob::RunIterator::next() {
+void SkTextBlobRunIterator::next() {
     SkASSERT(!this->done());
 
     if (!this->done()) {
         SkDEBUGCODE(fCurrentRun->validate(fStorageTop);)
-        fCurrentRun = RunRecord::Next(fCurrentRun);
+        fCurrentRun = SkTextBlob::RunRecord::Next(fCurrentRun);
         fRemainingRuns--;
     }
 }
 
-uint32_t SkTextBlob::RunIterator::glyphCount() const {
+uint32_t SkTextBlobRunIterator::glyphCount() const {
     SkASSERT(!this->done());
     return fCurrentRun->glyphCount();
 }
 
-const uint16_t* SkTextBlob::RunIterator::glyphs() const {
+const uint16_t* SkTextBlobRunIterator::glyphs() const {
     SkASSERT(!this->done());
     return fCurrentRun->glyphBuffer();
 }
 
-const SkScalar* SkTextBlob::RunIterator::pos() const {
+const SkScalar* SkTextBlobRunIterator::pos() const {
     SkASSERT(!this->done());
     return fCurrentRun->posBuffer();
 }
 
-const SkPoint& SkTextBlob::RunIterator::offset() const {
+const SkPoint& SkTextBlobRunIterator::offset() const {
     SkASSERT(!this->done());
     return fCurrentRun->offset();
 }
 
-SkTextBlob::GlyphPositioning SkTextBlob::RunIterator::positioning() const {
+SkTextBlob::GlyphPositioning SkTextBlobRunIterator::positioning() const {
     SkASSERT(!this->done());
     return fCurrentRun->positioning();
 }
 
-void SkTextBlob::RunIterator::applyFontToPaint(SkPaint* paint) const {
+void SkTextBlobRunIterator::applyFontToPaint(SkPaint* paint) const {
     SkASSERT(!this->done());
 
     fCurrentRun->font().applyToPaint(paint);
 }
 
-bool SkTextBlob::RunIterator::isLCD() const {
+bool SkTextBlobRunIterator::isLCD() const {
     return SkToBool(fCurrentRun->font().flags() & SkPaint::kLCDRenderText_Flag);
 }
 
 SkTextBlobBuilder::SkTextBlobBuilder()
     : fStorageSize(0)
     , fStorageUsed(0)
     , fRunCount(0)
     , fDeferredBounds(false)
     , fLastRun(0) {
     fBounds.setEmpty();
@@ skipping 276 matching lines @@
 
     fStorageUsed = 0;
     fStorageSize = 0;
     fRunCount = 0;
     fLastRun = 0;
     fBounds.setEmpty();
 
     return blob;
 }