diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-02-21 12:31:17 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-21 18:35:16 +0000 |
| commit | 038c608a8658cb6413981b7d3c9368e8245b6384 (patch) | |
| tree | bc2ae27794fae0f303eb5f90bd9e11096030a496 /src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp | |
| parent | 955b3d55808117f45e24de1db1e245b5491897ea (diff) | |
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 <jvanverth@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp')
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |