Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2011 The Android Open Source Project | 2 * Copyright 2011 The Android Open Source Project |
| 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 #ifndef SKFONTCONFIGPARSER_ANDROID_H_ | 8 #ifndef SKFONTCONFIGPARSER_ANDROID_H_ |
| 9 #define SKFONTCONFIGPARSER_ANDROID_H_ | 9 #define SKFONTCONFIGPARSER_ANDROID_H_ |
| 10 | 10 |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 38 bool fIsFallbackFont; | 38 bool fIsFallbackFont; |
| 39 int order; // only used internally by SkFontConfigParser | 39 int order; // only used internally by SkFontConfigParser |
| 40 }; | 40 }; |
| 41 | 41 |
| 42 namespace SkFontConfigParser { | 42 namespace SkFontConfigParser { |
| 43 | 43 |
| 44 /** | 44 /** |
| 45 * Parses all system font configuration files and returns the results in an | 45 * Parses all system font configuration files and returns the results in an |
| 46 * array of FontFamily structures. | 46 * array of FontFamily structures. |
| 47 */ | 47 */ |
| 48 void GetFontFamilies(SkTDArray<FontFamily*> &fontFamilies); | 48 void GetFontFamilies(SkTDArray<FontFamily*> &fontFamilies, uint32_t ignoredFallb ackVariants = 0); |
|
djsollen
2014/07/31 14:51:37
add a comment to the method documenting what this
bungeman-skia
2014/07/31 22:15:53
Removed.
| |
| 49 | 49 |
| 50 /** | 50 /** |
| 51 * Parses all test font configuration files and returns the results in an | 51 * Parses all test font configuration files and returns the results in an |
| 52 * array of FontFamily structures. | 52 * array of FontFamily structures. |
| 53 */ | 53 */ |
| 54 void GetTestFontFamilies(SkTDArray<FontFamily*> &fontFamilies, | 54 void GetTestFontFamilies(SkTDArray<FontFamily*> &fontFamilies, |
| 55 const char* testMainConfigFile, | 55 const char* testMainConfigFile, |
| 56 const char* testFallbackConfigFile); | 56 const char* testFallbackConfigFile); |
| 57 | 57 |
| 58 SkString GetLocale(); | 58 SkString GetLocale(); |
| 59 | 59 |
| 60 } // SkFontConfigParser namespace | 60 } // SkFontConfigParser namespace |
| 61 | 61 |
| 62 #endif /* SKFONTCONFIGPARSER_ANDROID_H_ */ | 62 #endif /* SKFONTCONFIGPARSER_ANDROID_H_ */ |
| OLD | NEW |