| 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 |
| 11 #include "SkFontMgr.h" |
| 12 |
| 13 #include <stddef.h> |
| 14 |
| 11 #include "SkDataTable.h" | 15 #include "SkDataTable.h" |
| 12 #include "SkFontMgr.h" | 16 #include "SkMutex.h" |
| 13 #include "SkFontStyle.h" | 17 #include "SkRefCnt.h" |
| 14 #include "SkRemotableFontMgr.h" | 18 #include "SkRemotableFontMgr.h" |
| 15 #include "SkTArray.h" | 19 #include "SkTArray.h" |
| 16 #include "SkTypeface.h" | 20 #include "SkTypeface.h" |
| 21 #include "SkTypes.h" |
| 17 | 22 |
| 18 class SkData; | 23 class SkData; |
| 19 class SkStream; | 24 class SkFontStyle; |
| 25 class SkStreamAsset; |
| 20 class SkString; | 26 class SkString; |
| 21 class SkTypeface; | |
| 22 | 27 |
| 23 class SK_API SkFontMgr_Indirect : public SkFontMgr { | 28 class SK_API SkFontMgr_Indirect : public SkFontMgr { |
| 24 public: | 29 public: |
| 25 // TODO: The SkFontMgr is only used for createFromStream/File/Data. | 30 // TODO: The SkFontMgr is only used for createFromStream/File/Data. |
| 26 // In the future these calls should be broken out into their own interface | 31 // In the future these calls should be broken out into their own interface |
| 27 // with a name like SkFontRenderer. | 32 // with a name like SkFontRenderer. |
| 28 SkFontMgr_Indirect(SkFontMgr* impl, SkRemotableFontMgr* proxy) | 33 SkFontMgr_Indirect(SkFontMgr* impl, SkRemotableFontMgr* proxy) |
| 29 : fImpl(SkRef(impl)), fProxy(SkRef(proxy)), fFamilyNamesInited(false) | 34 : fImpl(SkRef(impl)), fProxy(SkRef(proxy)), fFamilyNamesInited(false) |
| 30 { } | 35 { } |
| 31 | 36 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 | 101 |
| 97 mutable SkAutoTUnref<SkDataTable> fFamilyNames; | 102 mutable SkAutoTUnref<SkDataTable> fFamilyNames; |
| 98 mutable bool fFamilyNamesInited; | 103 mutable bool fFamilyNamesInited; |
| 99 mutable SkMutex fFamilyNamesMutex; | 104 mutable SkMutex fFamilyNamesMutex; |
| 100 static void set_up_family_names(const SkFontMgr_Indirect* self); | 105 static void set_up_family_names(const SkFontMgr_Indirect* self); |
| 101 | 106 |
| 102 friend class SkStyleSet_Indirect; | 107 friend class SkStyleSet_Indirect; |
| 103 }; | 108 }; |
| 104 | 109 |
| 105 #endif | 110 #endif |
| OLD | NEW |