| Index: xfa/fgas/font/fgas_stdfontmgr.h
|
| diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h
|
| index 785a47f854490526a67d0053d4f00450189dba7c..fd7f9cd318271a492f9a63aed50eab442a693638 100644
|
| --- a/xfa/fgas/font/fgas_stdfontmgr.h
|
| +++ b/xfa/fgas/font/fgas_stdfontmgr.h
|
| @@ -185,7 +185,7 @@ class CFGAS_FontMgrImp : public IFGAS_FontMgr {
|
| protected:
|
| void RegisterFace(FXFT_Face pFace,
|
| const CFX_WideString* pFaceName);
|
| - void RegisterFaces(IFX_FileRead* pFontStream,
|
| + void RegisterFaces(IFX_SeekableReadStream* pFontStream,
|
| const CFX_WideString* pFaceName);
|
| void GetNames(const uint8_t* name_table, CFX_WideStringArray& Names);
|
| std::vector<uint16_t> GetCharsets(FXFT_Face pFace) const;
|
| @@ -204,16 +204,16 @@ class CFGAS_FontMgrImp : public IFGAS_FontMgr {
|
| uint32_t dwFontStyles,
|
| const CFX_WideString& FontName,
|
| FX_WCHAR wcUnicode = 0xFFFE);
|
| - FXFT_Face LoadFace(IFX_FileRead* pFontStream, int32_t iFaceIndex);
|
| - IFX_FileRead* CreateFontStream(CFX_FontMapper* pFontMapper,
|
| - IFX_SystemFontInfo* pSystemFontInfo,
|
| - uint32_t index);
|
| - IFX_FileRead* CreateFontStream(const CFX_ByteString& bsFaceName);
|
| + FXFT_Face LoadFace(IFX_SeekableReadStream* pFontStream, int32_t iFaceIndex);
|
| + IFX_SeekableReadStream* CreateFontStream(CFX_FontMapper* pFontMapper,
|
| + IFX_SystemFontInfo* pSystemFontInfo,
|
| + uint32_t index);
|
| + IFX_SeekableReadStream* CreateFontStream(const CFX_ByteString& bsFaceName);
|
|
|
| CFX_FontDescriptors m_InstalledFonts;
|
| CFX_MapPtrTemplate<uint32_t, CFX_FontDescriptorInfos*> m_Hash2CandidateList;
|
| CFX_MapPtrTemplate<uint32_t, CFX_ArrayTemplate<CFGAS_GEFont*>*> m_Hash2Fonts;
|
| - CFX_MapPtrTemplate<CFGAS_GEFont*, IFX_FileRead*> m_IFXFont2FileRead;
|
| + CFX_MapPtrTemplate<CFGAS_GEFont*, IFX_SeekableReadStream*> m_IFXFont2FileRead;
|
| CFX_MapPtrTemplate<FX_WCHAR, CFGAS_GEFont*> m_FailedUnicodes2Nullptr;
|
| CFX_FontSourceEnum_File* const m_pFontSource;
|
| };
|
|
|