From cbd6bba62777131e39e3c4fd2d0028b472fb94c9 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 3 Nov 2015 14:26:04 -0800 Subject: Remove CFontFileFaceInfo. It is unused. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1412243015 . --- core/include/fxge/fx_font.h | 1 - core/src/fxge/ge/fx_ge_fontmap.cpp | 16 ---------------- core/src/fxge/ge/text_int.h | 17 ----------------- 3 files changed, 34 deletions(-) diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 0ab529ef4e..50e9f331b7 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -22,7 +22,6 @@ class CFX_FontMapper; class CFX_PathData; class CFX_SizeGlyphCache; class CFX_SubstFont; -class CFontFileFaceInfo; class CTTFontDesc; class IFX_FontEncoding; class IFX_SystemFontInfo; diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index 4f627ac96b..d69028473a 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -1187,22 +1187,6 @@ unsigned long _FTStreamRead(FXFT_Stream stream, unsigned long count); void _FTStreamClose(FXFT_Stream stream); }; -CFontFileFaceInfo::CFontFileFaceInfo() { - m_pFile = NULL; - m_Face = NULL; - m_Charsets = 0; - m_FileSize = 0; - m_FontOffset = 0; - m_Weight = 0; - m_bItalic = FALSE; - m_PitchFamily = 0; -} -CFontFileFaceInfo::~CFontFileFaceInfo() { - if (m_Face) { - FXFT_Done_Face(m_Face); - } - m_Face = NULL; -} #if _FX_OS_ == _FX_ANDROID_ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) { return NULL; diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h index 1b16cedce8..e3bfb5ba34 100644 --- a/core/src/fxge/ge/text_int.h +++ b/core/src/fxge/ge/text_int.h @@ -75,21 +75,4 @@ class CFX_FontFaceInfo { FX_DWORD m_Charsets; }; -class CFontFileFaceInfo { - public: - CFontFileFaceInfo(); - ~CFontFileFaceInfo(); - - IFX_FileStream* m_pFile; - FXFT_Face m_Face; - CFX_ByteString m_FaceName; - FX_DWORD m_Charsets; - FX_DWORD m_FileSize; - FX_DWORD m_FontOffset; - int m_Weight; - FX_BOOL m_bItalic; - int m_PitchFamily; - CFX_ByteString m_FontTables; -}; - #endif // CORE_SRC_FXGE_GE_TEXT_INT_H_ -- cgit v1.2.3