From ad2441ef675866eb84c7392eeda03391a5a5d474 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 24 Oct 2016 10:19:11 -0700 Subject: Rename IFX_ stream names It's been troubling for some time that an IFX_FileStream might actually be an in-memory buffer with no backing file. Review-Url: https://codereview.chromium.org/2443723002 --- core/fxge/ge/cfx_font.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/fxge/ge') diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp index f58462479f..d1c31d0f51 100644 --- a/core/fxge/ge/cfx_font.cpp +++ b/core/fxge/ge/cfx_font.cpp @@ -39,7 +39,8 @@ unsigned long FTStreamRead(FXFT_Stream stream, if (count == 0) return 0; - IFX_FileRead* pFile = static_cast(stream->descriptor.pointer); + IFX_SeekableReadStream* pFile = + static_cast(stream->descriptor.pointer); return pFile->ReadBlock(buffer, offset, count) ? count : 0; } @@ -47,7 +48,7 @@ void FTStreamClose(FXFT_Stream stream) {} FX_BOOL LoadFileImp(FXFT_Library library, FXFT_Face* Face, - IFX_FileRead* pFile, + IFX_SeekableReadStream* pFile, int32_t faceIndex, std::unique_ptr* stream) { std::unique_ptr stream1(new FXFT_StreamRec()); @@ -331,7 +332,7 @@ void CFX_Font::LoadSubst(const CFX_ByteString& face_name, } #ifdef PDF_ENABLE_XFA -FX_BOOL CFX_Font::LoadFile(IFX_FileRead* pFile, +FX_BOOL CFX_Font::LoadFile(IFX_SeekableReadStream* pFile, int nFaceIndex, int* pFaceCount) { m_bEmbedded = FALSE; -- cgit v1.2.3