aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SamplePicture.cpp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-08-27 07:41:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-27 07:41:16 -0700
commit96fcdcc219d2a0d3579719b84b28bede76efba64 (patch)
tree0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /samplecode/SamplePicture.cpp
parent435af2f736c85c3274a0c6760a3523810750d237 (diff)
Style Change: NULL->nullptr
Diffstat (limited to 'samplecode/SamplePicture.cpp')
-rw-r--r--samplecode/SamplePicture.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp
index 638af054b1..eb2cd733fe 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);