summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-11-03 15:23:29 -0800
committerTom Sepez <tsepez@chromium.org>2015-11-03 15:23:29 -0800
commit844ccfeab312ed294059de94118a40336df875d7 (patch)
treefbc236441315ddd7782cfd01af068b23f6d76a5b /core/src
parent14591ce728525ab065d71a8598f9b201d0395db8 (diff)
downloadpdfium-844ccfeab312ed294059de94118a40336df875d7.tar.xz
Merge to XFA: Remove CFontFileFaceInfo.
Original Review URL: https://codereview.chromium.org/1412243015 . (cherry picked from commit cbd6bba62777131e39e3c4fd2d0028b472fb94c9) TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1416953005 .
Diffstat (limited to 'core/src')
-rw-r--r--core/src/fxge/ge/fx_ge_fontmap.cpp16
-rw-r--r--core/src/fxge/ge/text_int.h17
2 files changed, 0 insertions, 33 deletions
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp
index 96e11300d0..86de0e7826 100644
--- a/core/src/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/src/fxge/ge/fx_ge_fontmap.cpp
@@ -1272,22 +1272,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_