commit 96fcdcc219d2a0d3579719b84b28bede76efba64
author halcanary <halcanary@google.com> Thu Aug 27 07:41:13 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 27 07:41:16 2015 -0700
tree 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd
parent 435af2f736c85c3274a0c6760a3523810750d237

Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002

Review URL: https://codereview.chromium.org/1316233002

gm/imagefiltersbase.cpp

diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp
index 61c3f11..0101a9c 100644
--- a/gm/imagefiltersbase.cpp
+++ b/gm/imagefiltersbase.cpp
@@ -32,7 +32,7 @@
     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 @@
                                     IdentityImageFilter::GetFlattenableType());
         }
     };
-    static IdentityImageFilter* Create(SkImageFilter* input = NULL) {
+    static IdentityImageFilter* Create(SkImageFilter* input = nullptr) {
         return new IdentityImageFilter(input);
     }
 
@@ -160,7 +160,7 @@
     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 @@
     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 @@
         SkColorFilter* cf = SkColorFilter::CreateModeFilter(SK_ColorRED,
                                                      SkXfermode::kSrcIn_Mode);
         SkImageFilter* filters[] = {
-            NULL,
+            nullptr,
             IdentityImageFilter::Create(),
             FailImageFilter::Create(),
             SkColorFilterImageFilter::Create(cf),
@@ -309,8 +309,8 @@
                     this->installFilter(&paint);
                 }
                 if (doSaveLayer) {
-                    canvas->saveLayer(NULL, &paint);
-                    paint.setImageFilter(NULL);
+                    canvas->saveLayer(nullptr, &paint);
+                    paint.setImageFilter(nullptr);
                 }
                 this->drawWaterfall(canvas, paint);