aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/utils
diff options
context:
space:
mode:
authorGravatar mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-22 15:37:26 +0000
committerGravatar mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-22 15:37:26 +0000
commit330313a8a8343876ee596da39da06a5d69badd9c (patch)
tree06572dd2cecc561c641b39af8fbcc2d93728b333 /src/utils
parentf68aed33819cbc98a95edeadde1da9303eca7fb2 (diff)
My clang now doesn't complain about !"foo".
BUG= R=robertphillips@google.com Review URL: https://codereview.chromium.org/22875037 git-svn-id: http://skia.googlecode.com/svn/trunk@10874 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/SkJSON.cpp4
-rw-r--r--src/utils/SkLua.cpp2
-rw-r--r--src/utils/SkPictureUtils.cpp2
-rwxr-xr-xsrc/utils/ios/SkFontHost_iOS.mm10
-rwxr-xr-xsrc/utils/ios/SkOSFile_iOS.mm4
-rw-r--r--src/utils/win/SkDWriteGeometrySink.cpp6
6 files changed, 14 insertions, 14 deletions
diff --git a/src/utils/SkJSON.cpp b/src/utils/SkJSON.cpp
index 9b12208202..1aedf58d8b 100644
--- a/src/utils/SkJSON.cpp
+++ b/src/utils/SkJSON.cpp
@@ -414,7 +414,7 @@ void SkJSON::Object::dumpLevel(int level) const {
SkDebugf("%s", slot->fValue.fBool ? "true" : "false");
break;
default:
- SkASSERT(!"how did I get here");
+ SkDEBUGFAIL("how did I get here");
break;
}
if (slot->fNext) {
@@ -490,7 +490,7 @@ void SkJSON::Array::dumpLevel(int level) const {
SkDebugf(" %s ", fArray.fInts[last] ? "true" : "false");
} break;
default:
- SkASSERT(!"unsupported array type");
+ SkDEBUGFAIL("unsupported array type");
break;
}
}
diff --git a/src/utils/SkLua.cpp b/src/utils/SkLua.cpp
index 427093b2e7..767e177229 100644
--- a/src/utils/SkLua.cpp
+++ b/src/utils/SkLua.cpp
@@ -906,7 +906,7 @@ static const char* rrect_type(const SkRRect& rr) {
case SkRRect::kSimple_Type: return "simple";
case SkRRect::kComplex_Type: return "complex";
}
- SkASSERT(!"never get here");
+ SkDEBUGFAIL("never get here");
return "";
}
diff --git a/src/utils/SkPictureUtils.cpp b/src/utils/SkPictureUtils.cpp
index 87a4057ebd..45d3f1b23a 100644
--- a/src/utils/SkPictureUtils.cpp
+++ b/src/utils/SkPictureUtils.cpp
@@ -37,7 +37,7 @@ private:
};
static void not_supported() {
- SkASSERT(!"this method should never be called");
+ SkDEBUGFAIL("this method should never be called");
}
static void nothing_to_do() {}
diff --git a/src/utils/ios/SkFontHost_iOS.mm b/src/utils/ios/SkFontHost_iOS.mm
index 60f111c84e..ae75165a4e 100755
--- a/src/utils/ios/SkFontHost_iOS.mm
+++ b/src/utils/ios/SkFontHost_iOS.mm
@@ -172,12 +172,12 @@ SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
}
SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
- SkASSERT(!"SkFontHost::CreateTypeface unimplemented");
+ SkDEBUGFAIL("SkFontHost::CreateTypeface unimplemented");
return NULL;
}
SkTypeface* SkFontHost::CreateTypefaceFromFile(char const*) {
-// SkASSERT(!"SkFontHost::CreateTypefaceFromFile unimplemented");
+// SkDEBUGFAIL("SkFontHost::CreateTypefaceFromFile unimplemented");
return NULL;
}
@@ -198,7 +198,7 @@ size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length,
///////////////////////////////////////////////////////////////////////////////
void SkFontHost::Serialize(const SkTypeface* face, SkWStream* stream) {
- SkASSERT(!"SkFontHost::Serialize unimplemented");
+ SkDEBUGFAIL("SkFontHost::Serialize unimplemented");
}
SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
@@ -249,7 +249,7 @@ void SkFontHost::GetGammaTables(const uint8_t* tables[2]) {
SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics(
uint32_t fontID,
SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo) {
- SkASSERT(!"SkFontHost::GetAdvancedTypefaceMetrics unimplemented");
+ SkDEBUGFAIL("SkFontHost::GetAdvancedTypefaceMetrics unimplemented");
return NULL;
}
@@ -257,6 +257,6 @@ void SkFontHost::FilterRec(SkScalerContext::Rec* rec, SkTypeface*) {
}
SkScalerContext* SkFontHost::CreateScalerContext(const SkDescriptor* desc) {
- SkASSERT(!"SkFontHost::CreateScalarContext unimplemented");
+ SkDEBUGFAIL("SkFontHost::CreateScalarContext unimplemented");
return NULL;
} \ No newline at end of file
diff --git a/src/utils/ios/SkOSFile_iOS.mm b/src/utils/ios/SkOSFile_iOS.mm
index a685761309..e38ecfdab4 100755
--- a/src/utils/ios/SkOSFile_iOS.mm
+++ b/src/utils/ios/SkOSFile_iOS.mm
@@ -82,12 +82,12 @@ size_t sk_fread(void* buffer, size_t byteCount, SkFILE* rec) {
}
size_t sk_fwrite(const void* buffer, size_t byteCount, SkFILE* f) {
- SkASSERT(!"Not supported yet");
+ SkDEBUGFAIL("Not supported yet");
return 0;
}
void sk_fflush(SkFILE* f) {
- SkASSERT(!"Not supported yet");
+ SkDEBUGFAIL("Not supported yet");
}
void sk_fclose(SkFILE* rec) {
diff --git a/src/utils/win/SkDWriteGeometrySink.cpp b/src/utils/win/SkDWriteGeometrySink.cpp
index 5455e669ef..a12b514f7e 100644
--- a/src/utils/win/SkDWriteGeometrySink.cpp
+++ b/src/utils/win/SkDWriteGeometrySink.cpp
@@ -53,21 +53,21 @@ void STDMETHODCALLTYPE SkDWriteGeometrySink::SetFillMode(D2D1_FILL_MODE fillMode
fPath->setFillType(SkPath::kWinding_FillType);
break;
default:
- SkASSERT(!"Unknown D2D1_FILL_MODE.");
+ SkDEBUGFAIL("Unknown D2D1_FILL_MODE.");
break;
}
}
void STDMETHODCALLTYPE SkDWriteGeometrySink::SetSegmentFlags(D2D1_PATH_SEGMENT vertexFlags) {
if (vertexFlags == D2D1_PATH_SEGMENT_NONE || vertexFlags == D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN) {
- SkASSERT(!"Invalid D2D1_PATH_SEGMENT value.");
+ SkDEBUGFAIL("Invalid D2D1_PATH_SEGMENT value.");
}
}
void STDMETHODCALLTYPE SkDWriteGeometrySink::BeginFigure(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) {
fPath->moveTo(SkFloatToScalar(startPoint.x), SkFloatToScalar(startPoint.y));
if (figureBegin == D2D1_FIGURE_BEGIN_HOLLOW) {
- SkASSERT(!"Invalid D2D1_FIGURE_BEGIN value.");
+ SkDEBUGFAIL("Invalid D2D1_FIGURE_BEGIN value.");
}
}