From 96fcdcc219d2a0d3579719b84b28bede76efba64 Mon Sep 17 00:00:00 2001 From: halcanary Date: Thu, 27 Aug 2015 07:41:13 -0700 Subject: Style Change: NULL->nullptr DOCS_PREVIEW= https://skia.org/?cl=1316233002 Review URL: https://codereview.chromium.org/1316233002 --- gm/textblobshader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gm/textblobshader.cpp') diff --git a/gm/textblobshader.cpp b/gm/textblobshader.cpp index 5c9372d93c..30674e1d68 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; -- cgit v1.2.3