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/GrTextStrike.cpp

diff --git a/src/gpu/GrTextStrike.cpp b/src/gpu/GrTextStrike.cpp
index 1fe83c9..6533d56 100644
--- a/src/gpu/GrTextStrike.cpp
+++ b/src/gpu/GrTextStrike.cpp
@@ -50,7 +50,7 @@
     if (fHead) {
         fHead->fPrev = strike;
     } else {
-        GrAssert(NULL == fTail);
+        SkASSERT(NULL == fTail);
         fTail = strike;
     }
     strike->fPrev = NULL;
@@ -82,7 +82,7 @@
             // keep purging if we won't free up any atlases with this strike.
             purge = (NULL == strikeToPurge->fAtlas);
             int index = fCache.slowFindIndex(strikeToPurge);
-            GrAssert(index >= 0);
+            SkASSERT(index >= 0);
             fCache.removeAt(index, strikeToPurge->fFontScalerKey->getHash());
             this->detachStrikeFromList(strikeToPurge);
             delete strikeToPurge;
@@ -105,7 +105,7 @@
         if (strikeToPurge->removeUnusedAtlases()) {
             if (NULL == strikeToPurge->fAtlas) {
                 int index = fCache.slowFindIndex(strikeToPurge);
-                GrAssert(index >= 0);
+                SkASSERT(index >= 0);
                 fCache.removeAt(index, strikeToPurge->fFontScalerKey->getHash());
                 this->detachStrikeFromList(strikeToPurge);
                 delete strikeToPurge;
@@ -119,12 +119,12 @@
 void GrFontCache::validate() const {
     int count = fCache.count();
     if (0 == count) {
-        GrAssert(!fHead);
-        GrAssert(!fTail);
+        SkASSERT(!fHead);
+        SkASSERT(!fTail);
     } else if (1 == count) {
-        GrAssert(fHead == fTail);
+        SkASSERT(fHead == fTail);
     } else {
-        GrAssert(fHead != fTail);
+        SkASSERT(fHead != fTail);
     }
 
     int count2 = 0;
@@ -133,7 +133,7 @@
         count2 += 1;
         strike = strike->fNext;
     }
-    GrAssert(count == count2);
+    SkASSERT(count == count2);
 
     count2 = 0;
     strike = fTail;
@@ -141,7 +141,7 @@
         count2 += 1;
         strike = strike->fPrev;
     }
-    GrAssert(count == count2);
+    SkASSERT(count == count2);
 }
 #endif
 
@@ -223,9 +223,9 @@
     if ((++gCounter % 10) == 0) return false;
 #endif
 
-    GrAssert(glyph);
-    GrAssert(scaler);
-    GrAssert(fCache.contains(glyph));
+    SkASSERT(glyph);
+    SkASSERT(scaler);
+    SkASSERT(fCache.contains(glyph));
     if (glyph->fAtlas) {
         glyph->fAtlas->setDrawToken(currentDrawToken);
         return true;