diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-19 09:49:24 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-19 09:49:24 -0700 |
| commit | 09d33bcd82a82cb55039d41651df13e17d6c3e59 (patch) | |
| tree | 7a748b7570ff6ad0321c4334319bac101da0e6af /core/include/fxge | |
| parent | 1b0023986bc22ce362097b25deb9746b693ef235 (diff) | |
| download | pdfium-09d33bcd82a82cb55039d41651df13e17d6c3e59.tar.xz | |
Merge to XFA: CFX_MapByteStringToPtr considered harmful (combo patch).
New manual edits: two unused members deleted, one adapted.
fde_csscache.cpp
fde_csscache.h
fpdfxfa_doc.h
fx_ge_fontmap.cpp
(cherry picked from commit 1d9dbd53b205b2b4d9e75a7eeb95e80837917ea3)
(cherry picked from commit cb4d0ea68308e3c51a6ba9551b393bb2f639afc4)
(cherry picked from commit 9cf44c2ed09a8b2ff243eb6dbb72a8cceae1b5ff)
(cherry picked from commit 2a2a6aa7f51352fc481e78f6ad9d41f2738bcc48)
(cherry picked from commit ce4ffb8183af3fa2bb5133f0f7370a88e064c516)
Original Review URL: https://codereview.chromium.org/1297723002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1301793002 .
Diffstat (limited to 'core/include/fxge')
| -rw-r--r-- | core/include/fxge/fx_font.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 7eaa323717..30de472a7e 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -14,11 +14,16 @@ typedef struct FT_FaceRec_* FXFT_Face; typedef void* FXFT_Library; -class CFontFileFaceInfo; + class CFX_FaceCache; +class CFX_FontFaceInfo; class CFX_FontMapper; class CFX_PathData; +class CFX_SizeGlyphCache; class CFX_SubstFont; +class CFontFileFaceInfo; +class CTTFontDesc; +class IFX_FontEncoding; class IFX_SystemFontInfo; #define FXFONT_FIXED_PITCH 0x01 @@ -263,12 +268,11 @@ class CFX_FontMgr { int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont); - void FreeCache(); - FX_BOOL GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index); + CFX_FontMapper* m_pBuiltinMapper; - CFX_MapByteStringToPtr m_FaceMap; + std::map<CFX_ByteString, CTTFontDesc*> m_FaceMap; FXFT_Library m_FTLibrary; FoxitFonts m_ExternalFonts[16]; }; @@ -406,7 +410,7 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo { FX_BOOL GetFontCharset(void* hFont, int& charset) override; protected: - CFX_MapByteStringToPtr m_FontList; + std::map<CFX_ByteString, CFX_FontFaceInfo*> m_FontList; CFX_ByteStringArray m_PathList; CFX_FontMapper* m_pMapper; void ScanPath(CFX_ByteString& path); @@ -486,7 +490,7 @@ class CFX_FaceCache { FX_BOOL bFontStyle, int dest_width, int anti_alias); - CFX_MapByteStringToPtr m_SizeMap; + std::map<CFX_ByteString, CFX_SizeGlyphCache*> m_SizeMap; CFX_MapPtrToPtr m_PathMap; CFX_DIBitmap* m_pBitmap; |