summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-11-03 15:34:24 -0800
committerTom Sepez <tsepez@chromium.org>2015-11-03 15:34:24 -0800
commit0142f017d03df17fac98b586487cae23b6be05a6 (patch)
treea792c5c8896d57932c7d7b350b24de93b06168a0 /core/include
parentcbd6bba62777131e39e3c4fd2d0028b472fb94c9 (diff)
downloadpdfium-0142f017d03df17fac98b586487cae23b6be05a6.tar.xz
Make built-in font table slightly saner.
Use the word builtin instead of standard. Remove non-const refs. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1409243012 .
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fxge/fx_font.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 50e9f331b7..8c2416e6e0 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -168,10 +168,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();
@@ -207,7 +204,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; }