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

Unified Diff: tests/FontHostTest.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/FontHostStreamTest.cpp ('k') | tests/FontMgrAndroidParserTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/FontHostTest.cpp
diff --git a/tests/FontHostTest.cpp b/tests/FontHostTest.cpp
index db83e06b621a286c651840d9d6e29a9defd1abde..d9a3df414a524ec760b9a86b43f00c8142b34630 100644
--- a/tests/FontHostTest.cpp
+++ b/tests/FontHostTest.cpp
@@ -112,7 +112,7 @@ static void test_charsToGlyphs(skiatest::Reporter* reporter, SkTypeface* face) {
}
static void test_fontstream(skiatest::Reporter* reporter, SkStream* stream, int ttcIndex) {
- int n = SkFontStream::GetTableTags(stream, ttcIndex, NULL);
+ int n = SkFontStream::GetTableTags(stream, ttcIndex, nullptr);
SkAutoTArray<SkFontTableTag> array(n);
int n2 = SkFontStream::GetTableTags(stream, ttcIndex, array.get());
@@ -214,7 +214,7 @@ static void test_tables(skiatest::Reporter* reporter, SkTypeface* face) {
static void test_tables(skiatest::Reporter* reporter) {
static const char* const gNames[] = {
- NULL, // default font
+ nullptr, // default font
"Helvetica", "Arial",
"Times", "Times New Roman",
"Courier", "Courier New",
@@ -242,7 +242,7 @@ static void test_tables(skiatest::Reporter* reporter) {
*/
static void test_advances(skiatest::Reporter* reporter) {
static const char* const faces[] = {
- NULL, // default font
+ nullptr, // default font
"Arial", "Times", "Times New Roman", "Helvetica", "Courier",
"Courier New", "Verdana", "monospace",
};
« no previous file with comments | « tests/FontHostStreamTest.cpp ('k') | tests/FontMgrAndroidParserTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698