Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(831)

Unified Diff: gm/xfermodes3.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/xfermodes2.cpp ('k') | gm/yuvtorgbeffect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/xfermodes3.cpp
diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp
index c5e1695399871f4fb1cd24b105bdbb692a277fc0..4466b1ce0472f3212bd1442f20aa16ecb82869d5 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();
« no previous file with comments | « gm/xfermodes2.cpp ('k') | gm/yuvtorgbeffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698