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

Unified Diff: Source/platform/fonts/mac/SimpleFontDataMac.mm

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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
Index: Source/platform/fonts/mac/SimpleFontDataMac.mm
diff --git a/Source/platform/fonts/mac/SimpleFontDataMac.mm b/Source/platform/fonts/mac/SimpleFontDataMac.mm
index 769344a88767333f6490a99c420c8ad56b6de93d..fda2fa0bae91f2a281470c3d7fdba97b547d9a34 100644
--- a/Source/platform/fonts/mac/SimpleFontDataMac.mm
+++ b/Source/platform/fonts/mac/SimpleFontDataMac.mm
@@ -127,7 +127,7 @@ const SimpleFontData* SimpleFontData::getCompositeFontReferenceFontData(NSFont *
bool syntheticOblique = platformData().syntheticOblique() && !(traits & kCTFontItalicTrait);
FontPlatformData substitutePlatform(substituteFont, platformData().size(), isUsingPrinterFont, syntheticBold, syntheticOblique, platformData().orientation(), platformData().widthVariant());
- SimpleFontData* value = new SimpleFontData(substitutePlatform, isCustomFont() ? CustomFontData::create(false) : 0);
+ SimpleFontData* value = new SimpleFontData(substitutePlatform, isCustomFont() ? CustomFontData::create(false) : nullptr);
if (value) {
CFDictionaryAddValue(dictionary, key, value);
return value;
@@ -336,7 +336,7 @@ PassRefPtr<SimpleFontData> SimpleFontData::platformCreateScaledFontData(const Fo
}
END_BLOCK_OBJC_EXCEPTIONS;
- return 0;
+ return nullptr;
}
void SimpleFontData::determinePitch()
« no previous file with comments | « Source/platform/fonts/mac/MemoryActivatedFont.mm ('k') | Source/platform/fonts/opentype/OpenTypeSanitizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698