| Index: samplecode/SampleAtlas.cpp
|
| diff --git a/samplecode/SampleAtlas.cpp b/samplecode/SampleAtlas.cpp
|
| index e11bf7e2c16eedbb61b7d6d28cd9a1322e98808d..a7d5cbe9fd46e6b71ceda35fa2b160f71009d84d 100644
|
| --- a/samplecode/SampleAtlas.cpp
|
| +++ b/samplecode/SampleAtlas.cpp
|
| @@ -186,7 +186,7 @@ protected:
|
| paint.setFilterQuality(kLow_SkFilterQuality);
|
|
|
| const SkRect cull = this->getBounds();
|
| - const SkColor* colorsPtr = fUseColors ? colors : NULL;
|
| + const SkColor* colorsPtr = fUseColors ? colors : nullptr;
|
| fProc(canvas, fAtlas, xform, fTex, colorsPtr, N, &cull, &paint);
|
| }
|
|
|
| @@ -223,7 +223,7 @@ protected:
|
| SkUnichar uni;
|
| if (SampleCode::CharQ(*evt, &uni)) {
|
| switch (uni) {
|
| - case 'C': fDrawable->toggleUseColors(); this->inval(NULL); return true;
|
| + case 'C': fDrawable->toggleUseColors(); this->inval(nullptr); return true;
|
| default: break;
|
| }
|
| }
|
| @@ -232,7 +232,7 @@ protected:
|
|
|
| void onDrawContent(SkCanvas* canvas) override {
|
| canvas->drawDrawable(fDrawable);
|
| - this->inval(NULL);
|
| + this->inval(nullptr);
|
| }
|
|
|
| #if 0
|
|
|