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/xfermodes3.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/xfermodes3.cpp')
| -rw-r--r-- | gm/xfermodes3.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp index c5e1695399..4466b1ce04 100644 --- a/gm/xfermodes3.cpp +++ b/gm/xfermodes3.cpp @@ -122,14 +122,14 @@ private: * dimensions exactly matching the layer size. */ SkCanvas* possiblyCreateTempCanvas(SkCanvas* baseCanvas, int w, int h) { - SkCanvas* tempCanvas = NULL; + SkCanvas* tempCanvas = nullptr; #if SK_SUPPORT_GPU GrContext* context = baseCanvas->getGrContext(); SkImageInfo baseInfo = baseCanvas->imageInfo(); SkImageInfo info = SkImageInfo::Make(w, h, baseInfo.colorType(), baseInfo.alphaType(), baseInfo.profileType()); SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, - info, 0, NULL)); + info, 0, nullptr)); if (surface) { tempCanvas = SkRef(surface->getCanvas()); } @@ -147,8 +147,8 @@ private: SkRect r = SkRect::MakeWH(SkIntToScalar(w), SkIntToScalar(h)); SkCanvas* modeCanvas; - if (NULL == layerCanvas) { - canvas->saveLayer(&r, NULL); + if (nullptr == layerCanvas) { + canvas->saveLayer(&r, nullptr); modeCanvas = canvas; } else { modeCanvas = layerCanvas; @@ -159,9 +159,9 @@ private: bgPaint.setShader(fBGShader); modeCanvas->drawRect(r, bgPaint); modeCanvas->drawRect(r, modePaint); - modeCanvas = NULL; + modeCanvas = nullptr; - if (NULL == layerCanvas) { + if (nullptr == layerCanvas) { canvas->restore(); } else { SkAutoROCanvasPixels ropixels(layerCanvas); @@ -205,7 +205,7 @@ private: bmpPaint.setShader(SkGradientShader::CreateRadial(kCenter, 3 * SkIntToScalar(kSize) / 4, kColors, - NULL, + nullptr, SK_ARRAY_COUNT(kColors), SkShader::kRepeat_TileMode))->unref(); |