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

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

Issue 670243002: Update fontMgr to take list of bcp47 language tags. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 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.h ('k') | include/ports/SkRemotableFontMgr.h » ('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 2014 Google Inc. 2 * Copyright 2014 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 #ifndef SkFontMgr_indirect_DEFINED 8 #ifndef SkFontMgr_indirect_DEFINED
9 #define SkFontMgr_indirect_DEFINED 9 #define SkFontMgr_indirect_DEFINED
10 10
(...skipping 21 matching lines...) Expand all
32 protected: 32 protected:
33 virtual int onCountFamilies() const SK_OVERRIDE; 33 virtual int onCountFamilies() const SK_OVERRIDE;
34 virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERR IDE; 34 virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERR IDE;
35 virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE; 35 virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE;
36 36
37 virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVER RIDE; 37 virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVER RIDE;
38 38
39 virtual SkTypeface* onMatchFamilyStyle(const char familyName[], 39 virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
40 const SkFontStyle& fontStyle) const S K_OVERRIDE; 40 const SkFontStyle& fontStyle) const S K_OVERRIDE;
41 41
42 #ifdef SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER
42 virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], 43 virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
43 const SkFontStyle&, 44 const SkFontStyle&,
44 const char bpc47[], 45 const char* bcp47[],
45 uint32_t character) const SK _OVERRIDE; 46 int bcp47Count,
47 SkUnichar character) const S K_OVERRIDE;
48 #else
49 virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
50 const SkFontStyle&,
51 const char bcp47[],
52 SkUnichar character) const S K_OVERRIDE;
53 #endif
46 54
47 virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, 55 virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
48 const SkFontStyle& fontStyle) const SK_ OVERRIDE; 56 const SkFontStyle& fontStyle) const SK_ OVERRIDE;
49 57
50 virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE; 58 virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE;
51 virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE; 59 virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE;
52 virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OV ERRIDE; 60 virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OV ERRIDE;
53 61
54 virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], 62 virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
55 unsigned styleBits) const SK_OVER RIDE; 63 unsigned styleBits) const SK_OVER RIDE;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 103
96 mutable SkAutoTUnref<SkDataTable> fFamilyNames; 104 mutable SkAutoTUnref<SkDataTable> fFamilyNames;
97 mutable bool fFamilyNamesInited; 105 mutable bool fFamilyNamesInited;
98 mutable SkMutex fFamilyNamesMutex; 106 mutable SkMutex fFamilyNamesMutex;
99 static void set_up_family_names(const SkFontMgr_Indirect* self); 107 static void set_up_family_names(const SkFontMgr_Indirect* self);
100 108
101 friend class SkStyleSet_Indirect; 109 friend class SkStyleSet_Indirect;
102 }; 110 };
103 111
104 #endif 112 #endif
OLDNEW
« no previous file with comments | « include/ports/SkFontMgr.h ('k') | include/ports/SkRemotableFontMgr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698