diff options
| author | npm <npm@chromium.org> | 2016-11-18 13:03:58 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-18 13:03:58 -0800 |
| commit | 78cb28a38481a46ceab861f4159e618509868f94 (patch) | |
| tree | 7726b1ca801aa75ca6e23c2e009fded1b7adc7d3 /xfa/fgas/font/cfgas_fontmgr.h | |
| parent | 8629ef80661f1fc5e77878ebfc542766df50f5d3 (diff) | |
| download | pdfium-78cb28a38481a46ceab861f4159e618509868f94.tar.xz | |
Clean up CFGAS_FontMgrchromium/2925
Review-Url: https://codereview.chromium.org/2512213002
Diffstat (limited to 'xfa/fgas/font/cfgas_fontmgr.h')
| -rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.h | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h index 572be382a8..f571365b88 100644 --- a/xfa/fgas/font/cfgas_fontmgr.h +++ b/xfa/fgas/font/cfgas_fontmgr.h @@ -93,31 +93,21 @@ class CFGAS_FontMgr { static std::unique_ptr<CFGAS_FontMgr> Create(FX_LPEnumAllFonts pEnumerator); - CFGAS_GEFont* GetDefFontByCodePage(uint16_t wCodePage, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily = nullptr); - CFGAS_GEFont* GetDefFontByUnicode(FX_WCHAR wUnicode, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily = nullptr); + CFGAS_GEFont* GetFontByCodePage(uint16_t wCodePage, + uint32_t dwFontStyles, + const FX_WCHAR* pszFontFamily); + CFGAS_GEFont* GetFontByUnicode(FX_WCHAR wUnicode, + uint32_t dwFontStyles, + const FX_WCHAR* pszFontFamily); CFGAS_GEFont* LoadFont(const FX_WCHAR* pszFontFamily, uint32_t dwFontStyles, - uint16_t wCodePage = 0xFFFF); - CFGAS_GEFont* LoadFont(const uint8_t* pBuffer, int32_t iLength); - CFGAS_GEFont* LoadFont(IFX_Stream* pFontStream, - const FX_WCHAR* pszFontAlias = nullptr, - uint32_t dwFontStyles = 0, - uint16_t wCodePage = 0, - bool bSaveStream = false); - CFGAS_GEFont* LoadFont(CFGAS_GEFont* pSrcFont, - uint32_t dwFontStyles, - uint16_t wCodePage = 0xFFFF); - - // TODO(npm): This method is not being used, but probably should be in - // destructor - void ClearFontCache(); + uint16_t wCodePage); void RemoveFont(CFGAS_GEFont* pFont); private: + CFGAS_GEFont* LoadFont(CFGAS_GEFont* pSrcFont, + uint32_t dwFontStyles, + uint16_t wCodePage); void RemoveFont(CFX_MapPtrToPtr& fontMap, CFGAS_GEFont* pFont); FX_FONTDESCRIPTOR const* FindFont(const FX_WCHAR* pszFontFamily, uint32_t dwFontStyles, @@ -210,22 +200,18 @@ class CFGAS_FontMgr { CFGAS_GEFont* GetFontByUnicode(FX_WCHAR wUnicode, uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily); - void ClearFontCache(); void RemoveFont(CFGAS_GEFont* pFont); - CFGAS_GEFont* LoadFont(const CFX_WideString& wsFaceName, - int32_t iFaceIndex, - int32_t* pFaceCount); inline CFGAS_GEFont* LoadFont(const FX_WCHAR* pszFontFamily, uint32_t dwFontStyles, uint16_t wCodePage) { return GetFontByCodePage(wCodePage, dwFontStyles, pszFontFamily); } + + private: bool EnumFonts(); bool EnumFontsFromFontMapper(); bool EnumFontsFromFiles(); - - private: void RegisterFace(FXFT_Face pFace, const CFX_WideString* pFaceName); void RegisterFaces(IFX_SeekableReadStream* pFontStream, const CFX_WideString* pFaceName); @@ -246,6 +232,9 @@ class CFGAS_FontMgr { uint32_t dwFontStyles, const CFX_WideString& FontName, FX_WCHAR wcUnicode = 0xFFFE); + CFGAS_GEFont* LoadFont(const CFX_WideString& wsFaceName, + int32_t iFaceIndex, + int32_t* pFaceCount); FXFT_Face LoadFace(IFX_SeekableReadStream* pFontStream, int32_t iFaceIndex); IFX_SeekableReadStream* CreateFontStream(CFX_FontMapper* pFontMapper, IFX_SystemFontInfo* pSystemFontInfo, |