diff options
author | Herb Derby <herb@google.com> | 2018-05-24 14:39:01 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-24 20:41:08 +0000 |
commit | 26cbe5130aa9839b5429b9507363ce2474091808 (patch) | |
tree | 5d10df1e2a768bf31af6ccbd2fd636f44f7c98b6 /src/atlastext | |
parent | 4a0ad501e4919e06bcf7a7ef4adec8f28818946b (diff) |
Rename GrAtlasTextContext -> GrTextContext
Change-Id: I309b39425afc9b45095241eeb299096bc426afed
Reviewed-on: https://skia-review.googlesource.com/130029
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src/atlastext')
-rw-r--r-- | src/atlastext/SkAtlasTextTarget.cpp | 4 | ||||
-rw-r--r-- | src/atlastext/SkInternalAtlasTextContext.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/atlastext/SkAtlasTextTarget.cpp b/src/atlastext/SkAtlasTextTarget.cpp index 39f0c1b1d6..5d46669d9c 100644 --- a/src/atlastext/SkAtlasTextTarget.cpp +++ b/src/atlastext/SkAtlasTextTarget.cpp @@ -15,7 +15,7 @@ #include "SkGr.h" #include "SkInternalAtlasTextContext.h" #include "ops/GrAtlasTextOp.h" -#include "text/GrAtlasTextContext.h" +#include "text/GrTextContext.h" static constexpr int kMaxBatchLookBack = 10; @@ -135,7 +135,7 @@ void SkInternalAtlasTextTarget::drawText(const SkGlyphID glyphs[], const SkPoint SkSurfaceProps props(SkSurfaceProps::kUseDistanceFieldFonts_Flag, kUnknown_SkPixelGeometry); auto* grContext = this->context()->internal().grContext(); auto bounds = SkIRect::MakeWH(fWidth, fHeight); - auto atlasTextContext = grContext->contextPriv().drawingManager()->getAtlasTextContext(); + auto atlasTextContext = grContext->contextPriv().drawingManager()->getTextContext(); size_t byteLength = sizeof(SkGlyphID) * glyphCnt; const SkScalar* pos = &positions->fX; atlasTextContext->drawPosText(grContext, this, GrNoClip(), paint, this->ctm(), props, diff --git a/src/atlastext/SkInternalAtlasTextContext.cpp b/src/atlastext/SkInternalAtlasTextContext.cpp index 8abe2e8f9e..2c9cddcc77 100644 --- a/src/atlastext/SkInternalAtlasTextContext.cpp +++ b/src/atlastext/SkInternalAtlasTextContext.cpp @@ -77,7 +77,7 @@ void SkInternalAtlasTextContext::recordDraw(const void* srcVertexData, int glyph memcpy(vertexData, srcVertexData, vertexDataSize); for (int i = 0; i < 4 * glyphCnt; ++i) { auto* vertex = reinterpret_cast<SkAtlasTextRenderer::SDFVertex*>(vertexData) + i; - // GrAtlasTextContext encodes a texture index into the lower bit of each texture coord. + // GrTextContext encodes a texture index into the lower bit of each texture coord. // This isn't expected by SkAtlasTextRenderer subclasses. vertex->fTextureCoordX /= 2; vertex->fTextureCoordY /= 2; |