| Index: src/gpu/GrTextContext.cpp
|
| diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
|
| index f4a3df6429e05fb31bcf5bdedb87776a70ae3a01..646ad02802e009a5456dcfa10f25cc48bc7c9023 100644
|
| --- a/src/gpu/GrTextContext.cpp
|
| +++ b/src/gpu/GrTextContext.cpp
|
| @@ -31,8 +31,8 @@ void GrTextContext::flushGlyphs() {
|
|
|
| if (fCurrVertex > 0) {
|
| // setup our sampler state for our text texture/atlas
|
| - GrAssert(GrIsALIGN4(fCurrVertex));
|
| - GrAssert(fCurrTexture);
|
| + SkASSERT(GrIsALIGN4(fCurrVertex));
|
| + SkASSERT(fCurrTexture);
|
| GrTextureParams params(SkShader::kRepeat_TileMode, GrTextureParams::kNone_FilterMode);
|
|
|
| // This effect could be stored with one of the cache objects (atlas?)
|
| @@ -193,14 +193,14 @@ void GrTextContext::drawPackedGlyph(GrGlyph::PackedID packed,
|
| }
|
|
|
| HAS_ATLAS:
|
| - GrAssert(glyph->fAtlas);
|
| + SkASSERT(glyph->fAtlas);
|
|
|
| // now promote them to fixed (TODO: Rethink using fixed pt).
|
| width = SkIntToFixed(width);
|
| height = SkIntToFixed(height);
|
|
|
| GrTexture* texture = glyph->fAtlas->texture();
|
| - GrAssert(texture);
|
| + SkASSERT(texture);
|
|
|
| if (fCurrTexture != texture || fCurrVertex + 4 > fMaxVertices) {
|
| this->flushGlyphs();
|
| @@ -237,7 +237,7 @@ HAS_ATLAS:
|
| GrTCast<void**>(&fVertices),
|
| NULL);
|
| GrAlwaysAssert(success);
|
| - GrAssert(2*sizeof(GrPoint) == fDrawTarget->getDrawState().getVertexSize());
|
| + SkASSERT(2*sizeof(GrPoint) == fDrawTarget->getDrawState().getVertexSize());
|
| }
|
|
|
| GrFixed tx = SkIntToFixed(glyph->fAtlasLocation.fX);
|
|
|