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/gpu | |
| 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/gpu')
| -rw-r--r-- | src/gpu/text/GrTextBlob.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/text/GrTextBlobCache.h | 2 | ||||
| -rw-r--r-- | src/gpu/text/GrTextContext.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/text/GrTextContext.h | 1 | ||||
| -rw-r--r-- | src/gpu/text/GrTextUtils.cpp | 1 |
5 files changed, 2 insertions, 5 deletions
diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp index 7b4507eab0..6bd4c1c3bb 100644 --- a/src/gpu/text/GrTextBlob.cpp +++ b/src/gpu/text/GrTextBlob.cpp @@ -14,7 +14,6 @@ #include "SkGlyphCache.h" #include "SkMaskFilterBase.h" #include "SkPaintPriv.h" -#include "SkTextBlobRunIterator.h" #include "SkTextToPathIter.h" #include "ops/GrAtlasTextOp.h" #include <new> diff --git a/src/gpu/text/GrTextBlobCache.h b/src/gpu/text/GrTextBlobCache.h index 110e0ad7fc..fe245c99d3 100644 --- a/src/gpu/text/GrTextBlobCache.h +++ b/src/gpu/text/GrTextBlobCache.h @@ -12,7 +12,7 @@ #include "SkMessageBus.h" #include "SkRefCnt.h" #include "SkTArray.h" -#include "SkTextBlobRunIterator.h" +#include "SkTextBlobPriv.h" #include "SkTHash.h" class GrTextBlobCache { diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp index aeb99f1548..d57055a511 100644 --- a/src/gpu/text/GrTextContext.cpp +++ b/src/gpu/text/GrTextContext.cpp @@ -196,7 +196,7 @@ void GrTextContext::regenerateGlyphRunList(GrTextBlob* cacheBlob, } cacheBlob->setRunPaintFlags(run, runPaint.skPaint().getFlags()); - SkASSERT(it.positioning() == SkTextBlob::kFull_Positioning); + SkASSERT(it.positioning() == SkTextBlobRunIterator::kFull_Positioning); if (CanDrawAsDistanceFields(runPaint, viewMatrix, props, shaderCaps.supportsDistanceFieldText(), fOptions)) { this->drawDFPosText(cacheBlob, run, glyphCache, props, runPaint, diff --git a/src/gpu/text/GrTextContext.h b/src/gpu/text/GrTextContext.h index aa4626e411..0093f846b4 100644 --- a/src/gpu/text/GrTextContext.h +++ b/src/gpu/text/GrTextContext.h @@ -12,7 +12,6 @@ #include "GrDistanceFieldAdjustTable.h" #include "GrGeometryProcessor.h" #include "GrTextUtils.h" -#include "SkTextBlobRunIterator.h" #if GR_TEST_UTILS #include "GrDrawOpTest.h" diff --git a/src/gpu/text/GrTextUtils.cpp b/src/gpu/text/GrTextUtils.cpp index ec5389c464..ba033aaaa5 100644 --- a/src/gpu/text/GrTextUtils.cpp +++ b/src/gpu/text/GrTextUtils.cpp @@ -10,7 +10,6 @@ #include "SkGlyphCache.h" #include "SkGr.h" #include "SkPaint.h" -#include "SkTextBlobRunIterator.h" void GrTextUtils::Paint::initFilteredColor() { GrColor4f filteredColor = SkColorToUnpremulGrColor4f(fPaint->getColor(), *fDstColorSpaceInfo); |