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

Side by Side Diff: Source/core/platform/graphics/chromium/FontCacheAndroid.cpp

Issue 48113009: Move Font related classes to Source/platform/fonts (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix mac export Created 7 years, 1 month 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 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/platform/graphics/FontCache.h" 32 #include "core/platform/graphics/FontCache.h"
33 33
34 #include "core/platform/graphics/Font.h" 34 #include "core/platform/graphics/Font.h"
35 #include "core/platform/graphics/FontDescription.h"
36 #include "core/platform/graphics/SimpleFontData.h" 35 #include "core/platform/graphics/SimpleFontData.h"
36 #include "platform/fonts/FontDescription.h"
37 37
38 #include "SkTypeface_android.h" 38 #include "SkTypeface_android.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 static AtomicString getFamilyNameForCharacter(UChar32 c, UScriptCode script) 42 static AtomicString getFamilyNameForCharacter(UChar32 c, UScriptCode script)
43 { 43 {
44 // This is a hack to use the preferred font for CJK scripts. 44 // This is a hack to use the preferred font for CJK scripts.
45 // FIXME: Use new Skia API once Android system supports per-family and per-s cript fallback fonts. 45 // FIXME: Use new Skia API once Android system supports per-family and per-s cript fallback fonts.
46 const char* locale; 46 const char* locale;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/core/platform/graphics/TypesettingFeatures.h ('k') | Source/core/platform/graphics/chromium/FontFallbackWin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698