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

Unified Diff: src/core/SkGlyphCache.h

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/core/SkGlyph.h ('k') | src/core/SkGlyphCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkGlyphCache.h
diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h
index dc2aa579a739d10a5e6e317aa77c611d4b0ac01c..706204173d2ac6bf08cef6ebfc5dccdc6eae0596 100644
--- a/src/core/SkGlyphCache.h
+++ b/src/core/SkGlyphCache.h
@@ -117,7 +117,7 @@ public:
/** Find a matching cache entry, and call proc() with it. If none is found create a new one.
If the proc() returns true, detach the cache and return it, otherwise leave it and return
- NULL.
+ nullptr.
*/
static SkGlyphCache* VisitCache(SkTypeface*, const SkDescriptor* desc,
bool (*proc)(const SkGlyphCache*, void*),
@@ -136,7 +136,7 @@ public:
win is that different thread will never block each other while a strike is being used.
*/
static SkGlyphCache* DetachCache(SkTypeface* typeface, const SkDescriptor* desc) {
- return VisitCache(typeface, desc, DetachProc, NULL);
+ return VisitCache(typeface, desc, DetachProc, nullptr);
}
static void Dump();
@@ -163,7 +163,7 @@ public:
}
}
void forget() {
- fCache = NULL;
+ fCache = nullptr;
}
private:
const SkGlyphCache* fCache;
@@ -249,7 +249,7 @@ public:
void release() {
if (fCache) {
SkGlyphCache::AttachCache(fCache);
- fCache = NULL;
+ fCache = nullptr;
}
}
@@ -263,10 +263,10 @@ protected:
SkAutoGlyphCacheBase(const SkPaint& /*paint*/,
const SkSurfaceProps* /*surfaceProps*/,
const SkMatrix* /*matrix*/) {
- fCache = NULL;
+ fCache = nullptr;
}
SkAutoGlyphCacheBase() {
- fCache = NULL;
+ fCache = nullptr;
}
~SkAutoGlyphCacheBase() {
if (fCache) {
« no previous file with comments | « src/core/SkGlyph.h ('k') | src/core/SkGlyphCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698