Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Unified Diff: src/gpu/GrBatchFontCache.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrBatchFontCache.h ('k') | src/gpu/GrBlurUtils.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « src/gpu/GrBatchFontCache.h ('k') | src/gpu/GrBlurUtils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698