From 8f3eb6051c0465923d6694bd0f0b6dc5bb51cbe3 Mon Sep 17 00:00:00 2001 From: npm Date: Fri, 11 Nov 2016 17:16:23 -0800 Subject: Remove IFGAS_FontMgr and clean up (the renamed) CFGAS_FontMgr a little. IFGAS_FontMgr is an interface only for a class only defined on Windows, plus a class only defined for non-Windows. I'm removing the interface, renaming the class to have the same name in both cases, and cleaning up a bit of unused methods. Review-Url: https://codereview.chromium.org/2494883002 --- xfa/fgas/font/fgas_stdfontmgr.h | 222 ---------------------------------------- 1 file changed, 222 deletions(-) delete mode 100644 xfa/fgas/font/fgas_stdfontmgr.h (limited to 'xfa/fgas/font/fgas_stdfontmgr.h') diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h deleted file mode 100644 index 2c7a1a2fdd..0000000000 --- a/xfa/fgas/font/fgas_stdfontmgr.h +++ /dev/null @@ -1,222 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef XFA_FGAS_FONT_FGAS_STDFONTMGR_H_ -#define XFA_FGAS_FONT_FGAS_STDFONTMGR_H_ - -#include - -#include "core/fxcrt/fx_ext.h" -#include "core/fxge/cfx_fontmapper.h" -#include "core/fxge/fx_freetype.h" -#include "core/fxge/ifx_systemfontinfo.h" -#include "third_party/freetype/include/freetype/fttypes.h" -#include "xfa/fgas/font/fgas_font.h" - -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -int32_t FX_GetSimilarValue(FX_FONTDESCRIPTOR const* pFont, - uint32_t dwFontStyles); -FX_FONTDESCRIPTOR const* FX_DefFontMatcher(FX_LPFONTMATCHPARAMS pParams, - const CFX_FontDescriptors& fonts); - -class CFGAS_StdFontMgrImp : public IFGAS_FontMgr { - public: - explicit CFGAS_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator); - ~CFGAS_StdFontMgrImp() override; - - // IFGAS_FontMgr: - CFGAS_GEFont* GetDefFontByCodePage( - uint16_t wCodePage, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily = nullptr) override; - CFGAS_GEFont* GetDefFontByCharset( - uint8_t nCharset, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily = nullptr) override; - CFGAS_GEFont* GetDefFontByUnicode( - FX_WCHAR wUnicode, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily = nullptr) override; - CFGAS_GEFont* GetDefFontByLanguage( - uint16_t wLanguage, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily = nullptr) override; - CFGAS_GEFont* LoadFont(const FX_WCHAR* pszFontFamily, - uint32_t dwFontStyles, - uint16_t wCodePage = 0xFFFF) override; - CFGAS_GEFont* LoadFont(const uint8_t* pBuffer, int32_t iLength) override; - CFGAS_GEFont* LoadFont(IFX_Stream* pFontStream, - const FX_WCHAR* pszFontAlias = nullptr, - uint32_t dwFontStyles = 0, - uint16_t wCodePage = 0, - bool bSaveStream = false) override; - CFGAS_GEFont* LoadFont(CFGAS_GEFont* pSrcFont, - uint32_t dwFontStyles, - uint16_t wCodePage = 0xFFFF) override; - - void ClearFontCache() override; - void RemoveFont(CFGAS_GEFont* pFont) override; - - protected: - void RemoveFont(CFX_MapPtrToPtr& fontMap, CFGAS_GEFont* pFont); - FX_FONTDESCRIPTOR const* FindFont(const FX_WCHAR* pszFontFamily, - uint32_t dwFontStyles, - uint32_t dwMatchFlags, - uint16_t wCodePage, - uint32_t dwUSB = 999, - FX_WCHAR wUnicode = 0); - - FX_LPEnumAllFonts m_pEnumerator; - CFX_FontDescriptors m_FontFaces; - CFX_ArrayTemplate m_Fonts; - CFX_MapPtrToPtr m_CPFonts; - CFX_MapPtrToPtr m_FamilyFonts; - CFX_MapPtrToPtr m_UnicodeFonts; - CFX_MapPtrToPtr m_BufferFonts; - CFX_MapPtrToPtr m_StreamFonts; - CFX_MapPtrToPtr m_DeriveFonts; -}; -uint32_t FX_GetGdiFontStyles(const LOGFONTW& lf); - -#else - -class CFX_FontDescriptor { - public: - CFX_FontDescriptor(); - ~CFX_FontDescriptor(); - - int32_t m_nFaceIndex; - CFX_WideString m_wsFaceName; - CFX_WideStringArray m_wsFamilyNames; - uint32_t m_dwFontStyles; - uint32_t m_dwUsb[4]; - uint32_t m_dwCsb[2]; -}; - -typedef CFX_ArrayTemplate CFX_FontDescriptors; - -struct FX_FontDescriptorInfo { - public: - CFX_FontDescriptor* pFont; - int32_t nPenalty; - - bool operator>(const FX_FontDescriptorInfo& other) const { - return nPenalty > other.nPenalty; - } - bool operator<(const FX_FontDescriptorInfo& other) const { - return nPenalty < other.nPenalty; - } - bool operator==(const FX_FontDescriptorInfo& other) const { - return nPenalty == other.nPenalty; - } -}; - -typedef CFX_ArrayTemplate CFX_FontDescriptorInfos; - -struct FX_HandleParentPath { - FX_HandleParentPath() {} - FX_HandleParentPath(const FX_HandleParentPath& x) { - pFileHandle = x.pFileHandle; - bsParentPath = x.bsParentPath; - } - FX_FileHandle* pFileHandle; - CFX_ByteString bsParentPath; -}; - -class CFX_FontSourceEnum_File { - public: - CFX_FontSourceEnum_File(); - ~CFX_FontSourceEnum_File(); - - FX_POSITION GetStartPosition(); - IFX_FileAccess* GetNext(FX_POSITION& pos); - - private: - CFX_ByteString GetNextFile(); - - CFX_WideString m_wsNext; - CFX_ObjectArray m_FolderQueue; - CFX_ByteStringArray m_FolderPaths; -}; - -class CFGAS_FontMgrImp : public IFGAS_FontMgr { - public: - explicit CFGAS_FontMgrImp(CFX_FontSourceEnum_File* pFontEnum); - ~CFGAS_FontMgrImp() override; - - // IFGAS_FontMgr: - CFGAS_GEFont* GetDefFontByCodePage(uint16_t wCodePage, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily) override; - CFGAS_GEFont* GetDefFontByCharset(uint8_t nCharset, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily) override; - CFGAS_GEFont* GetDefFontByUnicode(FX_WCHAR wUnicode, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily) override; - CFGAS_GEFont* GetDefFontByLanguage(uint16_t wLanguage, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily) override; - CFGAS_GEFont* GetFontByCodePage(uint16_t wCodePage, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily) override; - CFGAS_GEFont* GetFontByCharset(uint8_t nCharset, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily) override; - CFGAS_GEFont* GetFontByUnicode(FX_WCHAR wUnicode, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily) override; - CFGAS_GEFont* GetFontByLanguage(uint16_t wLanguage, - uint32_t dwFontStyles, - const FX_WCHAR* pszFontFamily) override; - void ClearFontCache() override; - void RemoveFont(CFGAS_GEFont* pFont) override; - - CFGAS_GEFont* LoadFont(const CFX_WideString& wsFaceName, - int32_t iFaceIndex, - int32_t* pFaceCount); - bool EnumFonts(); - bool EnumFontsFromFontMapper(); - bool EnumFontsFromFiles(); - - protected: - void RegisterFace(FXFT_Face pFace, - const CFX_WideString* pFaceName); - void RegisterFaces(IFX_SeekableReadStream* pFontStream, - const CFX_WideString* pFaceName); - void GetNames(const uint8_t* name_table, CFX_WideStringArray& Names); - std::vector GetCharsets(FXFT_Face pFace) const; - void GetUSBCSB(FXFT_Face pFace, uint32_t* USB, uint32_t* CSB); - uint32_t GetFlags(FXFT_Face pFace); - bool VerifyUnicode(CFX_FontDescriptor* pDesc, FX_WCHAR wcUnicode); - bool VerifyUnicode(CFGAS_GEFont* pFont, FX_WCHAR wcUnicode); - int32_t IsPartName(const CFX_WideString& Name1, const CFX_WideString& Name2); - int32_t MatchFonts(CFX_FontDescriptorInfos& MatchedFonts, - uint16_t wCodePage, - uint32_t dwFontStyles, - const CFX_WideString& FontName, - FX_WCHAR wcUnicode = 0xFFFE); - int32_t CalcPenalty(CFX_FontDescriptor* pInstalled, - uint16_t wCodePage, - uint32_t dwFontStyles, - const CFX_WideString& FontName, - FX_WCHAR wcUnicode = 0xFFFE); - 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 m_Hash2CandidateList; - CFX_MapPtrTemplate*> m_Hash2Fonts; - CFX_MapPtrTemplate m_IFXFont2FileRead; - CFX_MapPtrTemplate m_FailedUnicodes2Nullptr; - CFX_FontSourceEnum_File* const m_pFontSource; -}; -#endif - -#endif // XFA_FGAS_FONT_FGAS_STDFONTMGR_H_ -- cgit v1.2.3