summaryrefslogtreecommitdiff
path: root/xfa/fgas/font/fgas_stdfontmgr.h
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-05-19 11:37:20 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-19 11:37:20 -0700
commitf8d8ac4fca2774550f3fbd3a21bbc1e326028c18 (patch)
tree70ab1f2ba023573e5ae076e46ab2621a9411b28b /xfa/fgas/font/fgas_stdfontmgr.h
parentbc8a64029f898286c3dcad3a6cecdc98ef30b139 (diff)
downloadpdfium-f8d8ac4fca2774550f3fbd3a21bbc1e326028c18.tar.xz
Expand some typedefs to the original types
Sevearal typedefs are only used once or twice. Expand and remove the typedef. Review-Url: https://codereview.chromium.org/1995033002
Diffstat (limited to 'xfa/fgas/font/fgas_stdfontmgr.h')
-rw-r--r--xfa/fgas/font/fgas_stdfontmgr.h21
1 files changed, 6 insertions, 15 deletions
diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h
index 268c61f6ea..bbfa875e5e 100644
--- a/xfa/fgas/font/fgas_stdfontmgr.h
+++ b/xfa/fgas/font/fgas_stdfontmgr.h
@@ -142,15 +142,6 @@ class CFX_FontSourceEnum_File {
CFX_ByteStringArray m_FolderPaths;
};
-typedef CFX_MapPtrTemplate<uint32_t, IFX_FileAccess*> CFX_HashFileMap;
-typedef CFX_MapPtrTemplate<uint32_t, IFX_Font*> CFX_HashFontMap;
-typedef CFX_MapPtrTemplate<uint32_t, CFX_FontDescriptorInfos*>
- CFX_HashFontDescsMap;
-typedef CFX_MapPtrTemplate<uint32_t, CFX_ArrayTemplate<IFX_Font*>*>
- CFX_HashFontsMap;
-typedef CFX_MapPtrTemplate<FX_WCHAR, IFX_Font*> CFX_UnicodeFontMap;
-typedef CFX_MapPtrTemplate<IFX_Font*, IFX_FileRead*> CFX_FonStreamtMap;
-
class CFX_FontMgrImp : public IFX_FontMgr {
public:
CFX_FontMgrImp(CFX_FontSourceEnum_File* pFontEnum);
@@ -235,12 +226,12 @@ class CFX_FontMgrImp : public IFX_FontMgr {
uint32_t index);
IFX_FileRead* CreateFontStream(const CFX_ByteString& bsFaceName);
- CFX_HashFontDescsMap m_Hash2CandidateList;
- CFX_HashFontsMap m_Hash2Fonts;
- CFX_HashFileMap m_Hash2FileAccess;
- CFX_HashFontMap m_FileAccess2IFXFont;
- CFX_FonStreamtMap m_IFXFont2FileRead;
- CFX_UnicodeFontMap m_FailedUnicodes2NULL;
+ CFX_MapPtrTemplate<uint32_t, CFX_FontDescriptorInfos*> m_Hash2CandidateList;
+ CFX_MapPtrTemplate<uint32_t, CFX_ArrayTemplate<IFX_Font*>*> m_Hash2Fonts;
+ CFX_MapPtrTemplate<uint32_t, IFX_FileAccess*> m_Hash2FileAccess;
+ CFX_MapPtrTemplate<uint32_t, IFX_Font*> m_FileAccess2IFXFont;
+ CFX_MapPtrTemplate<IFX_Font*, IFX_FileRead*> m_IFXFont2FileRead;
+ CFX_MapPtrTemplate<FX_WCHAR, IFX_Font*> m_FailedUnicodes2NULL;
CFX_FontSourceEnum_File* m_pFontSource;
};
#endif