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/SampleQuadStroker.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/SampleQuadStroker.cpp')
-rw-r--r-- | samplecode/SampleQuadStroker.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/samplecode/SampleQuadStroker.cpp b/samplecode/SampleQuadStroker.cpp index 91a6a0f5d8..3b029804ad 100644 --- a/samplecode/SampleQuadStroker.cpp +++ b/samplecode/SampleQuadStroker.cpp @@ -196,7 +196,7 @@ protected: default: fText.appendUnichar(uni); } - this->inval(NULL); + this->inval(nullptr); return true; } return this->INHERITED::onQuery(evt); @@ -226,7 +226,7 @@ protected: SkCanvas* canvas = fMaxSurface->getCanvas(); canvas->save(); canvas->concat(fMatrix); - fMinSurface->draw(canvas, 0, 0, NULL); + fMinSurface->draw(canvas, 0, 0, nullptr); canvas->restore(); SkPaint paint; @@ -320,7 +320,7 @@ protected: if (drawText) { fMinSurface->getCanvas()->drawPath(path, paint); this->copyMinToMax(); - fMaxSurface->draw(canvas, 0, 0, NULL); + fMaxSurface->draw(canvas, 0, 0, nullptr); } paint.setAntiAlias(true); paint.setStyle(SkPaint::kStroke_Style); @@ -541,7 +541,7 @@ protected: draw_button(canvas, fRRectButton); draw_button(canvas, fCircleButton); draw_button(canvas, fTextButton); - this->inval(NULL); + this->inval(nullptr); } class MyClick : public Click { @@ -608,7 +608,7 @@ protected: if (index < (int) SK_ARRAY_COUNT(fPts)) { fPts[index].offset(SkIntToScalar(click->fICurr.fX - click->fIPrev.fX), SkIntToScalar(click->fICurr.fY - click->fIPrev.fY)); - this->inval(NULL); + this->inval(nullptr); } else if (index == (int) SK_ARRAY_COUNT(fPts) + 1) { fWeight = MapScreenYtoValue(click->fICurr.fY, fWeightControl, 0, 5); } |