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

Side by Side Diff: include/ports/SkTypeface_android.h

Issue 1190993002: Move Android SkFontMgr::Factory to its own file. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 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
« no previous file with comments | « include/ports/SkFontMgr_android.h ('k') | src/ports/SkFontMgr_android.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 // THIS FILE IS DEPRECATED. USE SkFontMgr_android.h instead.
9
8 10
9 #ifndef SkTypeface_android_DEFINED 11 #ifndef SkTypeface_android_DEFINED
10 #define SkTypeface_android_DEFINED 12 #define SkTypeface_android_DEFINED
11 13
12 #include "SkTypeface.h" 14 #include "SkTypeface.h"
13 15
14 #ifdef SK_BUILD_FOR_ANDROID 16 #ifdef SK_BUILD_FOR_ANDROID
15 17
16 /** 18 /**
17 * For test only. 19 * For test only.
18 * Load font config from given xml files, instead of those from Android system. 20 * Load font config from given xml files, instead of those from Android system.
19 */ 21 */
20 SK_API void SkUseTestFontConfigFile(const char* mainconf, const char* fallbackco nf, 22 SK_API void SkUseTestFontConfigFile(const char* mainconf, const char* fallbackco nf,
21 const char* fontsdir); 23 const char* fontsdir);
22 24
23 #endif // #ifdef SK_BUILD_FOR_ANDROID 25 #endif // #ifdef SK_BUILD_FOR_ANDROID
24 #endif // #ifndef SkTypeface_android_DEFINED 26 #endif // #ifndef SkTypeface_android_DEFINED
OLDNEW
« no previous file with comments | « include/ports/SkFontMgr_android.h ('k') | src/ports/SkFontMgr_android.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698