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/pictureshader.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/pictureshader.cpp')
-rw-r--r-- | gm/pictureshader.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gm/pictureshader.cpp b/gm/pictureshader.cpp index d28749a644..c35c5c964e 100644 --- a/gm/pictureshader.cpp +++ b/gm/pictureshader.cpp @@ -33,7 +33,7 @@ public: void onOnceBeforeDraw() override { // Build the picture. SkPictureRecorder recorder; - SkCanvas* pictureCanvas = recorder.beginRecording(fTileSize, fTileSize, NULL, 0); + SkCanvas* pictureCanvas = recorder.beginRecording(fTileSize, fTileSize, nullptr, 0); this->drawTile(pictureCanvas); fPicture.reset(recorder.endRecording()); @@ -150,12 +150,9 @@ private: canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint); canvas->drawRect(SkRect::MakeXYWH(fSceneSize * 1.1f, 0, fSceneSize, fSceneSize), paint); - SkAutoTUnref<SkShader> pictureShader(SkShader::CreatePictureShader( - fPicture, - kTileConfigs[tileMode].tmx, - kTileConfigs[tileMode].tmy, - &localMatrix, - NULL)); + SkAutoTUnref<SkShader> pictureShader( + SkShader::CreatePictureShader(fPicture, kTileConfigs[tileMode].tmx, + kTileConfigs[tileMode].tmy, &localMatrix, nullptr)); paint.setShader(pictureShader.get()); canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint); @@ -200,12 +197,9 @@ DEF_SIMPLE_GM(tiled_picture_shader, canvas, 400, 400) { c->drawLine(20, 20, 80, 80, p); SkAutoTUnref<SkPicture> picture(recorder.endRecording()); - SkAutoTUnref<SkShader> shader(SkShader::CreatePictureShader( - picture.get(), - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode, - NULL, - NULL)); + SkAutoTUnref<SkShader> shader( + SkShader::CreatePictureShader(picture.get(), SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, nullptr, nullptr)); p.setColor(sk_tool_utils::color_to_565(0xFF8BC34A)); // green canvas->drawPaint(p); |