From 68b4a4abb713c97badbba54884a477564d41a139 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 8 Mar 2016 15:06:12 -0500 Subject: Reland "Fix chromium-style errors." This reverts commit 594912241cd7d409b5f58a48ccffdc1904d844b2. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1769273002 . --- core/src/fxge/ge/fx_ge_fontmap.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'core/src/fxge/ge/fx_ge_fontmap.cpp') diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index 890de616d1..cd46148b7f 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -1281,8 +1281,23 @@ 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); } @@ -1308,11 +1323,13 @@ 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) { -- cgit v1.2.3