diff options
| author | tsepez <tsepez@chromium.org> | 2016-06-03 14:04:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-03 14:04:19 -0700 |
| commit | b71dc76df4a1eb04f89a64cd542a1d585df3251e (patch) | |
| tree | 12c37f62e8bcf2c8803c111ec692d4c08329fa41 /xfa/fxfa/include/xfa_fontmgr.h | |
| parent | b5032dd963b6a25145c285b36a12c98593744d2f (diff) | |
| download | pdfium-b71dc76df4a1eb04f89a64cd542a1d585df3251e.tar.xz | |
Rename IFX_Font to IFGAS_Font
Avoid confusion with CFX_Font, which is defined in fxcrt,
and does not inherit from nor bear any resemblence to IFX_Font.
Review-Url: https://codereview.chromium.org/2036173003
Diffstat (limited to 'xfa/fxfa/include/xfa_fontmgr.h')
| -rw-r--r-- | xfa/fxfa/include/xfa_fontmgr.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/xfa/fxfa/include/xfa_fontmgr.h b/xfa/fxfa/include/xfa_fontmgr.h index ab59df94c6..90418441de 100644 --- a/xfa/fxfa/include/xfa_fontmgr.h +++ b/xfa/fxfa/include/xfa_fontmgr.h @@ -30,17 +30,17 @@ class CXFA_DefFontMgr { CXFA_DefFontMgr() {} ~CXFA_DefFontMgr(); - IFX_Font* GetFont(CXFA_FFDoc* hDoc, - const CFX_WideStringC& wsFontFamily, - uint32_t dwFontStyles, - uint16_t wCodePage = 0xFFFF); - IFX_Font* GetDefaultFont(CXFA_FFDoc* hDoc, - const CFX_WideStringC& wsFontFamily, - uint32_t dwFontStyles, - uint16_t wCodePage = 0xFFFF); + IFGAS_Font* GetFont(CXFA_FFDoc* hDoc, + const CFX_WideStringC& wsFontFamily, + uint32_t dwFontStyles, + uint16_t wCodePage = 0xFFFF); + IFGAS_Font* GetDefaultFont(CXFA_FFDoc* hDoc, + const CFX_WideStringC& wsFontFamily, + uint32_t dwFontStyles, + uint16_t wCodePage = 0xFFFF); protected: - CFX_ArrayTemplate<IFX_Font*> m_CacheFonts; + CFX_ArrayTemplate<IFGAS_Font*> m_CacheFonts; }; class CXFA_PDFFontMgr { @@ -48,22 +48,22 @@ class CXFA_PDFFontMgr { explicit CXFA_PDFFontMgr(CXFA_FFDoc* pDoc); ~CXFA_PDFFontMgr(); - IFX_Font* GetFont(const CFX_WideStringC& wsFontFamily, - uint32_t dwFontStyles, - CPDF_Font** pPDFFont, - FX_BOOL bStrictMatch = TRUE); - FX_BOOL GetCharWidth(IFX_Font* pFont, + IFGAS_Font* GetFont(const CFX_WideStringC& wsFontFamily, + uint32_t dwFontStyles, + CPDF_Font** pPDFFont, + FX_BOOL bStrictMatch = TRUE); + FX_BOOL GetCharWidth(IFGAS_Font* pFont, FX_WCHAR wUnicode, int32_t& iWidth, FX_BOOL bCharCode); - std::map<IFX_Font*, CPDF_Font*> m_FDE2PDFFont; + std::map<IFGAS_Font*, CPDF_Font*> m_FDE2PDFFont; protected: - IFX_Font* FindFont(CFX_ByteString strFamilyName, - FX_BOOL bBold, - FX_BOOL bItalic, - CPDF_Font** pPDFFont, - FX_BOOL bStrictMatch = TRUE); + IFGAS_Font* FindFont(CFX_ByteString strFamilyName, + FX_BOOL bBold, + FX_BOOL bItalic, + CPDF_Font** pPDFFont, + FX_BOOL bStrictMatch = TRUE); CFX_ByteString PsNameToFontName(const CFX_ByteString& strPsName, FX_BOOL bBold, FX_BOOL bItalic); @@ -74,7 +74,7 @@ class CXFA_PDFFontMgr { FX_BOOL bStrictMatch = TRUE); CXFA_FFDoc* m_pDoc; - std::map<CFX_ByteString, IFX_Font*> m_FontMap; + std::map<CFX_ByteString, IFGAS_Font*> m_FontMap; }; class CXFA_FontMgr { @@ -82,10 +82,10 @@ class CXFA_FontMgr { CXFA_FontMgr(); ~CXFA_FontMgr(); - IFX_Font* GetFont(CXFA_FFDoc* hDoc, - const CFX_WideStringC& wsFontFamily, - uint32_t dwFontStyles, - uint16_t wCodePage = 0xFFFF); + IFGAS_Font* GetFont(CXFA_FFDoc* hDoc, + const CFX_WideStringC& wsFontFamily, + uint32_t dwFontStyles, + uint16_t wCodePage = 0xFFFF); void LoadDocFonts(CXFA_FFDoc* hDoc); void ReleaseDocFonts(CXFA_FFDoc* hDoc); void SetDefFontMgr(std::unique_ptr<CXFA_DefFontMgr> pFontMgr); @@ -93,7 +93,7 @@ class CXFA_FontMgr { protected: std::unique_ptr<CXFA_DefFontMgr> m_pDefFontMgr; std::map<CXFA_FFDoc*, std::unique_ptr<CXFA_PDFFontMgr>> m_PDFFontMgrMap; - std::map<CFX_ByteString, IFX_Font*> m_FontMap; + std::map<CFX_ByteString, IFGAS_Font*> m_FontMap; }; #endif // XFA_FXFA_INCLUDE_XFA_FONTMGR_H_ |