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/SampleVertices.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/SampleVertices.cpp')
| -rw-r--r-- | samplecode/SampleVertices.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp index 138ab2e5ba..2f2dc024d0 100644 --- a/samplecode/SampleVertices.cpp +++ b/samplecode/SampleVertices.cpp @@ -46,7 +46,7 @@ static SkShader* make_shader1(const SkIPoint& size) { SkPoint pts[] = { { 0, 0 }, { SkIntToScalar(size.fX), SkIntToScalar(size.fY) } }; SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorRED }; - return SkGradientShader::CreateLinear(pts, colors, NULL, + return SkGradientShader::CreateLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors), SkShader::kMirror_TileMode); } @@ -95,24 +95,24 @@ protected: for (size_t i = 0; i < SK_ARRAY_COUNT(fRecs); i++) { canvas->save(); - paint.setShader(NULL); + paint.setShader(nullptr); canvas->drawVertices(fRecs[i].fMode, fRecs[i].fCount, fRecs[i].fVerts, fRecs[i].fTexs, - NULL, NULL, NULL, 0, paint); + nullptr, nullptr, nullptr, 0, paint); canvas->translate(SkIntToScalar(250), 0); paint.setShader(fShader0); canvas->drawVertices(fRecs[i].fMode, fRecs[i].fCount, fRecs[i].fVerts, fRecs[i].fTexs, - NULL, NULL, NULL, 0, paint); + nullptr, nullptr, nullptr, 0, paint); canvas->translate(SkIntToScalar(250), 0); paint.setShader(fShader1); canvas->drawVertices(fRecs[i].fMode, fRecs[i].fCount, fRecs[i].fVerts, fRecs[i].fTexs, - NULL, NULL, NULL, 0, paint); + nullptr, nullptr, nullptr, 0, paint); canvas->restore(); canvas->translate(0, SkIntToScalar(250)); @@ -126,7 +126,7 @@ protected: bool onClick(Click* click) override { // fCurrX = click->fICurr.fX; // fCurrY = click->fICurr.fY; - this->inval(NULL); + this->inval(nullptr); return true; } @@ -137,7 +137,7 @@ private: SkPoint* fVerts; SkPoint* fTexs; - Rec() : fCount(0), fVerts(NULL), fTexs(NULL) {} + Rec() : fCount(0), fVerts(nullptr), fTexs(nullptr) {} ~Rec() { delete[] fVerts; delete[] fTexs; } }; |