| Index: src/gpu/GrBatchFontCache.cpp
|
| diff --git a/src/gpu/GrBatchFontCache.cpp b/src/gpu/GrBatchFontCache.cpp
|
| index 3cd7a64a73d3bee8d906349e40e272c26cf29db8..c429d539b83abebcbbae2589aeba63a9ca86ce3f 100644
|
| --- a/src/gpu/GrBatchFontCache.cpp
|
| +++ b/src/gpu/GrBatchFontCache.cpp
|
| @@ -128,18 +128,10 @@
|
| return this->getAtlas(glyph->fMaskFormat)->hasID(glyph->fID);
|
| }
|
|
|
| -void GrBatchFontCache::addGlyphToBulkAndSetUseToken(GrBatchAtlas::BulkUseTokenUpdater* updater,
|
| - GrGlyph* glyph,
|
| - GrBatchAtlas::BatchToken token) {
|
| +void GrBatchFontCache::setGlyphRefToken(GrGlyph* glyph, GrBatchAtlas::BatchToken batchToken) {
|
| SkASSERT(glyph);
|
| - updater->add(glyph->fID);
|
| - this->getAtlas(glyph->fMaskFormat)->setLastUseToken(glyph->fID, token);
|
| -}
|
| -
|
| -void GrBatchFontCache::setUseTokenBulk(const GrBatchAtlas::BulkUseTokenUpdater& updater,
|
| - GrBatchAtlas::BatchToken token,
|
| - GrMaskFormat format) {
|
| - this->getAtlas(format)->setLastUseTokenBulk(updater, token);
|
| + SkASSERT(this->getAtlas(glyph->fMaskFormat)->hasID(glyph->fID));
|
| + this->getAtlas(glyph->fMaskFormat)->setLastRefToken(glyph->fID, batchToken);
|
| }
|
|
|
| bool GrBatchFontCache::addToAtlas(GrBatchTextStrike* strike, GrBatchAtlas::AtlasID* id,
|
|
|