diff options
| author |  tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-17 00:02:59 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-17 00:02:59 +0000 |
| commit | f6de475e5cbd143f348ff7738919e397b7fe7f57 (patch) | |
| tree | 8d8a123db2adbd7cbe6b55651b1c9117d6eafdb8 /src/gpu/GrTextContext.cpp | |
| parent | 069975678aaca6dc767e9fef3d743694443223f1 (diff) | |
Replace uses of GrAssert by SkASSERT.
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/22850006
git-svn-id: http://skia.googlecode.com/svn/trunk@10789 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrTextContext.cpp')
| -rw-r--r-- | src/gpu/GrTextContext.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp index f4a3df6429..646ad02802 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); |