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

Side by Side Diff: Source/platform/fonts/android/FontCacheAndroid.cpp

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 Google Inc. All rights reserved. 2 * Copyright (c) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 SkString skiaFamilyName; 65 SkString skiaFamilyName;
66 if (!SkGetFallbackFamilyNameForChar(c, locale, &skiaFamilyName) || skiaFamil yName.isEmpty()) 66 if (!SkGetFallbackFamilyNameForChar(c, locale, &skiaFamilyName) || skiaFamil yName.isEmpty())
67 return AtomicString(); 67 return AtomicString();
68 return skiaFamilyName.c_str(); 68 return skiaFamilyName.c_str();
69 } 69 }
70 70
71 PassRefPtr<SimpleFontData> FontCache::platformFallbackForCharacter(const FontDes cription& fontDescription, UChar32 c, const SimpleFontData*) 71 PassRefPtr<SimpleFontData> FontCache::platformFallbackForCharacter(const FontDes cription& fontDescription, UChar32 c, const SimpleFontData*)
72 { 72 {
73 AtomicString familyName = getFamilyNameForCharacter(c, fontDescription.scrip t()); 73 AtomicString familyName = getFamilyNameForCharacter(c, fontDescription.scrip t());
74 if (familyName.isEmpty()) 74 if (familyName.isEmpty())
75 return 0; 75 return nullptr;
76 return fontDataFromFontPlatformData(getFontPlatformData(fontDescription, fam ilyName), DoNotRetain); 76 return fontDataFromFontPlatformData(getFontPlatformData(fontDescription, fam ilyName), DoNotRetain);
77 } 77 }
78 78
79 // static 79 // static
80 AtomicString FontCache::getGenericFamilyNameForScript(const AtomicString& family Name, UScriptCode script) 80 AtomicString FontCache::getGenericFamilyNameForScript(const AtomicString& family Name, UScriptCode script)
81 { 81 {
82 // This is a hack to use the preferred font for CJK scripts. 82 // This is a hack to use the preferred font for CJK scripts.
83 // FIXME: Use new Skia API once Android system supports per-family and per-s cript fallback fonts. 83 // FIXME: Use new Skia API once Android system supports per-family and per-s cript fallback fonts.
84 UChar32 examplerChar; 84 UChar32 examplerChar;
85 switch (script) { 85 switch (script) {
86 case USCRIPT_SIMPLIFIED_HAN: 86 case USCRIPT_SIMPLIFIED_HAN:
87 case USCRIPT_TRADITIONAL_HAN: 87 case USCRIPT_TRADITIONAL_HAN:
88 case USCRIPT_KATAKANA_OR_HIRAGANA: 88 case USCRIPT_KATAKANA_OR_HIRAGANA:
89 examplerChar = 0x4E00; // A common character in Japanese and Chinese. 89 examplerChar = 0x4E00; // A common character in Japanese and Chinese.
90 break; 90 break;
91 case USCRIPT_HANGUL: 91 case USCRIPT_HANGUL:
92 examplerChar = 0xAC00; 92 examplerChar = 0xAC00;
93 break; 93 break;
94 default: 94 default:
95 // For other scripts, use the default generic family mapping logic. 95 // For other scripts, use the default generic family mapping logic.
96 return familyName; 96 return familyName;
97 } 97 }
98 98
99 return getFamilyNameForCharacter(examplerChar, script); 99 return getFamilyNameForCharacter(examplerChar, script);
100 } 100 }
101 101
102 } // namespace WebCore 102 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/platform/fonts/SimpleFontData.cpp ('k') | Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698