From 96fcdcc219d2a0d3579719b84b28bede76efba64 Mon Sep 17 00:00:00 2001 From: halcanary Date: Thu, 27 Aug 2015 07:41:13 -0700 Subject: Style Change: NULL->nullptr DOCS_PREVIEW= https://skia.org/?cl=1316233002 Review URL: https://codereview.chromium.org/1316233002 --- gm/imagefiltersbase.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gm/imagefiltersbase.cpp') diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp index 61c3f11f58..0101a9c2a0 100644 --- a/gm/imagefiltersbase.cpp +++ b/gm/imagefiltersbase.cpp @@ -32,7 +32,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter) protected: - FailImageFilter() : INHERITED(0, NULL) {} + FailImageFilter() : INHERITED(0, nullptr) {} bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const override { @@ -67,7 +67,7 @@ public: IdentityImageFilter::GetFlattenableType()); } }; - static IdentityImageFilter* Create(SkImageFilter* input = NULL) { + static IdentityImageFilter* Create(SkImageFilter* input = nullptr) { return new IdentityImageFilter(input); } @@ -160,7 +160,7 @@ static void draw_bitmap(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) { bm.allocN32Pixels(bounds.width(), bounds.height()); bm.eraseColor(SK_ColorTRANSPARENT); SkCanvas c(bm); - draw_path(&c, r, NULL); + draw_path(&c, r, nullptr); canvas->drawBitmap(bm, 0, 0, &paint); } @@ -176,7 +176,7 @@ static void draw_sprite(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) { bm.allocN32Pixels(bounds.width(), bounds.height()); bm.eraseColor(SK_ColorTRANSPARENT); SkCanvas c(bm); - draw_path(&c, r, NULL); + draw_path(&c, r, nullptr); SkPoint loc = { r.fLeft, r.fTop }; canvas->getTotalMatrix().mapPoints(&loc, 1); @@ -216,7 +216,7 @@ protected: SkColorFilter* cf = SkColorFilter::CreateModeFilter(SK_ColorRED, SkXfermode::kSrcIn_Mode); SkImageFilter* filters[] = { - NULL, + nullptr, IdentityImageFilter::Create(), FailImageFilter::Create(), SkColorFilterImageFilter::Create(cf), @@ -309,8 +309,8 @@ protected: this->installFilter(&paint); } if (doSaveLayer) { - canvas->saveLayer(NULL, &paint); - paint.setImageFilter(NULL); + canvas->saveLayer(nullptr, &paint); + paint.setImageFilter(nullptr); } this->drawWaterfall(canvas, paint); -- cgit v1.2.3