From 038c608a8658cb6413981b7d3c9368e8245b6384 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 21 Feb 2018 12:31:17 -0500 Subject: Remove back pointer to GrAtlasGlyphCache from GrAtlasTextStrike This is calved off from https://skia-review.googlesource.com/c/skia/+/108001 (Fission GrAtlasGlyphCache in two) In the DDL world, the GrAtlasTextStrikes can outlive their generating GrAtlasGlyphCache. Change-Id: I52b01d3934b0651a58a59b12dcc4c98ffbb891a9 Reviewed-on: https://skia-review.googlesource.com/109061 Reviewed-by: Jim Van Verth Commit-Queue: Robert Phillips --- src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp') diff --git a/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp b/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp index 384596ddb6..1a9c3d73e4 100644 --- a/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp +++ b/src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp @@ -274,7 +274,7 @@ Regenerator::Result Regenerator::doRegen() { SkASSERT(glyph && glyph->fMaskFormat == fSubRun->maskFormat()); if (!fGlyphCache->hasGlyph(glyph) && - !strike->addGlyphToAtlas(fUploadTarget, glyph, fLazyCache->get(), + !strike->addGlyphToAtlas(fUploadTarget, fGlyphCache, glyph, fLazyCache->get(), fSubRun->maskFormat())) { fBrokenRun = glyphIdx > 0; result.fFinished = false; -- cgit v1.2.3