| Index: src/gpu/GrAtlasTextContext.cpp
|
| diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
|
| index 08fbf5887aff8314038f09c82f2df6b25d757af6..f5976392cc64107fae2dbfa41cbaddb67e77c75d 100644
|
| --- a/src/gpu/GrAtlasTextContext.cpp
|
| +++ b/src/gpu/GrAtlasTextContext.cpp
|
| @@ -1678,8 +1678,10 @@ public:
|
| }
|
| glyph = blob->fGlyphs[glyphOffset];
|
| SkASSERT(glyph);
|
| - SkASSERT(id == glyph->fPackedID &&
|
| - glyph->fMaskFormat == this->maskFormat());
|
| + SkASSERT(id == glyph->fPackedID);
|
| + // We want to be able to assert this but cannot for testing purposes.
|
| + // once skbug:4143 has landed we can revist this assert
|
| + //SkASSERT(glyph->fMaskFormat == this->maskFormat());
|
|
|
| if (!fFontCache->hasGlyph(glyph) &&
|
| !strike->addGlyphToAtlas(batchTarget, glyph, scaler, skGlyph,
|
|
|