commit a90ed95d13721b27b45d35c7dc571abb58389ec0
author Herb Derby <herb@google.com> Tue Jan 28 15:55:58 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jan 30 23:13:08 2020 +0000
tree 79c069f9a4c0dec0d62ff4e2d775f01e2f7a7eb7
parent 6305b2f8342a75c34c96698d536894963b448e9d

Cleanup GrStrike management because we do not abandon strikes

Change-Id: I23e44ae389d00ae6dad6b04e24522f854dc98d75
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/267177
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>

src/gpu/text/GrAtlasManager.cpp

diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/text/GrAtlasManager.cpp
index b4274d6..e74b02d 100644
--- a/src/gpu/text/GrAtlasManager.cpp
+++ b/src/gpu/text/GrAtlasManager.cpp
@@ -40,7 +40,6 @@
                                 GrTextStrike* strike, GrDrawOpAtlas::PlotLocator* plotLocator,
                                 GrDeferredUploadTarget* target, GrMaskFormat format,
                                 int width, int height, const void* image, SkIPoint16* loc) {
-    glyphCache->setStrikeToPreserve(strike);
     return this->getAtlas(format)->addToAtlas(
             resourceProvider, plotLocator, target, width, height, image, loc);
 }
@@ -161,7 +160,7 @@
                 fProxyProvider, format, grColorType,
                 atlasDimensions.width(), atlasDimensions.height(),
                 plotDimensions.width(), plotDimensions.height(),
-                this, fAllowMultitexturing, fGlyphCache);
+                this, fAllowMultitexturing, nullptr);
         if (!fAtlases[index]) {
             return false;
         }