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

diff --git a/src/gpu/GrRectanizer_fifo.cpp b/src/gpu/GrRectanizer_fifo.cpp
index b6ef1d9..0c36f49 100644
--- a/src/gpu/GrRectanizer_fifo.cpp
+++ b/src/gpu/GrRectanizer_fifo.cpp
@@ -47,7 +47,7 @@
     Row fRows[16];
 
     static int HeightToRowIndex(int height) {
-        GrAssert(height >= MIN_HEIGHT_POW2);
+        SkASSERT(height >= MIN_HEIGHT_POW2);
         return 32 - Gr_clz(height - 1);
     }
 
@@ -84,7 +84,7 @@
     }
 
     Row* row = &fRows[HeightToRowIndex(height)];
-    GrAssert(row->fRowHeight == 0 || row->fRowHeight == height);
+    SkASSERT(row->fRowHeight == 0 || row->fRowHeight == height);
 
     if (0 == row->fRowHeight) {
         if (!this->canAddStrip(height)) {
@@ -102,14 +102,14 @@
         }
     }
 
-    GrAssert(row->fRowHeight == height);
-    GrAssert(row->canAddWidth(width, this->width()));
+    SkASSERT(row->fRowHeight == height);
+    SkASSERT(row->canAddWidth(width, this->width()));
     *loc = row->fLoc;
     row->fLoc.fX += width;
 
-    GrAssert(row->fLoc.fX <= this->width());
-    GrAssert(row->fLoc.fY <= this->height());
-    GrAssert(fNextStripY <= this->height());
+    SkASSERT(row->fLoc.fX <= this->width());
+    SkASSERT(row->fLoc.fY <= this->height());
+    SkASSERT(fNextStripY <= this->height());
     fAreaSoFar += area;
     return true;
 }