| Index: src/gpu/gl/builders/GrGLProgramBuilder.h
|
| diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| index deb3708bd16e96e39824e0249309178f1ba35cca..01269aa5ea9652b3f7688aeaeff51671b2d2f22a 100644
|
| --- a/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| +++ b/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| @@ -184,7 +184,7 @@ protected:
|
|
|
| bool inStageCode() const {
|
| this->validate();
|
| - return NULL != fEffectStage;
|
| + return SkToBool(fEffectStage);
|
| }
|
|
|
| const GrEffectStage* effectStage() const {
|
| @@ -200,7 +200,7 @@ protected:
|
| class AutoStageRestore : SkNoncopyable {
|
| public:
|
| AutoStageRestore(CodeStage* codeStage, const GrEffectStage* newStage) {
|
| - SkASSERT(NULL != codeStage);
|
| + SkASSERT(codeStage);
|
| fSavedIndex = codeStage->fCurrentIndex;
|
| fSavedEffectStage = codeStage->fEffectStage;
|
|
|
|
|