commit ba98b7d872e6fd1350ef4fd50bdc305d4c5538b4
author Jim Van Verth <jvanverth@google.com> Wed Dec 05 12:33:43 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 05 18:26:08 2018 +0000
tree 33f8a92a106a37e77a00ffa2767c474b489b2a1b
parent b353eeb716930fe7ad69dcb15c2d992f4496c3ac

Make sure we mark Plots in use for all regenerate cases

Bug: b/118850208
Change-Id: I6c0b6d8cb8831baefbe1dc9eebe7fef337a467e6
Reviewed-on: https://skia-review.googlesource.com/c/174590
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: 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 486127d..faf9223 100644
--- a/src/gpu/text/GrAtlasManager.cpp
+++ b/src/gpu/text/GrAtlasManager.cpp
@@ -77,8 +77,9 @@
                                                   GrGlyph* glyph,
                                                   GrDeferredUploadToken token) {
     SkASSERT(glyph);
-    updater->add(glyph->fID);
-    this->getAtlas(glyph->fMaskFormat)->setLastUseToken(glyph->fID, token);
+    if (updater->add(glyph->fID)) {
+        this->getAtlas(glyph->fMaskFormat)->setLastUseToken(glyph->fID, token);
+    }
 }
 
 #ifdef SK_DEBUG

src/gpu/text/GrTextBlobVertexRegenerator.cpp

diff --git a/src/gpu/text/GrTextBlobVertexRegenerator.cpp b/src/gpu/text/GrTextBlobVertexRegenerator.cpp
index 0cfddf6..e994ce9 100644
--- a/src/gpu/text/GrTextBlobVertexRegenerator.cpp
+++ b/src/gpu/text/GrTextBlobVertexRegenerator.cpp
@@ -315,6 +315,11 @@
         fSubRun->setAtlasGeneration(fBrokenRun
                                     ? GrDrawOpAtlas::kInvalidAtlasGeneration
                                     : fFullAtlasManager->atlasGeneration(fSubRun->maskFormat()));
+    } else {
+        // For the non-texCoords case we need to ensure that we update the associated use tokens
+        fFullAtlasManager->setUseTokenBulk(*fSubRun->bulkUseToken(),
+                                           fUploadTarget->tokenTracker()->nextDrawToken(),
+                                           fSubRun->maskFormat());
     }
     return true;
 }