diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-04-12 11:32:32 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-12 17:23:27 +0000 |
commit | 9d6a2089c93c94461289b21a29771039eace95e7 (patch) | |
tree | 5b747786fe129b20aaf2ba3271e7b99051f5ae99 /xfa/fgas/font/cfgas_gefont.cpp | |
parent | b333c9ec415c132451f4a10487b84f91124d08e8 (diff) | |
download | pdfium-9d6a2089c93c94461289b21a29771039eace95e7.tar.xz |
Remove MakeSeekableReadStream
This Cl removes the MakeSeekableReadStream call and, at the one place
it's used, creates an IFX_MemoryStream which is a seekable read stream.
Change-Id: I6b0b23636eff47f8caca5432313ba99703e21e4d
Reviewed-on: https://pdfium-review.googlesource.com/4037
Reviewed-by: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas/font/cfgas_gefont.cpp')
-rw-r--r-- | xfa/fgas/font/cfgas_gefont.cpp | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/xfa/fgas/font/cfgas_gefont.cpp b/xfa/fgas/font/cfgas_gefont.cpp index 7abc3bccb0..fdeb2ce533 100644 --- a/xfa/fgas/font/cfgas_gefont.cpp +++ b/xfa/fgas/font/cfgas_gefont.cpp @@ -54,29 +54,6 @@ CFX_RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont( return pFont; } -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -// static -CFX_RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont(const uint8_t* pBuffer, - int32_t iLength, - CFGAS_FontMgr* pFontMgr) { - auto pFont = pdfium::MakeRetain<CFGAS_GEFont>(pFontMgr); - if (pFont->LoadFontInternal(pBuffer, iLength)) - return nullptr; - return pFont; -} - -// static -CFX_RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont( - const CFX_RetainPtr<IFGAS_Stream>& pFontStream, - CFGAS_FontMgr* pFontMgr, - bool bSaveStream) { - auto pFont = pdfium::MakeRetain<CFGAS_GEFont>(pFontMgr); - if (!pFont->LoadFontInternal(pFontStream, bSaveStream)) - return nullptr; - return pFont; -} -#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ - CFGAS_GEFont::CFGAS_GEFont(CFGAS_FontMgr* pFontMgr) : #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ @@ -159,33 +136,6 @@ bool CFGAS_GEFont::LoadFontInternal(const wchar_t* pszFontFamily, return false; return InitFont(); } - -bool CFGAS_GEFont::LoadFontInternal(const uint8_t* pBuffer, int32_t length) { - if (m_pFont) - return false; - - m_pFont = new CFX_Font; - if (!m_pFont->LoadEmbedded(pBuffer, length)) - return false; - return InitFont(); -} - -bool CFGAS_GEFont::LoadFontInternal( - const CFX_RetainPtr<IFGAS_Stream>& pFontStream, - bool bSaveStream) { - if (m_pFont || m_pFileRead || !pFontStream || pFontStream->GetLength() < 1) - return false; - if (bSaveStream) - m_pStream = pFontStream; - - m_pFileRead = pFontStream->MakeSeekableReadStream(); - m_pFont = new CFX_Font; - if (!m_pFont->LoadFile(m_pFileRead)) { - m_pFileRead.Reset(); - return false; - } - return InitFont(); -} #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ bool CFGAS_GEFont::LoadFontInternal(CFX_Font* pExternalFont) { |