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

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

Issue 99103006: Moving GraphicsContext and dependencies from core to platform. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final patch - fixes Android Created 7 years 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 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
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 "platform/fonts/FontCache.h"
33 33
34 #include "core/platform/graphics/SimpleFontData.h" 34
35 #include "platform/fonts/SimpleFontData.h"
35 #include "platform/fonts/FontDescription.h" 36 #include "platform/fonts/FontDescription.h"
36 37
37 #include "SkTypeface_android.h" 38 #include "SkTypeface_android.h"
38 39
39 namespace WebCore { 40 namespace WebCore {
40 41
41 static AtomicString getFamilyNameForCharacter(UChar32 c, UScriptCode script) 42 static AtomicString getFamilyNameForCharacter(UChar32 c, UScriptCode script)
42 { 43 {
43 // 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.
44 // 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.
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 break; 93 break;
93 default: 94 default:
94 // For other scripts, use the default generic family mapping logic. 95 // For other scripts, use the default generic family mapping logic.
95 return familyName; 96 return familyName;
96 } 97 }
97 98
98 return getFamilyNameForCharacter(examplerChar, script); 99 return getFamilyNameForCharacter(examplerChar, script);
99 } 100 }
100 101
101 } // namespace WebCore 102 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/platform/fonts/WidthIterator.cpp ('k') | Source/platform/fonts/cocoa/FontPlatformDataCocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698