commit 4014ba6ec7a7825495ac0a6ed591c5dadd30751d
author Hal Canary <halcanary@google.com> Tue Jul 24 11:33:21 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 25 17:21:56 2018 +0000
tree 7439f79dce6e1768d7cdf3e36d4952fd9ed8ef1b
parent ba5c439809fb2be3b1db159b29aeffaa39f786df

SkUtils:  remove some versions of UTF routines.

Change-Id: Ib1f776ae472117c23d2145253adf25fceb412b32
Reviewed-on: https://skia-review.googlesource.com/143111
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

src/gpu/text/GrTextContext.cpp

diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp
index e68be09..6a34895 100644
--- a/src/gpu/text/GrTextContext.cpp
+++ b/src/gpu/text/GrTextContext.cpp
@@ -339,7 +339,7 @@
     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 @@
         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 @@
         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);

src/gpu/text/GrTextUtils.cpp

diff --git a/src/gpu/text/GrTextUtils.cpp b/src/gpu/text/GrTextUtils.cpp
index 6f043e1..ec5389c 100644
--- a/src/gpu/text/GrTextUtils.cpp
+++ b/src/gpu/text/GrTextUtils.cpp
@@ -36,7 +36,7 @@
     SkASSERT(path);
     SkASSERT(xpos);
     if (fText < fStop) {
-        const SkGlyph& glyph = fGlyphCacheProc(fCache.get(), &fText);
+        const SkGlyph& glyph = fGlyphCacheProc(fCache.get(), &fText, fStop);
 
         fXPos += fPrevAdvance * fScale;
         SkASSERT(0 == fXYIndex || 1 == fXYIndex);