| Index: src/fonts/SkTestScalerContext.cpp
|
| diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp
|
| index ee783814368ce83d48e6ad1edee8991491d4a21d..368f26983cc4f7454de739af00313c6e19e1de94 100644
|
| --- a/src/fonts/SkTestScalerContext.cpp
|
| +++ b/src/fonts/SkTestScalerContext.cpp
|
| @@ -24,7 +24,7 @@ SkTestFont::SkTestFont(const SkTestFontData& fontData)
|
| , fWidths(fontData.fWidths)
|
| , fMetrics(fontData.fMetrics)
|
| , fName(fontData.fName)
|
| - , fPaths(NULL)
|
| + , fPaths(nullptr)
|
| {
|
| init(fontData.fPoints, fontData.fVerbs);
|
| #ifdef SK_DEBUG
|
| @@ -173,7 +173,7 @@ SkTypeface::LocalizedStrings* SkTestTypeface::onCreateFamilyNameIterator() const
|
| SkString familyName(fTestFont->fName);
|
| SkString language("und"); //undetermined
|
| SkASSERT(0); // incomplete
|
| - return NULL;
|
| + return nullptr;
|
| // return new SkOTUtils::LocalizedStrings_SingleName(familyName, language);
|
| }
|
|
|
|
|