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/apple/fx_mac_imp.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/apple/fx_mac_imp.cpp')
-rw-r--r-- | core/src/fxge/apple/fx_mac_imp.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/core/src/fxge/apple/fx_mac_imp.cpp b/core/src/fxge/apple/fx_mac_imp.cpp index a21aa5ded5..5acedc0bd9 100644 --- a/core/src/fxge/apple/fx_mac_imp.cpp +++ b/core/src/fxge/apple/fx_mac_imp.cpp @@ -25,7 +25,6 @@ Base14Substs[] = { {"Times-BoldItalic", "Times New Roman Bold Italic"}, {"Times-Italic", "Times New Roman Italic"}, }; -#if !defined(_FPDFAPI_MINI_) class CFX_MacFontInfo : public CFX_FolderFontInfo { public: @@ -86,10 +85,8 @@ void* CFX_MacFontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pit } return NULL; } -#endif IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { -#if !defined(_FPDFAPI_MINI_) CFX_MacFontInfo* pInfo = FX_NEW CFX_MacFontInfo; if (!pInfo) { return NULL; @@ -98,9 +95,6 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() pInfo->AddPath("/Library/Fonts"); pInfo->AddPath("/System/Library/Fonts"); return pInfo; -#else - return NULL; -#endif } void CFX_GEModule::InitPlatform() { |