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

Unified Diff: gm/textblobshader.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/textblobrandomfont.cpp ('k') | gm/textblobuseaftergpufree.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/textblobshader.cpp
diff --git a/gm/textblobshader.cpp b/gm/textblobshader.cpp
index 5c9372d93cdb085edb0590a0afd39bd097307660..30674e1d6877521c3595ffa94fc3775bdc7ff9d3 100644
--- a/gm/textblobshader.cpp
+++ b/gm/textblobshader.cpp
@@ -22,7 +22,7 @@ public:
SkPaint p;
sk_tool_utils::set_portable_typeface(&p);
size_t txtLen = strlen(txt);
- fGlyphs.append(p.textToGlyphs(txt, txtLen, NULL));
+ fGlyphs.append(p.textToGlyphs(txt, txtLen, nullptr));
p.textToGlyphs(txt, txtLen, fGlyphs.begin());
}
@@ -40,16 +40,16 @@ protected:
int glyphCount = fGlyphs.count();
const SkTextBlobBuilder::RunBuffer* run;
- run = &builder.allocRun(p, glyphCount, 10, 10, NULL);
+ run = &builder.allocRun(p, glyphCount, 10, 10, nullptr);
memcpy(run->glyphs, fGlyphs.begin(), glyphCount * sizeof(uint16_t));
- run = &builder.allocRunPosH(p, glyphCount, 80, NULL);
+ run = &builder.allocRunPosH(p, glyphCount, 80, nullptr);
memcpy(run->glyphs, fGlyphs.begin(), glyphCount * sizeof(uint16_t));
for (int i = 0; i < glyphCount; ++i) {
run->pos[i] = p.getTextSize() * i * .75f;
}
- run = &builder.allocRunPos(p, glyphCount, NULL);
+ run = &builder.allocRunPos(p, glyphCount, nullptr);
memcpy(run->glyphs, fGlyphs.begin(), glyphCount * sizeof(uint16_t));
for (int i = 0; i < glyphCount; ++i) {
run->pos[i * 2] = p.getTextSize() * i * .75f;
« no previous file with comments | « gm/textblobrandomfont.cpp ('k') | gm/textblobuseaftergpufree.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698