commit 0c00f21fee3f5cfa3aa7e5d46ff94cb8cf340451
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Dec 28 14:59:50 2011 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Dec 28 14:59:50 2011 +0000
tree 2a6e633dbd4bcb8bb5cd308caaa667c8163dbf30
parent 6f6e8c39a7b07f8a916a60ad27f17bd13f3c89ad

Add SkDEBUGFAIL to clean up use of SkASSERT(!"text");
catch a couple of latent SkASSERT("text") bugs.

http://codereview.appspot.com/5504090/



git-svn-id: http://skia.googlecode.com/svn/trunk@2926 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkShader.cpp

diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index 44ec62d..ce7ff9e 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -108,7 +108,7 @@
     SkASSERT(this->canCallShadeSpan16());
 
     // basically, if we get here, the subclass screwed up
-    SkASSERT(!"kHasSpan16 flag is set, but shadeSpan16() not implemented");
+    SkDEBUGFAIL("kHasSpan16 flag is set, but shadeSpan16() not implemented");
 }
 
 #define kTempColorQuadCount 6   // balance between speed (larger) and saving stack-space
@@ -346,15 +346,15 @@
                                const SkMatrix&) { return false; }
 
 void SkEmptyShader::shadeSpan(int x, int y, SkPMColor span[], int count) {
-    SkASSERT(!"should never get called, since setContext() returned false");
+    SkDEBUGFAIL("should never get called, since setContext() returned false");
 }
 
 void SkEmptyShader::shadeSpan16(int x, int y, uint16_t span[], int count) {
-    SkASSERT(!"should never get called, since setContext() returned false");
+    SkDEBUGFAIL("should never get called, since setContext() returned false");
 }
 
 void SkEmptyShader::shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) {
-    SkASSERT(!"should never get called, since setContext() returned false");
+    SkDEBUGFAIL("should never get called, since setContext() returned false");
 }
 
 SkFlattenable::Factory SkEmptyShader::getFactory() { return NULL; }