From 905cc10ecd06bcacfefb747cc3370c72772f0e15 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 6 Aug 2015 11:41:17 -0700 Subject: Add CFX_FontFaceInfo constructor. (Having renamed CFontFaceInfo to follow naming pattern). Also cleanup some initialization-order noise in CFX_FontMapper. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1277883004 . --- core/src/fxge/ge/text_int.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'core/src/fxge/ge/text_int.h') diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h index a05907162c..efa134d5de 100644 --- a/core/src/fxge/ge/text_int.h +++ b/core/src/fxge/ge/text_int.h @@ -64,20 +64,34 @@ class CFX_UnicodeEncoding : public IFX_FontEncoding { #define CHARSET_FLAG_BIG5 8 #define CHARSET_FLAG_GB 16 #define CHARSET_FLAG_KOREAN 32 -class CFontFaceInfo { + +class CFX_FontFaceInfo { public: - CFX_ByteString m_FilePath; - CFX_ByteString m_FaceName; + CFX_FontFaceInfo(CFX_ByteString filePath, CFX_ByteString faceName, + CFX_ByteString fontTables, FX_DWORD fontOffset, + FX_DWORD fileSize) + : m_FilePath(filePath), + m_FaceName(faceName), + m_FontTables(fontTables), + m_FontOffset(fontOffset), + m_FileSize(fileSize), + m_Styles(0), + m_Charsets(0) {} + + const CFX_ByteString m_FilePath; + const CFX_ByteString m_FaceName; + const CFX_ByteString m_FontTables; + const FX_DWORD m_FontOffset; + const FX_DWORD m_FileSize; FX_DWORD m_Styles; FX_DWORD m_Charsets; - FX_DWORD m_FontOffset; - FX_DWORD m_FileSize; - CFX_ByteString m_FontTables; }; + class CFontFileFaceInfo { public: CFontFileFaceInfo(); ~CFontFileFaceInfo(); + IFX_FileStream* m_pFile; FXFT_Face m_Face; CFX_ByteString m_FaceName; -- cgit v1.2.3