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

Unified Diff: Source/platform/fonts/mac/FontCacheMac.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
« no previous file with comments | « Source/platform/fonts/harfbuzz/HarfBuzzFace.cpp ('k') | Source/platform/fonts/mac/MemoryActivatedFont.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/mac/FontCacheMac.mm
diff --git a/Source/platform/fonts/mac/FontCacheMac.mm b/Source/platform/fonts/mac/FontCacheMac.mm
index c544b8cd2084205053b901beac8f1830db9b5b9c..a67362d191afed63991727a8e9ab9fff70f0299b 100644
--- a/Source/platform/fonts/mac/FontCacheMac.mm
+++ b/Source/platform/fonts/mac/FontCacheMac.mm
@@ -116,11 +116,11 @@ PassRefPtr<SimpleFontData> FontCache::platformFallbackForCharacter(const FontDes
if (!substituteFont && codeUnitsLength == 1)
substituteFont = [NSFont findFontLike:nsFont forCharacter:codeUnits[0] inLanguage:nil];
if (!substituteFont)
- return 0;
+ return nullptr;
// Chromium can't render AppleColorEmoji.
if ([[substituteFont familyName] isEqual:@"Apple Color Emoji"])
- return 0;
+ return nullptr;
// Use the family name from the AppKit-supplied substitute font, requesting the
// traits, weight, and size we want. One way this does better than the original
« no previous file with comments | « Source/platform/fonts/harfbuzz/HarfBuzzFace.cpp ('k') | Source/platform/fonts/mac/MemoryActivatedFont.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698