| Index: src/core/SkFont.cpp
|
| diff --git a/src/core/SkFont.cpp b/src/core/SkFont.cpp
|
| index d6895a480b85e5838cb784e3f37058ed6c55737d..c39cc185d3d5d74c7ed20af2a40aacbdeea090d6 100644
|
| --- a/src/core/SkFont.cpp
|
| +++ b/src/core/SkFont.cpp
|
| @@ -31,13 +31,13 @@ SkFont::SkFont(SkTypeface* face, SkScalar size, SkScalar scaleX, SkScalar skewX,
|
| SkFont* SkFont::Create(SkTypeface* face, SkScalar size, SkScalar scaleX, SkScalar skewX,
|
| MaskType mt, uint32_t flags) {
|
| if (size <= 0 || !SkScalarIsFinite(size)) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| if (scaleX <= 0 || !SkScalarIsFinite(scaleX)) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| if (!SkScalarIsFinite(skewX)) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| flags &= kAllFlags;
|
| return new SkFont(face, size, scaleX, skewX, mt, flags);
|
| @@ -82,7 +82,7 @@ int SkFont::textToGlyphs(const void* text, size_t byteLength, SkTextEncoding enc
|
| count = SkToInt(byteLength >> 1);
|
| break;
|
| }
|
| - if (NULL == glyphs) {
|
| + if (nullptr == glyphs) {
|
| return count;
|
| }
|
|
|
|
|