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

Unified Diff: gm/blend.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/bitmapsource2.cpp ('k') | gm/blurrect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/blend.cpp
diff --git a/gm/blend.cpp b/gm/blend.cpp
index a89ecfe46d07defb574275d9c6253ed4b6e7e870..94dc4c7f75fafceb314342f67ab8de97eee0de1e 100644
--- a/gm/blend.cpp
+++ b/gm/blend.cpp
@@ -21,14 +21,14 @@ DEF_SIMPLE_GM(blend, canvas, 300, 100) {
p.setColor(SK_ColorRED);
canvas->drawRect(SkRect::MakeXYWH(1,0,1,1), p);
- canvas->saveLayer(NULL, NULL);
+ canvas->saveLayer(nullptr, nullptr);
p.setColor(0xFC008000);
canvas->drawRect(SkRect::MakeXYWH(1,0,1,1), p);
canvas->restore();
p.setColor(SK_ColorRED);
canvas->drawRect(SkRect::MakeXYWH(2,0,1,1), p);
- canvas->saveLayerAlpha(NULL, 0xFC);
+ canvas->saveLayerAlpha(nullptr, 0xFC);
p.setColor(sk_tool_utils::color_to_565(0xFF008000));
canvas->drawRect(SkRect::MakeXYWH(2,0,1,1), p);
canvas->restore();
@@ -36,7 +36,7 @@ DEF_SIMPLE_GM(blend, canvas, 300, 100) {
// Print out the colors in each block (if we're looking at 8888 raster).
if (canvas->imageInfo().colorType() == kN32_SkColorType) {
- if (const SkPMColor* px = (const SkPMColor*)canvas->peekPixels(NULL, NULL)) {
+ if (const SkPMColor* px = (const SkPMColor*)canvas->peekPixels(nullptr, nullptr)) {
p.setColor(SK_ColorWHITE);
for (int i = 0; i < 3; i++) {
SkPMColor c = px[i * 100];
« no previous file with comments | « gm/bitmapsource2.cpp ('k') | gm/blurrect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698