diff options
| author | tsepez <tsepez@chromium.org> | 2016-10-24 10:19:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-24 10:19:11 -0700 |
| commit | ad2441ef675866eb84c7392eeda03391a5a5d474 (patch) | |
| tree | 5b250139c65d5f440f3b544643b1fb85e23380dd /core/fxge/android | |
| parent | b674ebe6dd13288160ad8e324d719a124caf5a83 (diff) | |
| download | pdfium-ad2441ef675866eb84c7392eeda03391a5a5d474.tar.xz | |
Rename IFX_ stream nameschromium/2900
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
Diffstat (limited to 'core/fxge/android')
| -rw-r--r-- | core/fxge/android/cfpf_skiafontmgr.cpp | 5 | ||||
| -rw-r--r-- | core/fxge/android/fpf_skiafontmgr.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/fxge/android/cfpf_skiafontmgr.cpp b/core/fxge/android/cfpf_skiafontmgr.cpp index 290551bedf..2deb327392 100644 --- a/core/fxge/android/cfpf_skiafontmgr.cpp +++ b/core/fxge/android/cfpf_skiafontmgr.cpp @@ -26,7 +26,8 @@ static unsigned long FPF_SkiaStream_Read(FXFT_Stream stream, unsigned long offset, unsigned char* buffer, unsigned long count) { - IFX_FileRead* pFileRead = (IFX_FileRead*)stream->descriptor.pointer; + IFX_SeekableReadStream* pFileRead = + (IFX_SeekableReadStream*)stream->descriptor.pointer; if (!pFileRead) return 0; if (count > 0) { @@ -355,7 +356,7 @@ CFPF_SkiaFont* CFPF_SkiaFontMgr::CreateFont(const CFX_ByteStringC& bsFamilyname, return nullptr; } -FXFT_Face CFPF_SkiaFontMgr::GetFontFace(IFX_FileRead* pFileRead, +FXFT_Face CFPF_SkiaFontMgr::GetFontFace(IFX_SeekableReadStream* pFileRead, int32_t iFaceIndex) { if (!pFileRead) return nullptr; diff --git a/core/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h index bd586204c5..74e7adeb5a 100644 --- a/core/fxge/android/fpf_skiafontmgr.h +++ b/core/fxge/android/fpf_skiafontmgr.h @@ -75,7 +75,7 @@ class CFPF_SkiaFileFont : public CFPF_SkiaFontDescriptor { // CFPF_SkiaFontDescriptor int32_t GetType() const override { return FPF_SKIAFONTTYPE_File; } - IFX_FileRead* m_pFile; + IFX_SeekableReadStream* m_pFile; }; class CFPF_SkiaBufferFont : public CFPF_SkiaFontDescriptor { @@ -101,7 +101,8 @@ class CFPF_SkiaFontMgr { uint32_t dwMatch = 0); bool InitFTLibrary(); - FXFT_Face GetFontFace(IFX_FileRead* pFileRead, int32_t iFaceIndex = 0); + FXFT_Face GetFontFace(IFX_SeekableReadStream* pFileRead, + int32_t iFaceIndex = 0); FXFT_Face GetFontFace(const CFX_ByteStringC& bsFile, int32_t iFaceIndex = 0); FXFT_Face GetFontFace(const uint8_t* pBuffer, size_t szBuffer, |