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

Unified Diff: bench/PatchGridBench.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 | « bench/PatchBench.cpp ('k') | bench/PathBench.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/PatchGridBench.cpp
diff --git a/bench/PatchGridBench.cpp b/bench/PatchGridBench.cpp
index 610d8e72320305d0e177ed9dfcd20016a6b9bea8..e6b44870a104ba68564e687c6ffb0b554fe95f98 100644
--- a/bench/PatchGridBench.cpp
+++ b/bench/PatchGridBench.cpp
@@ -96,7 +96,7 @@ public:
static const int kRows = 3;
static const int kCols = 4;
- fGrid.reset(kRows, kCols, SkPatchGrid::kColors_VertexType, NULL);
+ fGrid.reset(kRows, kCols, SkPatchGrid::kColors_VertexType, nullptr);
for (int i = 0; i < kRows; i++) {
for (int j = 0; j < kCols; j++) {
SkPoint points[12];
@@ -131,13 +131,13 @@ public:
switch (fVertexMode) {
case kNone_VertexMode:
- fGrid.setPatch(j, i, points, NULL, NULL);
+ fGrid.setPatch(j, i, points, nullptr, nullptr);
break;
case kColors_VertexMode:
- fGrid.setPatch(j, i, points, colors, NULL);
+ fGrid.setPatch(j, i, points, colors, nullptr);
break;
case kTexCoords_VertexMode:
- fGrid.setPatch(j, i, points, NULL, texs);
+ fGrid.setPatch(j, i, points, nullptr, texs);
break;
case kBoth_VertexMode:
fGrid.setPatch(j, i, points, colors, texs);
@@ -157,7 +157,7 @@ public:
};
const SkPoint pts[] = { { 200.f / 4.f, 0.f }, { 3.f * 200.f / 4, 200.f } };
- return SkGradientShader::CreateLinear(pts, colors, NULL,
+ return SkGradientShader::CreateLinear(pts, colors, nullptr,
SK_ARRAY_COUNT(colors),
SkShader::kMirror_TileMode);
}
@@ -208,7 +208,7 @@ protected:
fPaint.setShader(createShader())->unref();
break;
default:
- fPaint.setShader(NULL);
+ fPaint.setShader(nullptr);
break;
}
this->setupPaint(&fPaint);
« no previous file with comments | « bench/PatchBench.cpp ('k') | bench/PathBench.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698