diff options
author | halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /gm/fontmgr.cpp | |
parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'gm/fontmgr.cpp')
-rw-r--r-- | gm/fontmgr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index 9339115d0b..67be00d0ac 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -36,7 +36,7 @@ static SkScalar drawCharacter(SkCanvas* canvas, uint32_t character, SkScalar x, SkSafeUnref(paint.setTypeface(typeface)); x = drawString(canvas, ch, x, y, paint) + 20; - if (NULL == typeface) { + if (nullptr == typeface) { return x; } @@ -55,7 +55,7 @@ static const char* ja = "ja"; class FontMgrGM : public skiagm::GM { public: - FontMgrGM(SkFontMgr* fontMgr = NULL) { + FontMgrGM(SkFontMgr* fontMgr = nullptr) { SkGraphics::SetFontCacheLimit(16 * 1024 * 1024); fName.set("fontmgr_iter"); @@ -92,7 +92,7 @@ protected: for (int i = 0; i < count; ++i) { SkString familyName; fm->getFamilyName(i, &familyName); - paint.setTypeface(NULL); + paint.setTypeface(nullptr); (void)drawString(canvas, familyName, 20, y, paint); SkScalar x = 220; @@ -111,7 +111,7 @@ protected: x = drawCharacter(canvas, 0x5203, x, y, paint, fm, familyName.c_str(), &zh, 1, fs); x = drawCharacter(canvas, 0x5203, x, y, paint, fm, familyName.c_str(), &ja, 1, fs); // check that emoji characters are found - x = drawCharacter(canvas, 0x1f601, x, y, paint, fm, familyName.c_str(), NULL,0, fs); + x = drawCharacter(canvas, 0x1f601, x, y, paint, fm, familyName.c_str(), nullptr,0, fs); } y += 24; } @@ -199,7 +199,7 @@ protected: break; } } - if (NULL == fset.get()) { + if (nullptr == fset.get()) { return; } |