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

Unified Diff: samplecode/SamplePictFile.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/SamplePdfFileViewer.cpp ('k') | samplecode/SamplePicture.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/SamplePictFile.cpp
diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp
index dd315f8a14db1e1036dd353b798b3ba5567b506d..4ba4f39ed4f0e085d2f84bcf2071efaf004408b9 100644
--- a/samplecode/SamplePictFile.cpp
+++ b/samplecode/SamplePictFile.cpp
@@ -46,12 +46,12 @@ public:
class PictFileView : public SampleView {
public:
- PictFileView(const char name[] = NULL)
+ PictFileView(const char name[] = nullptr)
: fFilename(name)
, fBBox(kNo_BBoxType)
, fTileSize(SkSize::Make(0, 0)) {
for (int i = 0; i < kBBoxTypeCount; ++i) {
- fPictures[i] = NULL;
+ fPictures[i] = nullptr;
}
fCount = 0;
}
@@ -126,7 +126,7 @@ protected:
canvas->setDrawFilter(&filter);
}
canvas->drawPicture(*picture);
- canvas->setDrawFilter(NULL);
+ canvas->setDrawFilter(nullptr);
}
#ifdef SK_GLYPHCACHE_TRACK_HASH_STATS
@@ -159,8 +159,8 @@ private:
SkPictureRecorder recorder;
SkCanvas* can = recorder.beginRecording(SkIntToScalar(bm.width()),
SkIntToScalar(bm.height()),
- NULL, 0);
- can->drawBitmap(bm, 0, 0, NULL);
+ nullptr, 0);
+ can->drawBitmap(bm, 0, 0, nullptr);
pic.reset(recorder.endRecording());
} else {
SkFILEStream stream(path);
@@ -174,7 +174,7 @@ private:
SkPictureRecorder recorder;
pic->playback(recorder.beginRecording(pic->cullRect().width(),
pic->cullRect().height(),
- NULL, 0));
+ nullptr, 0));
SkAutoTUnref<SkPicture> p2(recorder.endRecording());
SkString path2(path);
@@ -184,8 +184,8 @@ private:
}
}
- if (NULL == pic) {
- return NULL;
+ if (nullptr == pic) {
+ return nullptr;
}
SkAutoTDelete<SkBBHFactory> factory;
« no previous file with comments | « samplecode/SamplePdfFileViewer.cpp ('k') | samplecode/SamplePicture.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698