commit 99e002f5023ed3fba6c9cbe3732c5a4447c9464f
author Mike Klein <mtklein@google.com> Thu Jan 16 16:45:03 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jan 16 16:45:22 2020 +0000
tree fd635327a46a3a7c4686757fdb4e0492ed562443
parent 59d529cafa86b2bf4522bfcdac2fef05b5467900

Revert "Simplify VertexRegenerator GrStrikeCache handling"

This reverts commit 59d529cafa86b2bf4522bfcdac2fef05b5467900.

Reason for revert: use-after-frees, *SAN bots

Original change's description:
> Simplify VertexRegenerator GrStrikeCache handling
> 
> The SubRun has access to the GrStrikeCache pointer, there is
> no need to pass it around the VertexRegenerator.
> 
> Change-Id: I867b1b29b29e595f92ad57505dcd27dd0f6b726f
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/264649
> Commit-Queue: Herb Derby <herb@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>

TBR=mtklein@google.com,herb@google.com

Change-Id: I7de7841fdd1efb5df845613bd0116fbaf12d1c49
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/264756
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

src/gpu/ops/GrAtlasTextOp.cpp

diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 5d158c6..f790870 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -286,6 +286,8 @@
     }
 
     GrAtlasManager* atlasManager = target->atlasManager();
+    GrStrikeCache* glyphCache = target->glyphCache();
+
     GrMaskFormat maskFormat = this->maskFormat();
 
     unsigned int numActiveViews;
@@ -359,7 +361,8 @@
 
         // TODO4F: Preserve float colors
         GrTextBlob::VertexRegenerator regenerator(
-                resourceProvider, args.fSubRunPtr, target->deferredUploadTarget(), atlasManager);
+                resourceProvider, args.fSubRunPtr, target->deferredUploadTarget(), glyphCache,
+                atlasManager);
 
         // Where the subRun begins and ends relative to totalGlyphsRegened.
         int subRunBegin = totalGlyphsRegened;