diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2014-12-15 12:13:45 -0800 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2014-12-15 12:13:45 -0800 |
| commit | 207299b5d46e3e0612dd6a0264fb7647177312bb (patch) | |
| tree | 796aeeeab94a2cac2676e3fb359078609c82f809 /core/src/fxge/ge/fx_ge_fontmap.cpp | |
| parent | 0d4fdc1bbf2c23999271617413f89f059d4a71c9 (diff) | |
| download | pdfium-207299b5d46e3e0612dd6a0264fb7647177312bb.tar.xz | |
XFA: merge patch from issue 801913002 and 804463003
Simplify PDFium by removing code that's not used in the open source repo.
-remove parameter from FPDF_InitLibrary
-remove a bunch of ifdefs that are unused
Fix build after previous commit.
TBR=tsepez@chromium.org
BUG=
Review URL: https://codereview.chromium.org/809513002
Diffstat (limited to 'core/src/fxge/ge/fx_ge_fontmap.cpp')
| -rw-r--r-- | core/src/fxge/ge/fx_ge_fontmap.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index fe790d8664..e27c51fcbb 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -1373,13 +1373,12 @@ CFontFileFaceInfo::~CFontFileFaceInfo() m_Face = NULL; } extern FX_BOOL _LoadFile(FXFT_Library library, FXFT_Face* Face, IFX_FileRead* pFile, FXFT_Stream* stream); -#if defined(_FPDFAPI_MINI_) || _FX_OS_ == _FX_ANDROID_ +#if _FX_OS_ == _FX_ANDROID_ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { return NULL; } #endif -#if !defined(_FPDFAPI_MINI_) CFX_FolderFontInfo::CFX_FolderFontInfo() { } @@ -1616,4 +1615,3 @@ FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset) { return FALSE; } -#endif |