diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /samplecode/SamplePictFile.cpp | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'samplecode/SamplePictFile.cpp')
| -rw-r--r-- | samplecode/SamplePictFile.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp index dd315f8a14..4ba4f39ed4 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; |