Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: gm/imagefiltersbase.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/imagefilters.cpp ('k') | gm/imagefiltersclipped.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/imagefiltersbase.cpp
diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp
index 61c3f11f58edb083d6e9ee268d741f2e56b01ef4..0101a9c2a042816f2237874ccf1a15da4ea7f2b4 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);
« no previous file with comments | « gm/imagefilters.cpp ('k') | gm/imagefiltersclipped.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698