Index: src/gpu/GrDrawState.h |
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h |
index 6223f5388b7c00653cf09ce5ed09647e183d8f7d..f7dc69f0a151b1dfc7780f89a8a23624fbfe969d 100644 |
--- a/src/gpu/GrDrawState.h |
+++ b/src/gpu/GrDrawState.h |
@@ -172,7 +172,7 @@ public: |
*/ |
const GrEffect* setGeometryProcessor(const GrEffect* effect, int attr0 = -1, int attr1 = -1) { |
- SkASSERT(NULL != effect); |
+ SkASSERT(effect); |
SkASSERT(!this->hasGeometryProcessor()); |
fGeometryProcessor.reset(new GrEffectStage(effect, attr0, attr1)); |
this->invalidateBlendOptFlags(); |
@@ -200,14 +200,14 @@ public: |
//// |
const GrEffect* addColorEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) { |
- SkASSERT(NULL != effect); |
+ SkASSERT(effect); |
SkNEW_APPEND_TO_TARRAY(&fColorStages, GrEffectStage, (effect, attr0, attr1)); |
this->invalidateBlendOptFlags(); |
return effect; |
} |
const GrEffect* addCoverageEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) { |
- SkASSERT(NULL != effect); |
+ SkASSERT(effect); |
SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrEffectStage, (effect, attr0, attr1)); |
this->invalidateBlendOptFlags(); |
return effect; |
@@ -272,7 +272,7 @@ public: |
void set(GrDrawState* ds); |
- bool isSet() const { return NULL != fDrawState; } |
+ bool isSet() const { return SkToBool(fDrawState); } |
private: |
GrDrawState* fDrawState; |