| Index: src/gpu/GrAtlasTextContext.cpp
|
| diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
|
| index 0e901ae40cdab18f5f8896a807343ed8562cdc7a..b95c446532d9273c48536f8a15972e53e8fd661e 100644
|
| --- a/src/gpu/GrAtlasTextContext.cpp
|
| +++ b/src/gpu/GrAtlasTextContext.cpp
|
| @@ -409,8 +409,7 @@ void GrAtlasTextContext::drawTextBlob(GrRenderTarget* rt,
|
| blob, x, y, drawFilter, clipRect, rt, clip, grPaint);
|
| } else {
|
| // If we can reuse the blob, then make sure we update the blob's viewmatrix, and x/y
|
| - // offsets
|
| - // TODO bounds are wrong
|
| + // offsets. Note, we offset the vertex bounds right before flushing
|
| cacheBlob->fViewMatrix = viewMatrix;
|
| cacheBlob->fX = x;
|
| cacheBlob->fY = y;
|
| @@ -1675,6 +1674,7 @@ public:
|
| }
|
| glyph = blob->fGlyphs[glyphOffset];
|
| SkASSERT(glyph);
|
| + SkASSERT(glyph->fMaskFormat == fMaskFormat);
|
|
|
| if (!fFontCache->hasGlyph(glyph) &&
|
| !strike->addGlyphToAtlas(batchTarget, glyph, scaler)) {
|
|
|