Index: xfa/fgas/font/fgas_gefont.h |
diff --git a/xfa/fgas/font/fgas_gefont.h b/xfa/fgas/font/fgas_gefont.h |
index cdb19338a27ededc2fd572f8975d5020cbe2fdeb..3418eb8ee640846de9ba305f372414c244283300 100644 |
--- a/xfa/fgas/font/fgas_gefont.h |
+++ b/xfa/fgas/font/fgas_gefont.h |
@@ -24,7 +24,9 @@ class CFGAS_GEFont { |
uint32_t dwFontStyles, |
uint16_t wCodePage, |
IFGAS_FontMgr* pFontMgr); |
- static CFGAS_GEFont* LoadFont(CFX_Font* pExtFont, IFGAS_FontMgr* pFontMgr); |
+ static CFGAS_GEFont* LoadFont(CFX_Font* pSrcFont, |
+ bool bExternalFont, |
Lei Zhang
2016/09/01 22:55:42
Can we add a separate LoadInternalFont(CFX_Font* p
Wei Li
2016/09/01 23:43:30
Done.
|
+ IFGAS_FontMgr* pFontMgr); |
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ |
static CFGAS_GEFont* LoadFont(const uint8_t* pBuffer, |
int32_t iLength, |
@@ -74,7 +76,7 @@ class CFGAS_GEFont { |
FX_BOOL LoadFontInternal(const uint8_t* pBuffer, int32_t length); |
FX_BOOL LoadFontInternal(IFX_Stream* pFontStream, FX_BOOL bSaveStream); |
#endif |
- FX_BOOL LoadFontInternal(CFX_Font* pExtFont); |
+ FX_BOOL LoadFontInternal(CFX_Font* pFont, bool bExternalFont); |
FX_BOOL InitFont(); |
FX_BOOL GetCharBBoxInternal(FX_WCHAR wUnicode, |
CFX_Rect& bbox, |