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 /gm/offsetimagefilter.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 'gm/offsetimagefilter.cpp')
-rw-r--r-- | gm/offsetimagefilter.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gm/offsetimagefilter.cpp b/gm/offsetimagefilter.cpp index 35ccc053c4..fdf2aa85fa 100644 --- a/gm/offsetimagefilter.cpp +++ b/gm/offsetimagefilter.cpp @@ -96,7 +96,7 @@ protected: SkIRect cropRect = SkIRect::MakeXYWH(0, 0, 100, 100); SkImageFilter::CropRect rect(SkRect::Make(cropRect)); - SkAutoTUnref<SkImageFilter> filter(SkOffsetImageFilter::Create(-5, -10, NULL, &rect)); + SkAutoTUnref<SkImageFilter> filter(SkOffsetImageFilter::Create(-5, -10, nullptr, &rect)); paint.setImageFilter(filter); drawClippedBitmap(canvas, fBitmap, paint, 2, cropRect); } @@ -120,7 +120,7 @@ protected: SkISize onISize() override { return SkISize::Make(640, 200); } void doDraw(SkCanvas* canvas, const SkRect& r, SkImageFilter* imgf, - const SkRect* clipR = NULL) { + const SkRect* clipR = nullptr) { SkPaint p; if (clipR) { @@ -167,23 +167,23 @@ protected: canvas->translate(40, 40); canvas->save(); - this->doDraw(canvas, r, NULL); + this->doDraw(canvas, r, nullptr); canvas->translate(100, 0); this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20)); canvas->translate(100, 0); - this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20, NULL, &cr0)); + this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20, nullptr, &cr0)); canvas->translate(100, 0); this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20), &r); canvas->translate(100, 0); - this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20, NULL, &cr1)); + this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20, nullptr, &cr1)); SkRect clipR = SkRect::MakeXYWH(40, 40, 40, 40); canvas->translate(100, 0); - this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20, NULL, NULL), &clipR); + this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20, nullptr, nullptr), &clipR); canvas->restore(); // 2nd row @@ -194,19 +194,19 @@ protected: */ // crop==clip==src - this->doDraw(canvas, r, SkOffsetImageFilter::Create(40, 0, NULL, &cr0), &r); + this->doDraw(canvas, r, SkOffsetImageFilter::Create(40, 0, nullptr, &cr0), &r); // crop==src, clip==dst canvas->translate(100, 0); - this->doDraw(canvas, r, SkOffsetImageFilter::Create(40, 0, NULL, &cr0), &r2); + this->doDraw(canvas, r, SkOffsetImageFilter::Create(40, 0, nullptr, &cr0), &r2); // crop==dst, clip==src canvas->translate(100, 0); - this->doDraw(canvas, r, SkOffsetImageFilter::Create(40, 0, NULL, &cr2), &r); + this->doDraw(canvas, r, SkOffsetImageFilter::Create(40, 0, nullptr, &cr2), &r); // crop==clip==dst canvas->translate(100, 0); - this->doDraw(canvas, r, SkOffsetImageFilter::Create(40, 0, NULL, &cr2), &r2); + this->doDraw(canvas, r, SkOffsetImageFilter::Create(40, 0, nullptr, &cr2), &r2); } private: |