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

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

Issue 326763002: Adding WebFallbackFont and renaming SimpleFontFamily (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixing mac build Created 6 years, 6 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
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 break; 62 break;
63 } 63 }
64 64
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 emptyAtom; 67 return emptyAtom;
68 68
69 return skiaFamilyName.c_str(); 69 return skiaFamilyName.c_str();
70 } 70 }
71 71
72 PassRefPtr<SimpleFontData> FontCache::platformFallbackForCharacter(const FontDes cription& fontDescription, UChar32 c, const SimpleFontData*) 72 PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(const FontDescrip tion& fontDescription, UChar32 c, const SimpleFontData*)
73 { 73 {
74 AtomicString familyName = getFamilyNameForCharacter(c, fontDescription.scrip t()); 74 AtomicString familyName = getFamilyNameForCharacter(c, fontDescription.scrip t());
75 if (familyName.isEmpty()) 75 if (familyName.isEmpty())
76 return getLastResortFallbackFont(fontDescription, DoNotRetain); 76 return getLastResortFallbackFont(fontDescription, DoNotRetain);
77 return fontDataFromFontPlatformData(getFontPlatformData(fontDescription, fam ilyName), DoNotRetain); 77 return fontDataFromFontPlatformData(getFontPlatformData(fontDescription, fam ilyName), DoNotRetain);
78 } 78 }
79 79
80 // static 80 // static
81 AtomicString FontCache::getGenericFamilyNameForScript(const AtomicString& family Name, UScriptCode script) 81 AtomicString FontCache::getGenericFamilyNameForScript(const AtomicString& family Name, UScriptCode script)
82 { 82 {
(...skipping 11 matching lines...) Expand all
94 break; 94 break;
95 default: 95 default:
96 // For other scripts, use the default generic family mapping logic. 96 // For other scripts, use the default generic family mapping logic.
97 return familyName; 97 return familyName;
98 } 98 }
99 99
100 return getFamilyNameForCharacter(examplerChar, script); 100 return getFamilyNameForCharacter(examplerChar, script);
101 } 101 }
102 102
103 } // namespace WebCore 103 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontCache.h ('k') | Source/platform/fonts/android/FontCacheAndroidTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698