diff options
| author | thestig <thestig@chromium.org> | 2016-09-26 14:16:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-26 14:16:43 -0700 |
| commit | 2c065322f1b14ca3ff145dc068ab2361704f9e4b (patch) | |
| tree | 92a337f54e0abcc624f28d821ed4533963fd8883 /xfa/fxfa/include | |
| parent | 5aed0216ad6574944e76a95ef0dbbc910bab4a1a (diff) | |
| download | pdfium-2c065322f1b14ca3ff145dc068ab2361704f9e4b.tar.xz | |
Clean up xfa_fontmgr.cpp.
Review-Url: https://codereview.chromium.org/2362063003
Diffstat (limited to 'xfa/fxfa/include')
| -rw-r--r-- | xfa/fxfa/include/xfa_fontmgr.h | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/xfa/fxfa/include/xfa_fontmgr.h b/xfa/fxfa/include/xfa_fontmgr.h index 2d2a74f2ba..6147dbc5c7 100644 --- a/xfa/fxfa/include/xfa_fontmgr.h +++ b/xfa/fxfa/include/xfa_fontmgr.h @@ -51,29 +51,30 @@ class CXFA_PDFFontMgr { CFGAS_GEFont* GetFont(const CFX_WideStringC& wsFontFamily, uint32_t dwFontStyles, CPDF_Font** pPDFFont, - FX_BOOL bStrictMatch = TRUE); - FX_BOOL GetCharWidth(CFGAS_GEFont* pFont, - FX_WCHAR wUnicode, - int32_t& iWidth, - FX_BOOL bCharCode); - std::map<CFGAS_GEFont*, CPDF_Font*> m_FDE2PDFFont; + bool bStrictMatch); + bool GetCharWidth(const CFGAS_GEFont* pFont, + FX_WCHAR wUnicode, + bool bCharCode, + int32_t* pWidth); + void SetFont(const CFGAS_GEFont* pFont, CPDF_Font* pPDFFont); protected: - CFGAS_GEFont* FindFont(CFX_ByteString strFamilyName, - FX_BOOL bBold, - FX_BOOL bItalic, + CFGAS_GEFont* FindFont(const CFX_ByteString& strFamilyName, + bool bBold, + bool bItalic, CPDF_Font** pPDFFont, - FX_BOOL bStrictMatch = TRUE); + bool bStrictMatch); CFX_ByteString PsNameToFontName(const CFX_ByteString& strPsName, - FX_BOOL bBold, - FX_BOOL bItalic); - FX_BOOL PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName, - FX_BOOL bBold, - FX_BOOL bItalic, - const CFX_ByteString& bsDRFontName, - FX_BOOL bStrictMatch = TRUE); - - CXFA_FFDoc* m_pDoc; + bool bBold, + bool bItalic); + bool PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName, + bool bBold, + bool bItalic, + const CFX_ByteString& bsDRFontName, + bool bStrictMatch); + + CXFA_FFDoc* const m_pDoc; + std::map<const CFGAS_GEFont*, CPDF_Font*> m_FDE2PDFFont; std::map<CFX_ByteString, CFGAS_GEFont*> m_FontMap; }; |