| Index: src/gpu/GrFontScaler.cpp
|
| diff --git a/src/gpu/GrFontScaler.cpp b/src/gpu/GrFontScaler.cpp
|
| index d923c7dc2a37839fd50e7acc54013198a0e9c7bb..c8412027c04df8cca2ac69c2847ffac1e00f5baf 100644
|
| --- a/src/gpu/GrFontScaler.cpp
|
| +++ b/src/gpu/GrFontScaler.cpp
|
| @@ -15,7 +15,7 @@
|
|
|
| GrFontScaler::GrFontScaler(SkGlyphCache* strike) {
|
| fStrike = strike;
|
| - fKey = NULL;
|
| + fKey = nullptr;
|
| }
|
|
|
| GrFontScaler::~GrFontScaler() {
|
| @@ -40,7 +40,7 @@ GrMaskFormat GrFontScaler::getMaskFormat() const {
|
| }
|
|
|
| const GrFontDescKey* GrFontScaler::getKey() {
|
| - if (NULL == fKey) {
|
| + if (nullptr == fKey) {
|
| fKey = new GrFontDescKey(fStrike->getDescriptor());
|
| }
|
| return fKey;
|
| @@ -117,7 +117,7 @@ bool GrFontScaler::getPackedGlyphImage(const SkGlyph& glyph, int width, int heig
|
| SkASSERT(glyph.fWidth == width);
|
| SkASSERT(glyph.fHeight == height);
|
| const void* src = fStrike->findImage(glyph);
|
| - if (NULL == src) {
|
| + if (nullptr == src) {
|
| return false;
|
| }
|
|
|
| @@ -171,7 +171,7 @@ bool GrFontScaler::getPackedGlyphDFImage(const SkGlyph& glyph, int width, int he
|
| SkASSERT(glyph.fWidth + 2*SK_DistanceFieldPad == width);
|
| SkASSERT(glyph.fHeight + 2*SK_DistanceFieldPad == height);
|
| const void* image = fStrike->findImage(glyph);
|
| - if (NULL == image) {
|
| + if (nullptr == image) {
|
| return false;
|
| }
|
| // now generate the distance field
|
|
|