| Index: src/gpu/GrBatchFontCache.cpp
|
| diff --git a/src/gpu/GrBatchFontCache.cpp b/src/gpu/GrBatchFontCache.cpp
|
| index e8c21832321a085f4af5e1f8d32fb56dcd67d7c9..de8047b948bebf275844b9a3678ebc78363f3934 100644
|
| --- a/src/gpu/GrBatchFontCache.cpp
|
| +++ b/src/gpu/GrBatchFontCache.cpp
|
| @@ -40,9 +40,9 @@ bool GrBatchFontCache::initAtlas(GrMaskFormat format) {
|
|
|
| GrBatchFontCache::GrBatchFontCache(GrContext* context)
|
| : fContext(context)
|
| - , fPreserveStrike(NULL) {
|
| + , fPreserveStrike(nullptr) {
|
| for (int i = 0; i < kMaskFormatCount; ++i) {
|
| - fAtlases[i] = NULL;
|
| + fAtlases[i] = nullptr;
|
| }
|
|
|
| // setup default atlas configs
|
| @@ -84,7 +84,7 @@ void GrBatchFontCache::freeAll() {
|
| fCache.rewind();
|
| for (int i = 0; i < kMaskFormatCount; ++i) {
|
| delete fAtlases[i];
|
| - fAtlases[i] = NULL;
|
| + fAtlases[i] = nullptr;
|
| }
|
| }
|
|
|
| @@ -131,7 +131,7 @@ void GrBatchFontCache::setAtlasSizes_ForTesting(const GrBatchAtlasConfig configs
|
| for (int i = 0; i < kMaskFormatCount; i++) {
|
| if (fAtlases[i]) {
|
| delete fAtlases[i];
|
| - fAtlases[i] = NULL;
|
| + fAtlases[i] = nullptr;
|
| }
|
| }
|
| memcpy(fAtlasConfigs, configs, sizeof(fAtlasConfigs));
|
| @@ -169,11 +169,11 @@ GrGlyph* GrBatchTextStrike::generateGlyph(const SkGlyph& skGlyph, GrGlyph::Packe
|
| SkIRect bounds;
|
| if (GrGlyph::kDistance_MaskStyle == GrGlyph::UnpackMaskStyle(packed)) {
|
| if (!scaler->getPackedGlyphDFBounds(skGlyph, &bounds)) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| } else {
|
| if (!scaler->getPackedGlyphBounds(skGlyph, &bounds)) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
| GrMaskFormat format = scaler->getPackedGlyphMaskFormat(skGlyph);
|
|
|