From 5dbbc6bf047daceb952ae774346a2e74f002ec46 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 4 Nov 2015 09:46:42 -0800 Subject: Merge to XFA: Make built-in font table slightly saner. Original Review URL: https://codereview.chromium.org/1409243012 . (cherry picked from commit 0142f017d03df17fac98b586487cae23b6be05a6) R=thestig@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1429183002 . --- core/include/fxge/fx_font.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'core/include/fxge/fx_font.h') diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index d49c553521..ccd9bf308a 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -218,10 +218,7 @@ class CFX_SubstFont { #define FX_FONT_FLAG_SYMBOLIC_SYMBOL 0x10 #define FX_FONT_FLAG_SYMBOLIC_DINGBATS 0x20 #define FX_FONT_FLAG_MULTIPLEMASTER 0x40 -typedef struct { - const uint8_t* m_pFontData; - FX_DWORD m_dwSize; -} FoxitFonts; + class CFX_FontMgr { public: CFX_FontMgr(); @@ -259,7 +256,7 @@ class CFX_FontMgr { int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont); - FX_BOOL GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index); + bool GetBuiltinFont(size_t index, const uint8_t** pFontData, FX_DWORD* size); CFX_FontMapper* GetBuiltinMapper() const { return m_pBuiltinMapper.get(); } FXFT_Library GetFTLibrary() const { return m_FTLibrary; } -- cgit v1.2.3