include/ports/SkFontMgr_indirect.h - Issue 673443003: Update fontMgr to take list of bcp47 language tags.

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

Issue 673443003: Update fontMgr to take list of bcp47 language tags. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: nits and loop fix 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

OLD	NEW
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 23 matching lines...) Expand all Loading...
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 virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],	42 virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],

43 const SkFontStyle&,	43 const SkFontStyle&,

44 const char bpc47[],	44 const char* bcp47[],

45 uint32_t character) const SK _OVERRIDE;	45 int bcpLength,

	46 SkUnichar character) const S K_OVERRIDE;

46	47

47 virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,	48 virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,

48 const SkFontStyle& fontStyle) const SK_ OVERRIDE;	49 const SkFontStyle& fontStyle) const SK_ OVERRIDE;

49	50

50 virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE;	51 virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE;

51 virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE;	52 virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE;

52 virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OV ERRIDE;	53 virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OV ERRIDE;

53	54

54 virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],	55 virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],

55 unsigned styleBits) const SK_OVER RIDE;	56 unsigned styleBits) const SK_OVER RIDE;

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
95	96

96 mutable SkAutoTUnref<SkDataTable> fFamilyNames;	97 mutable SkAutoTUnref<SkDataTable> fFamilyNames;

97 mutable bool fFamilyNamesInited;	98 mutable bool fFamilyNamesInited;

98 mutable SkMutex fFamilyNamesMutex;	99 mutable SkMutex fFamilyNamesMutex;

99 static void set_up_family_names(const SkFontMgr_Indirect* self);	100 static void set_up_family_names(const SkFontMgr_Indirect* self);

100	101

101 friend class SkStyleSet_Indirect;	102 friend class SkStyleSet_Indirect;

102 };	103 };

103	104

104 #endif	105 #endif

OLD	NEW

« no previous file with comments | « include/ports/SkFontMgr.h ('k') | include/ports/SkRemotableFontMgr.h » ('j') | no next file with comments »