| Index: bench/ImageFilterCollapse.cpp
|
| diff --git a/bench/ImageFilterCollapse.cpp b/bench/ImageFilterCollapse.cpp
|
| index c631c99262a902351027148ceae2cfed2ad69617..4024750dc32f6bc4565b0ebf82235e1a038a7042 100644
|
| --- a/bench/ImageFilterCollapse.cpp
|
| +++ b/bench/ImageFilterCollapse.cpp
|
| @@ -22,7 +22,7 @@
|
|
|
| class BaseImageFilterCollapseBench : public Benchmark {
|
| public:
|
| - BaseImageFilterCollapseBench(): fImageFilter(NULL) {}
|
| + BaseImageFilterCollapseBench(): fImageFilter(nullptr) {}
|
| ~BaseImageFilterCollapseBench() {
|
| SkSafeUnref(fImageFilter);
|
| }
|
| @@ -30,10 +30,10 @@ public:
|
| protected:
|
| void doPreDraw(SkColorFilter* colorFilters[], int nFilters) {
|
| // Create a chain of ImageFilters from colorFilters
|
| - fImageFilter = NULL;
|
| + fImageFilter = nullptr;
|
| for(int i = nFilters; i --> 0;) {
|
| SkAutoTUnref<SkImageFilter> filter(
|
| - SkColorFilterImageFilter::Create(colorFilters[i], fImageFilter, NULL)
|
| + SkColorFilterImageFilter::Create(colorFilters[i], fImageFilter, nullptr)
|
| );
|
| SkRefCnt_SafeAssign(fImageFilter, filter.get());
|
| }
|
| @@ -67,7 +67,7 @@ private:
|
| SK_ColorRED, 0, SK_ColorBLUE, SK_ColorWHITE
|
| };
|
| SkAutoTUnref<SkShader> shader(SkGradientShader::CreateLinear(
|
| - pts, colors, NULL, SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode
|
| + pts, colors, nullptr, SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode
|
| ));
|
| paint.setShader(shader);
|
| canvas.drawPaint(paint);
|
|
|