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

Unified Diff: src/ports/SkFontHost_fontconfig.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/ports/SkFontHost_FreeType_common.cpp ('k') | src/ports/SkFontHost_mac.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontHost_fontconfig.cpp
diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
index 540d805c38931b1fc61bc019085abf1e6646a174..5c9e89661790be334309527212e2478aef5d92c9 100644
--- a/src/ports/SkFontHost_fontconfig.cpp
+++ b/src/ports/SkFontHost_fontconfig.cpp
@@ -88,8 +88,8 @@ SkTypeface* FontConfigTypeface::LegacyCreateTypeface(const char familyName[],
SkTypeface::Style style)
{
SkAutoTUnref<SkFontConfigInterface> fci(RefFCI());
- if (NULL == fci.get()) {
- return NULL;
+ if (nullptr == fci.get()) {
+ return nullptr;
}
// Check if requested NameStyle is in the NameStyle cache.
@@ -107,7 +107,7 @@ SkTypeface* FontConfigTypeface::LegacyCreateTypeface(const char familyName[],
SkString outFamilyName;
SkTypeface::Style outStyle;
if (!fci->matchFamilyName(familyName, style, &indentity, &outFamilyName, &outStyle)) {
- return NULL;
+ return nullptr;
}
// Check if a typeface with this FontIdentity is already in the FontIdentity cache.
@@ -136,8 +136,8 @@ SkStreamAsset* FontConfigTypeface::onOpenStream(int* ttcIndex) const {
}
SkAutoTUnref<SkFontConfigInterface> fci(RefFCI());
- if (NULL == fci.get()) {
- return NULL;
+ if (nullptr == fci.get()) {
+ return nullptr;
}
*ttcIndex = this->getIdentity().fTTCIndex;
« no previous file with comments | « src/ports/SkFontHost_FreeType_common.cpp ('k') | src/ports/SkFontHost_mac.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698