| Index: src/effects/SkLumaColorFilter.cpp
|
| diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp
|
| index caa2a208d2c77000257dde21c0d7d58be0f5736f..21f7c0528db8531ae4fe595ec2c0398e4ef84b72 100644
|
| --- a/src/effects/SkLumaColorFilter.cpp
|
| +++ b/src/effects/SkLumaColorFilter.cpp
|
| @@ -68,7 +68,7 @@ public:
|
| static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {}
|
|
|
| virtual void emitCode(EmitArgs& args) override {
|
| - if (NULL == args.fInputColor) {
|
| + if (nullptr == args.fInputColor) {
|
| args.fInputColor = "vec4(1)";
|
| }
|
|
|
| @@ -117,7 +117,7 @@ bool SkLumaColorFilter::asFragmentProcessors(GrContext*, GrProcessorDataManager*
|
| *array->append() = frag;
|
| } else {
|
| frag->unref();
|
| - SkDEBUGCODE(frag = NULL;)
|
| + SkDEBUGCODE(frag = nullptr;)
|
| }
|
| return true;
|
| }
|
|
|