commit f6de475e5cbd143f348ff7738919e397b7fe7f57
author tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Sat Aug 17 00:02:59 2013 +0000
committer tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Sat Aug 17 00:02:59 2013 +0000
tree 8d8a123db2adbd7cbe6b55651b1c9117d6eafdb8
parent 069975678aaca6dc767e9fef3d743694443223f1

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

src/gpu/SkGrFontScaler.cpp

diff --git a/src/gpu/SkGrFontScaler.cpp b/src/gpu/SkGrFontScaler.cpp
index 35be3d0..aeddd28 100644
--- a/src/gpu/SkGrFontScaler.cpp
+++ b/src/gpu/SkGrFontScaler.cpp
@@ -88,7 +88,7 @@
         case SkMask::kLCD32_Format:
             return kA888_GrMaskFormat;
         default:
-            GrAssert(!"unsupported SkMask::Format");
+            SkASSERT(!"unsupported SkMask::Format");
             return kA8_GrMaskFormat;
     }
 }
@@ -142,8 +142,8 @@
     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;