From 594912241cd7d409b5f58a48ccffdc1904d844b2 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 7 Mar 2016 17:08:39 -0500 Subject: Revert "Fix chromium-style errors." This reverts commit c582c0ddfea8ba01c8449ed7841cdb33c12e0a98. TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1769263002 . --- core/src/fxge/ge/fx_ge_fontmap.cpp | 17 ----------------- core/src/fxge/ge/fx_ge_text.cpp | 3 --- 2 files changed, 20 deletions(-) (limited to 'core/src/fxge/ge') diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index cd46148b7f..890de616d1 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -1281,23 +1281,8 @@ FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(FX_DWORD dwUnicode, m_pFontInfo->DeleteFont(hFont); return face; } - -void* IFX_SystemFontInfo::MapFontByUnicode(FX_DWORD dwUnicode, - int weight, - FX_BOOL bItalic, - int pitch_family) { - return nullptr; -} #endif // PDF_ENABLE_XFA -int IFX_SystemFontInfo::GetFaceIndex(void* hFont) { - return 0; -} - -void* IFX_SystemFontInfo::RetainFont(void* hFont) { - return NULL; -} - int CFX_FontMapper::GetFaceSize() const { return pdfium::CollectionSize(m_FaceArray); } @@ -1323,13 +1308,11 @@ unsigned long _FTStreamRead(FXFT_Stream stream, unsigned long count); void _FTStreamClose(FXFT_Stream stream); }; - #if _FX_OS_ == _FX_ANDROID_ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) { return NULL; } #endif - CFX_FolderFontInfo::CFX_FolderFontInfo() {} CFX_FolderFontInfo::~CFX_FolderFontInfo() { for (const auto& pair : m_FontList) { diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp index 8fb03d86eb..8d54363d14 100644 --- a/core/src/fxge/ge/fx_ge_text.cpp +++ b/core/src/fxge/ge/fx_ge_text.cpp @@ -1167,9 +1167,6 @@ FX_BOOL CFX_RenderDevice::DrawTextPath(int nChars, } return TRUE; } - -CFX_FontCache::CFX_FontCache() {} - CFX_FontCache::~CFX_FontCache() { FreeCache(TRUE); } -- cgit v1.2.3