diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-09 10:41:56 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-09 10:41:56 -0800 |
| commit | 94a4956f7aadc10fe6dd8451e965bd7447985b76 (patch) | |
| tree | 719db4d5bd47c6dc5ba114dd809b798f2b249e72 /core/include/fxge | |
| parent | c0e93a9a942fe7d99800502a61d2fbb58cf9276f (diff) | |
| download | pdfium-94a4956f7aadc10fe6dd8451e965bd7447985b76.tar.xz | |
Cleanup some fxge font code.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1426403008 .
Diffstat (limited to 'core/include/fxge')
| -rw-r--r-- | core/include/fxge/fx_font.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 3e4ca95299..bc76c6e2e2 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -139,6 +139,7 @@ class CFX_UnicodeEncoding { #define FXFONT_SUBST_NONSYMBOL 0x20 #define FXFONT_SUBST_EXACT 0x40 #define FXFONT_SUBST_STANDARD 0x80 + class CFX_SubstFont { public: CFX_SubstFont(); @@ -385,6 +386,7 @@ class CFX_GlyphBitmap { }; class CFX_FaceCache { public: + explicit CFX_FaceCache(FXFT_Face face); ~CFX_FaceCache(); const CFX_GlyphBitmap* LoadGlyphBitmap(CFX_Font* pFont, FX_DWORD glyph_index, @@ -397,10 +399,7 @@ class CFX_FaceCache { FX_DWORD glyph_index, int dest_width); - CFX_FaceCache(FXFT_Face face); - private: - FXFT_Face m_Face; CFX_GlyphBitmap* RenderGlyph(CFX_Font* pFont, FX_DWORD glyph_index, FX_BOOL bFontStyle, @@ -419,18 +418,23 @@ class CFX_FaceCache { FX_BOOL bFontStyle, int dest_width, int anti_alias); + void InitPlatform(); + void DestroyPlatform(); + + FXFT_Face const m_Face; std::map<CFX_ByteString, CFX_SizeGlyphCache*> m_SizeMap; CFX_MapPtrToPtr m_PathMap; CFX_DIBitmap* m_pBitmap; - - void InitPlatform(); - void DestroyPlatform(); }; -typedef struct { + +struct FXTEXT_GLYPHPOS { const CFX_GlyphBitmap* m_pGlyph; - int m_OriginX, m_OriginY; - FX_FLOAT m_fOriginX, m_fOriginY; -} FXTEXT_GLYPHPOS; + int m_OriginX; + int m_OriginY; + FX_FLOAT m_fOriginX; + FX_FLOAT m_fOriginY; +}; + FX_RECT FXGE_GetGlyphsBBox(FXTEXT_GLYPHPOS* pGlyphAndPos, int nChars, int anti_alias, |