From 4014ba6ec7a7825495ac0a6ed591c5dadd30751d Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Tue, 24 Jul 2018 11:33:21 -0400 Subject: SkUtils: remove some versions of UTF routines. Change-Id: Ib1f776ae472117c23d2145253adf25fceb412b32 Reviewed-on: https://skia-review.googlesource.com/143111 Reviewed-by: Herb Derby Commit-Queue: Hal Canary --- src/gpu/text/GrTextContext.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gpu/text/GrTextContext.cpp') diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp index e68be09bfb..6a3489554b 100644 --- a/src/gpu/text/GrTextContext.cpp +++ b/src/gpu/text/GrTextContext.cpp @@ -339,7 +339,7 @@ void GrTextContext::DrawBmpPosTextAsPaths(GrTextBlob* blob, int runIndex, SkTextMapStateProc tmsProc(SkMatrix::I(), offset, scalarsPerPosition); while (text < stop) { - const SkGlyph& glyph = glyphCacheProc(cache.get(), &text); + const SkGlyph& glyph = glyphCacheProc(cache.get(), &text, stop); if (glyph.fWidth) { SkPoint loc; tmsProc(pos, &loc); @@ -554,7 +554,7 @@ void GrTextContext::drawDFPosText(GrTextBlob* blob, int runIndex, while (text < stop) { const char* lastText = text; // the last 2 parameters are ignored - const SkGlyph& glyph = glyphCacheProc(cache.get(), &text); + const SkGlyph& glyph = glyphCacheProc(cache.get(), &text, stop); if (glyph.fWidth) { SkPoint glyphPos(offset); @@ -664,7 +664,7 @@ void GrTextContext::FallbackTextHelper::drawText(GrTextBlob* blob, int runIndex, const char* stop = text + fFallbackTxt.count(); SkPoint* glyphPos = fFallbackPos.begin(); while (text < stop) { - const SkGlyph& glyph = glyphCacheProc(cache.get(), &text); + const SkGlyph& glyph = glyphCacheProc(cache.get(), &text, stop); if (!fUseTransformedFallback) { fViewMatrix.mapPoints(glyphPos, 1); glyphPos->fX = SkScalarFloorToScalar(glyphPos->fX); -- cgit v1.2.3