commit 3e8e34e944df5dd30cd909cde69fc114c5634607
author Herb Derby <herb@google.com> Thu Jun 20 15:16:13 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 21 15:58:41 2019 +0000
tree fa44d07cd2c0a11ff37334c8429ece7b89188e92
parent 0426c38daa64627258061f7c049343924792701e

Start using new APIs for bounds and glyph lookup

Change-Id: I2fa8048b95a48e61c33223257880c2ce8414a5e5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222507
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

src/gpu/text/GrStrikeCache.cpp

diff --git a/src/gpu/text/GrStrikeCache.cpp b/src/gpu/text/GrStrikeCache.cpp
index 211e73a..09081c4 100644
--- a/src/gpu/text/GrStrikeCache.cpp
+++ b/src/gpu/text/GrStrikeCache.cpp
@@ -83,8 +83,8 @@
 static bool get_packed_glyph_image(SkStrike* cache, const SkGlyph& glyph, int width,
                                    int height, int dstRB, GrMaskFormat expectedMaskFormat,
                                    void* dst, const SkMasks& masks) {
-    SkASSERT(glyph.fWidth == width);
-    SkASSERT(glyph.fHeight == height);
+    SkASSERT(glyph.width() == width);
+    SkASSERT(glyph.height() == height);
     const void* src = cache->findImage(glyph);
     if (nullptr == src) {
         return false;
@@ -215,13 +215,13 @@
     }
     SkAutoSMalloc<1024> storage(size);
 
-    const SkGlyph& skGlyph = skStrikeCache->getGlyphIDMetrics(glyph->fPackedID);
+    SkGlyph* skGlyph = skStrikeCache->glyph(glyph->fPackedID);
     void* dataPtr = storage.get();
     if (addPad) {
         sk_bzero(dataPtr, size);
         dataPtr = (char*)(dataPtr) + rowBytes + bytesPerPixel;
     }
-    if (!get_packed_glyph_image(skStrikeCache, skGlyph, glyph->width(), glyph->height(),
+    if (!get_packed_glyph_image(skStrikeCache, *skGlyph, glyph->width(), glyph->height(),
                                 rowBytes, expectedMaskFormat,
                                 dataPtr, glyphCache->getMasks())) {
         return GrDrawOpAtlas::ErrorCode::kError;