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

Unified Diff: samplecode/SamplePicture.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 | « samplecode/SamplePictFile.cpp ('k') | samplecode/SampleQuadStroker.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/SamplePicture.cpp
diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp
index 638af054b1533f340ee6f22c765675688d1f34f0..eb2cd733fe61a05d5b7402ac2e1f131b6e21cf10 100644
--- a/samplecode/SamplePicture.cpp
+++ b/samplecode/SamplePicture.cpp
@@ -39,7 +39,7 @@ static SkBitmap load_bitmap() {
SkBitmap bm;
SkString pngFilename = GetResourcePath("mandrill_512.png");
SkAutoDataUnref data(SkData::NewFromFileName(pngFilename.c_str()));
- if (data.get() != NULL) {
+ if (data.get() != nullptr) {
SkInstallDiscardablePixelRef(data, &bm);
}
return bm;
@@ -63,14 +63,14 @@ public:
SkPictureRecorder recorder;
- recorder.beginRecording(100, 100, NULL, 0);
+ recorder.beginRecording(100, 100, nullptr, 0);
fSubPicture = recorder.endRecording();
- SkCanvas* canvas = recorder.beginRecording(100, 100, NULL, 0);
+ SkCanvas* canvas = recorder.beginRecording(100, 100, nullptr, 0);
SkPaint paint;
paint.setAntiAlias(true);
- canvas->drawBitmap(fBitmap, 0, 0, NULL);
+ canvas->drawBitmap(fBitmap, 0, 0, nullptr);
drawCircle(canvas, 50, SK_ColorBLACK);
canvas->drawPicture(fSubPicture);
@@ -108,7 +108,7 @@ protected:
canvas->save();
canvas->scale(0.5f, 0.5f);
- canvas->drawBitmap(fBitmap, 0, 0, NULL);
+ canvas->drawBitmap(fBitmap, 0, 0, nullptr);
canvas->restore();
paint.setAntiAlias(true);
@@ -127,7 +127,7 @@ protected:
this->drawSomething(canvas);
SkPictureRecorder recorder;
- this->drawSomething(recorder.beginRecording(100, 100, NULL, 0));
+ this->drawSomething(recorder.beginRecording(100, 100, nullptr, 0));
SkAutoTUnref<SkPicture> pict(recorder.endRecording());
canvas->save();
@@ -161,7 +161,7 @@ private:
bool onEvent(const SkEvent& evt) override {
if (evt.isType(INVAL_ALL_TYPE)) {
- this->inval(NULL);
+ this->inval(nullptr);
return true;
}
return this->INHERITED::onEvent(evt);
« no previous file with comments | « samplecode/SamplePictFile.cpp ('k') | samplecode/SampleQuadStroker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698