Index: src/gpu/SkGrFontScaler.cpp |
diff --git a/src/gpu/SkGrFontScaler.cpp b/src/gpu/SkGrFontScaler.cpp |
index 35be3d04897a32eb55d483df455da5c3e9c5f024..aeddd280e7d5bba109715555ed26d1406da8bab2 100644 |
--- a/src/gpu/SkGrFontScaler.cpp |
+++ b/src/gpu/SkGrFontScaler.cpp |
@@ -88,7 +88,7 @@ GrMaskFormat SkGrFontScaler::getMaskFormat() { |
case SkMask::kLCD32_Format: |
return kA888_GrMaskFormat; |
default: |
- GrAssert(!"unsupported SkMask::Format"); |
+ SkASSERT(!"unsupported SkMask::Format"); |
return kA8_GrMaskFormat; |
} |
} |
@@ -142,8 +142,8 @@ bool SkGrFontScaler::getPackedGlyphImage(GrGlyph::PackedID packed, |
const SkGlyph& glyph = fStrike->getGlyphIDMetrics(GrGlyph::UnpackID(packed), |
GrGlyph::UnpackFixedX(packed), |
GrGlyph::UnpackFixedY(packed)); |
- GrAssert(glyph.fWidth == width); |
- GrAssert(glyph.fHeight == height); |
+ SkASSERT(glyph.fWidth == width); |
+ SkASSERT(glyph.fHeight == height); |
const void* src = fStrike->findImage(glyph); |
if (NULL == src) { |
return false; |