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

Unified Diff: src/utils/SkNinePatch.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 | « src/utils/SkMeshUtils.cpp ('k') | src/utils/SkOSFile.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/SkNinePatch.cpp
diff --git a/src/utils/SkNinePatch.cpp b/src/utils/SkNinePatch.cpp
index 4a5308bb07193d605500d95ff9584d7da2f77d2f..5ee488e44b6a2cce5c0d48211749a1e81aaa6cd1 100644
--- a/src/utils/SkNinePatch.cpp
+++ b/src/utils/SkNinePatch.cpp
@@ -196,8 +196,8 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
mesh.fVerts = verts;
mesh.fTexs = texs;
- mesh.fColors = NULL;
- mesh.fIndices = NULL;
+ mesh.fColors = nullptr;
+ mesh.fIndices = nullptr;
// we use <= for YDivs, since the prebuild indices work for 3x2 and 3x1 too
if (numXDivs == 2 && numYDivs <= 2) {
@@ -245,7 +245,7 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
}
p.setShader(shader)->unref();
canvas->drawVertices(SkCanvas::kTriangles_VertexMode, vCount,
- mesh.fVerts, mesh.fTexs, mesh.fColors, NULL,
+ mesh.fVerts, mesh.fTexs, mesh.fColors, nullptr,
mesh.fIndices, indexCount, p);
}
« no previous file with comments | « src/utils/SkMeshUtils.cpp ('k') | src/utils/SkOSFile.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698