From 40a29d7705d970be03ff94f9fa062db75dccbd0f Mon Sep 17 00:00:00 2001
From: Robert Phillips <robertphillips@google.com>
Date: Thu, 18 Jan 2018 12:59:22 -0500
Subject: Move GrOpFlushState out of GrDrawingManager and onto the stack

Change-Id: If1b3481af7637bfed8a73d75be41c6422319951f
Reviewed-on: https://skia-review.googlesource.com/96540
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
---
 src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/gpu/text')

diff --git a/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp b/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp
index 1be5ae330c..a49a3ff998 100644
--- a/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp
+++ b/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp
@@ -241,8 +241,9 @@ Regenerator::Result Regenerator::doRegen() {
                 result.fFinished = false;
                 return result;
             }
+            auto tokenTracker = fUploadTarget->tokenTracker();
             fGlyphCache->addGlyphToBulkAndSetUseToken(fSubRun->bulkUseToken(), glyph,
-                                                      fUploadTarget->nextDrawToken());
+                                                      tokenTracker->nextDrawToken());
         }
 
         regen_vertices<regenPos, regenCol, regenTexCoords>(currVertex, glyph, vertexStride,
@@ -310,7 +311,8 @@ Regenerator::Result Regenerator::regenerate() {
 
             // set use tokens for all of the glyphs in our subrun.  This is only valid if we
             // have a valid atlas generation
-            fGlyphCache->setUseTokenBulk(*fSubRun->bulkUseToken(), fUploadTarget->nextDrawToken(),
+            fGlyphCache->setUseTokenBulk(*fSubRun->bulkUseToken(),
+                                         fUploadTarget->tokenTracker()->nextDrawToken(),
                                          fSubRun->maskFormat());
             return result;
         }
-- 
cgit v1.2.3