| Index: src/gpu/batches/GrAtlasTextBatch.cpp
|
| diff --git a/src/gpu/batches/GrAtlasTextBatch.cpp b/src/gpu/batches/GrAtlasTextBatch.cpp
|
| index bdf69861a4a8fa97e831a3513d043793906b734d..2da4938e79208b9970f97c89c0054da32811b1eb 100644
|
| --- a/src/gpu/batches/GrAtlasTextBatch.cpp
|
| +++ b/src/gpu/batches/GrAtlasTextBatch.cpp
|
| @@ -136,7 +136,6 @@ void GrAtlasTextBatch::onPrepareDraws(Target* target) const {
|
| // in a row
|
| const SkDescriptor* desc = nullptr;
|
| SkGlyphCache* cache = nullptr;
|
| - GrFontScaler* scaler = nullptr;
|
| SkTypeface* typeface = nullptr;
|
|
|
| GrBlobRegenHelper helper(this, target, &flushInfo);
|
| @@ -148,7 +147,7 @@ void GrAtlasTextBatch::onPrepareDraws(Target* target) const {
|
| void* blobVertices;
|
| int subRunGlyphCount;
|
| blob->regenInBatch(target, fFontCache, &helper, args.fRun, args.fSubRun, &cache,
|
| - &typeface, &scaler, &desc, vertexStride, args.fViewMatrix, args.fX,
|
| + &typeface, &desc, vertexStride, args.fViewMatrix, args.fX,
|
| args.fY, args.fColor, &blobVertices, &byteCount, &subRunGlyphCount);
|
|
|
| // now copy all vertices
|
|
|