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

Unified Diff: src/effects/SkDisplacementMapEffect.cpp

Issue 22875037: My clang now doesn't complain about !"foo". (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: 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/doc/SkDocument.cpp ('k') | src/gpu/GrAtlas.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkDisplacementMapEffect.cpp
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index dad0623d2f29308af983427d11560eae8cfcd287..6a3abb5a3c5e28547eb5bdbb2bece4eafeb077e2 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -21,7 +21,7 @@ namespace {
template<SkDisplacementMapEffect::ChannelSelectorType type>
uint32_t getValue(SkColor, const SkUnPreMultiply::Scale*) {
- SkASSERT(!"Unknown channel selector");
+ SkDEBUGFAIL("Unknown channel selector");
return 0;
}
@@ -97,7 +97,7 @@ void computeDisplacement(SkDisplacementMapEffect::ChannelSelectorType yChannelSe
break;
case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
default:
- SkASSERT(!"Unknown Y channel selector");
+ SkDEBUGFAIL("Unknown Y channel selector");
}
}
@@ -124,7 +124,7 @@ void computeDisplacement(SkDisplacementMapEffect::ChannelSelectorType xChannelSe
break;
case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
default:
- SkASSERT(!"Unknown X channel selector");
+ SkDEBUGFAIL("Unknown X channel selector");
}
}
@@ -456,7 +456,7 @@ void GrGLDisplacementMapEffect::emitCode(GrGLShaderBuilder* builder,
break;
case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
default:
- SkASSERT(!"Unknown X channel selector");
+ SkDEBUGFAIL("Unknown X channel selector");
}
switch (fYChannelSelector) {
@@ -474,7 +474,7 @@ void GrGLDisplacementMapEffect::emitCode(GrGLShaderBuilder* builder,
break;
case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
default:
- SkASSERT(!"Unknown Y channel selector");
+ SkDEBUGFAIL("Unknown Y channel selector");
}
builder->fsCodeAppend("-vec2(0.5));\t\t");
« no previous file with comments | « src/doc/SkDocument.cpp ('k') | src/gpu/GrAtlas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698