diff options
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrAtlasTextContext.cpp | 8 | ||||
| -rw-r--r-- | src/gpu/GrAtlasTextContext.h | 4 | ||||
| -rw-r--r-- | src/gpu/GrStencilAndCoverTextContext.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/GrTextBlobCache.h | 4 | ||||
| -rw-r--r-- | src/gpu/GrTextContext.cpp | 4 |
5 files changed, 12 insertions, 11 deletions
diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp index 108d63c919..4d6a675d99 100644 --- a/src/gpu/GrAtlasTextContext.cpp +++ b/src/gpu/GrAtlasTextContext.cpp @@ -228,7 +228,7 @@ GrColor GrAtlasTextContext::ComputeCanonicalColor(const SkPaint& paint, bool lcd // textblob is being built and cache it. However, for the time being textblobs mostly only have 1 // run so this is not a big deal to compute here. bool GrAtlasTextContext::HasLCD(const SkTextBlob* blob) { - SkTextBlob::RunIterator it(blob); + SkTextBlobRunIterator it(blob); for (; !it.done(); it.next()) { if (it.isLCD()) { return true; @@ -496,7 +496,7 @@ void GrAtlasTextContext::regenerateTextBlob(GrAtlasTextBlob* cacheBlob, // Regenerate textblob SkPaint runPaint = skPaint; - SkTextBlob::RunIterator it(blob); + SkTextBlobRunIterator it(blob); for (int run = 0; !it.done(); it.next(), run++) { int glyphCount = it.glyphCount(); size_t textLen = glyphCount * sizeof(uint16_t); @@ -2050,7 +2050,7 @@ private: }; void GrAtlasTextContext::flushRunAsPaths(GrDrawContext* dc, GrRenderTarget* rt, - const SkTextBlob::RunIterator& it, + const SkTextBlobRunIterator& it, const GrClip& clip, const SkPaint& skPaint, SkDrawFilter* drawFilter, const SkMatrix& viewMatrix, const SkIRect& clipBounds, SkScalar x, SkScalar y) { @@ -2190,7 +2190,7 @@ void GrAtlasTextContext::flush(const SkTextBlob* blob, GrColor color = grPaint.getColor(); - SkTextBlob::RunIterator it(blob); + SkTextBlobRunIterator it(blob); for (int run = 0; !it.done(); it.next(), run++) { if (cacheBlob->fRuns[run].fDrawAsPaths) { this->flushRunAsPaths(dc, rt, it, clip, skPaint, diff --git a/src/gpu/GrAtlasTextContext.h b/src/gpu/GrAtlasTextContext.h index 3462b65058..f5421a669c 100644 --- a/src/gpu/GrAtlasTextContext.h +++ b/src/gpu/GrAtlasTextContext.h @@ -12,7 +12,7 @@ #include "GrAtlasTextBlob.h" #include "GrGeometryProcessor.h" -#include "SkTextBlob.h" +#include "SkTextBlobRunIterator.h" #ifdef GR_TEST_UTILS #include "GrBatchTest.h" @@ -73,7 +73,7 @@ private: GrGlyph*); inline void flushRunAsPaths(GrDrawContext*, GrRenderTarget*, - const SkTextBlob::RunIterator&, const GrClip& clip, + const SkTextBlobRunIterator&, const GrClip& clip, const SkPaint&, SkDrawFilter*, const SkMatrix& viewMatrix, const SkIRect& clipBounds, SkScalar x, SkScalar y); diff --git a/src/gpu/GrStencilAndCoverTextContext.cpp b/src/gpu/GrStencilAndCoverTextContext.cpp index ee1f1af410..5289d092c7 100644 --- a/src/gpu/GrStencilAndCoverTextContext.cpp +++ b/src/gpu/GrStencilAndCoverTextContext.cpp @@ -19,6 +19,7 @@ #include "SkGpuDevice.h" #include "SkGrPriv.h" #include "SkPath.h" +#include "SkTextBlobRunIterator.h" #include "SkTextMapStateProc.h" #include "SkTextFormatParams.h" @@ -204,7 +205,7 @@ void GrStencilAndCoverTextContext::TextBlob::init(const SkTextBlob* skBlob, const SkPaint& skPaint) { fCpuMemorySize = sizeof(TextBlob); SkPaint runPaint(skPaint); - for (SkTextBlob::RunIterator iter(skBlob); !iter.done(); iter.next()) { + for (SkTextBlobRunIterator iter(skBlob); !iter.done(); iter.next()) { iter.applyFontToPaint(&runPaint); // No need to re-seed the paint. TextRun* run = SkNEW_INSERT_AT_LLIST_TAIL(this, TextRun, (runPaint)); diff --git a/src/gpu/GrTextBlobCache.h b/src/gpu/GrTextBlobCache.h index 5f24e2ac16..8eee9d13db 100644 --- a/src/gpu/GrTextBlobCache.h +++ b/src/gpu/GrTextBlobCache.h @@ -10,7 +10,7 @@ #include "GrAtlasTextContext.h" #include "SkTDynamicHash.h" -#include "SkTextBlob.h" +#include "SkTextBlobRunIterator.h" class GrTextBlobCache { public: @@ -98,7 +98,7 @@ public: // TODO move to SkTextBlob static void BlobGlyphCount(int* glyphCount, int* runCount, const SkTextBlob* blob) { - SkTextBlob::RunIterator itCounter(blob); + SkTextBlobRunIterator itCounter(blob); for (; !itCounter.done(); itCounter.next(), (*runCount)++) { *glyphCount += itCounter.glyphCount(); } diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp index a2e245d7e5..0ef18aaeb2 100644 --- a/src/gpu/GrTextContext.cpp +++ b/src/gpu/GrTextContext.cpp @@ -17,7 +17,7 @@ #include "SkGlyphCache.h" #include "SkGpuDevice.h" #include "SkGrPriv.h" -#include "SkTextBlob.h" +#include "SkTextBlobRunIterator.h" #include "SkTextMapStateProc.h" #include "SkTextToPathIter.h" @@ -116,7 +116,7 @@ void GrTextContext::drawTextBlob(GrDrawContext* dc, GrRenderTarget* rt, SkDrawFilter* drawFilter, const SkIRect& clipBounds) { SkPaint runPaint = skPaint; - SkTextBlob::RunIterator it(blob); + SkTextBlobRunIterator it(blob); for (;!it.done(); it.next()) { size_t textLen = it.glyphCount() * sizeof(uint16_t); const SkPoint& offset = it.offset(); |