| Index: src/core/SkFontDescriptor.h
|
| diff --git a/src/core/SkFontDescriptor.h b/src/core/SkFontDescriptor.h
|
| index 933a36a0952d254d987b5b2dc12970fbc851268b..21fecdc416287278d7585813fc18fe9403e09a31 100644
|
| --- a/src/core/SkFontDescriptor.h
|
| +++ b/src/core/SkFontDescriptor.h
|
| @@ -32,7 +32,7 @@ public:
|
| fAxis[i] = that.fAxis[i];
|
| }
|
| }
|
| - bool hasStream() const { return fStream.get() != NULL; }
|
| + bool hasStream() const { return fStream.get() != nullptr; }
|
| SkStreamAsset* duplicateStream() const { return fStream->duplicate(); }
|
| SkStreamAsset* detachStream() { return fStream.detach(); }
|
| SkStreamAsset* getStream() { return fStream.get(); }
|
| @@ -61,7 +61,7 @@ public:
|
| const char* getFamilyName() const { return fFamilyName.c_str(); }
|
| const char* getFullName() const { return fFullName.c_str(); }
|
| const char* getPostscriptName() const { return fPostscriptName.c_str(); }
|
| - bool hasFontData() const { return fFontData.get() != NULL; }
|
| + bool hasFontData() const { return fFontData.get() != nullptr; }
|
| SkFontData* detachFontData() { return fFontData.detach(); }
|
|
|
| void setFamilyName(const char* name) { fFamilyName.set(name); }
|
|
|