Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Unified Diff: src/gpu/GrRectanizer.cpp

Issue 22850006: Replace uses of GrAssert by SkASSERT. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rebase Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrRectanizer.h ('k') | src/gpu/GrRectanizer_fifo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrRectanizer.cpp
diff --git a/src/gpu/GrRectanizer.cpp b/src/gpu/GrRectanizer.cpp
index 75ff92c7ee5c581ad09310d549f7ef9420b34daf..6f4b49e1aee64b4fe9874b17346a8b9aac6db8ba 100644
--- a/src/gpu/GrRectanizer.cpp
+++ b/src/gpu/GrRectanizer.cpp
@@ -47,7 +47,7 @@ public:
Row fRows[16];
static int HeightToRowIndex(int height) {
- GrAssert(height >= MIN_HEIGHT_POW2);
+ SkASSERT(height >= MIN_HEIGHT_POW2);
return 32 - SkCLZ(height - 1);
}
@@ -84,7 +84,7 @@ bool GrRectanizerPow2::addRect(int width, int height, GrIPoint16* loc) {
}
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 @@ bool GrRectanizerPow2::addRect(int width, int height, GrIPoint16* loc) {
}
}
- 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;
}
« no previous file with comments | « src/gpu/GrRectanizer.h ('k') | src/gpu/GrRectanizer_fifo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698