diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/gpu/GrBatchFontCache.h | |
| 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.h')
| -rw-r--r-- | src/gpu/GrBatchFontCache.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrBatchFontCache.h b/src/gpu/GrBatchFontCache.h index 5d57221b68..946356656b 100644 --- a/src/gpu/GrBatchFontCache.h +++ b/src/gpu/GrBatchFontCache.h @@ -33,7 +33,7 @@ public: inline GrGlyph* getGlyph(const SkGlyph& skGlyph, GrGlyph::PackedID packed, GrFontScaler* scaler) { GrGlyph* glyph = fCache.find(packed); - if (NULL == glyph) { + if (nullptr == glyph) { glyph = this->generateGlyph(skGlyph, packed, scaler); } return glyph; @@ -46,7 +46,7 @@ public: inline GrGlyph* getGlyph(const SkGlyph& skGlyph, GrGlyph::PackedID packed, GrMaskFormat expectedMaskFormat, GrFontScaler* scaler) { GrGlyph* glyph = fCache.find(packed); - if (NULL == glyph) { + if (nullptr == glyph) { glyph = this->generateGlyph(skGlyph, packed, scaler); glyph->fMaskFormat = expectedMaskFormat; } @@ -109,7 +109,7 @@ public: // interactions with the cache since the strike was received. inline GrBatchTextStrike* getStrike(GrFontScaler* scaler) { GrBatchTextStrike* strike = fCache.find(*(scaler->getKey())); - if (NULL == strike) { + if (nullptr == strike) { strike = this->generateStrike(scaler); } return strike; @@ -117,14 +117,14 @@ public: void freeAll(); - // if getTexture returns NULL, the client must not try to use other functions on the + // if getTexture returns nullptr, the client must not try to use other functions on the // GrBatchFontCache which use the atlas. This function *must* be called first, before other // functions which use the atlas. GrTexture* getTexture(GrMaskFormat format) { if (this->initAtlas(format)) { return this->getAtlas(format)->getTexture(); } - return NULL; + return nullptr; } bool hasGlyph(GrGlyph* glyph) { |