diff options
author | Herb Derby <herb@google.com> | 2018-03-22 16:10:30 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-22 23:47:19 +0000 |
commit | 7956b59ba50bbeeaa5bfece6dd9894175168366d (patch) | |
tree | 959f2254ee342c6c36b8eb448a3720c9dec1e51e /src | |
parent | c912d6133c66df7cde3d64adc76941856a12da64 (diff) |
Remove SkAutoGlyphCache decls that happen to work
...and fix sample code.
Change-Id: I673770125064f8451e3d88ec4929a68409935ad1
Reviewed-on: https://skia-review.googlesource.com/115995
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/atlastext/SkAtlasTextTarget.cpp | 2 | ||||
-rw-r--r-- | src/gpu/ops/GrAtlasTextOp.cpp | 2 | ||||
-rw-r--r-- | src/gpu/text/GrAtlasTextBlob.h | 2 | ||||
-rw-r--r-- | src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/atlastext/SkAtlasTextTarget.cpp b/src/atlastext/SkAtlasTextTarget.cpp index 937498b826..c1a21b04a2 100644 --- a/src/atlastext/SkAtlasTextTarget.cpp +++ b/src/atlastext/SkAtlasTextTarget.cpp @@ -181,7 +181,7 @@ void GrAtlasTextOp::finalizeForTextTarget(uint32_t color, const GrCaps& caps) { void GrAtlasTextOp::executeForTextTarget(SkAtlasTextTarget* target) { FlushInfo flushInfo; - SkAutoGlyphCache autoGlyphCache; + SkExclusiveStrikePtr autoGlyphCache; auto& context = target->context()->internal(); auto glyphCache = context.grContext()->contextPriv().getGlyphCache(); auto atlasManager = context.grContext()->contextPriv().getAtlasManager(); diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp index 10df795021..6a534235d8 100644 --- a/src/gpu/ops/GrAtlasTextOp.cpp +++ b/src/gpu/ops/GrAtlasTextOp.cpp @@ -269,7 +269,7 @@ void GrAtlasTextOp::onPrepareDraws(Target* target) { char* currVertex = reinterpret_cast<char*>(vertices); - SkAutoGlyphCache autoGlyphCache; + SkExclusiveStrikePtr autoGlyphCache; // each of these is a SubRun for (int i = 0; i < fGeoCount; i++) { const Geometry& args = fGeoData[i]; diff --git a/src/gpu/text/GrAtlasTextBlob.h b/src/gpu/text/GrAtlasTextBlob.h index 0cc3062bbe..7c2bd46f2f 100644 --- a/src/gpu/text/GrAtlasTextBlob.h +++ b/src/gpu/text/GrAtlasTextBlob.h @@ -572,7 +572,7 @@ public: VertexRegenerator(GrResourceProvider*, GrAtlasTextBlob*, int runIdx, int subRunIdx, const SkMatrix& viewMatrix, SkScalar x, SkScalar y, GrColor color, GrDeferredUploadTarget*, GrGlyphCache*, GrAtlasManager*, - SkAutoGlyphCache*); + SkExclusiveStrikePtr*); struct Result { /** diff --git a/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp b/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp index b74d087eb8..92d6eb0a6c 100644 --- a/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp +++ b/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp @@ -195,7 +195,7 @@ Regenerator::VertexRegenerator(GrResourceProvider* resourceProvider, GrAtlasText int runIdx, int subRunIdx, const SkMatrix& viewMatrix, SkScalar x, SkScalar y, GrColor color, GrDeferredUploadTarget* uploadTarget, GrGlyphCache* glyphCache, - GrAtlasManager* fullAtlasManager, SkAutoGlyphCache* lazyCache) + GrAtlasManager* fullAtlasManager, SkExclusiveStrikePtr* lazyCache) : fResourceProvider(resourceProvider) , fViewMatrix(viewMatrix) , fBlob(blob) |