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

Unified Diff: gm/colortypexfermode.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/colortype.cpp ('k') | gm/colorwheel.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/colortypexfermode.cpp
diff --git a/gm/colortypexfermode.cpp b/gm/colortypexfermode.cpp
index 2926523c27eaf09baa800cbfa608bb83d4a493fb..55d7697e3593ef68249be025b271bdbda7ce2901 100644
--- a/gm/colortypexfermode.cpp
+++ b/gm/colortypexfermode.cpp
@@ -20,7 +20,7 @@ public:
const static int W = 64;
const static int H = 64;
ColorTypeXfermodeGM()
- : fColorType(NULL) {
+ : fColorType(nullptr) {
}
virtual ~ColorTypeXfermodeGM() {
@@ -35,7 +35,7 @@ protected:
};
SkMatrix local;
local.setRotate(180);
- SkShader* s = SkGradientShader::CreateSweep(0,0, colors, NULL,
+ SkShader* s = SkGradientShader::CreateSweep(0,0, colors, nullptr,
SK_ARRAY_COUNT(colors), 0, &local);
SkPaint paint;
@@ -44,7 +44,7 @@ protected:
SkTypeface* orig = sk_tool_utils::create_portable_typeface("serif",
SkTypeface::kBold);
- if (NULL == orig) {
+ if (nullptr == orig) {
orig = SkTypeface::RefDefault();
}
fColorType = new SkGTypeface(orig, paint);
@@ -138,7 +138,7 @@ protected:
r.inset(-SK_ScalarHalf, -SK_ScalarHalf);
p.setStyle(SkPaint::kStroke_Style);
- p.setShader(NULL);
+ p.setShader(nullptr);
canvas->drawRect(r, p);
textP.setXfermode(mode);
« no previous file with comments | « gm/colortype.cpp ('k') | gm/colorwheel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698