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

Unified Diff: tests/FontMgrTest.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 | « tests/FontMgrAndroidParserTest.cpp ('k') | tests/FontObjTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/FontMgrTest.cpp
diff --git a/tests/FontMgrTest.cpp b/tests/FontMgrTest.cpp
index a1dc9dc0b3641c10eee1e56e712f09e8afc98232..56a791a98b7837ddd35fcdd921378679805ffd85 100644
--- a/tests/FontMgrTest.cpp
+++ b/tests/FontMgrTest.cpp
@@ -14,7 +14,7 @@
#include "SkPaint.h"
static void test_font(skiatest::Reporter* reporter) {
uint32_t flags = 0;
- SkAutoTUnref<SkFont> font(SkFont::Create(NULL, 24, SkFont::kA8_MaskType, flags));
+ SkAutoTUnref<SkFont> font(SkFont::Create(nullptr, 24, SkFont::kA8_MaskType, flags));
REPORTER_ASSERT(reporter, font->getTypeface());
REPORTER_ASSERT(reporter, 24 == font->getSize());
@@ -61,7 +61,7 @@ static void test_alias_names(skiatest::Reporter* reporter) {
for (size_t i = 0; i < SK_ARRAY_COUNT(inNames); ++i) {
SkAutoTUnref<SkTypeface> first(SkTypeface::CreateFromName(inNames[i],
SkTypeface::kNormal));
- if (NULL == first.get()) {
+ if (nullptr == first.get()) {
continue;
}
for (int j = 0; j < 10; ++j) {
« no previous file with comments | « tests/FontMgrAndroidParserTest.cpp ('k') | tests/FontObjTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698