| 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",
|
| };
|
|
|