diff options
author | 2015-08-27 07:41:13 -0700 | |
---|---|---|
committer | 2015-08-27 07:41:16 -0700 | |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/gpu/GrBatchFontCache.cpp | |
parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/gpu/GrBatchFontCache.cpp')
-rw-r--r-- | src/gpu/GrBatchFontCache.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrBatchFontCache.cpp b/src/gpu/GrBatchFontCache.cpp index e8c2183232..de8047b948 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); |