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 /fpdfsdk/src/pdfwindow/PWL_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 'fpdfsdk/src/pdfwindow/PWL_FontMap.cpp')
| -rw-r--r-- | fpdfsdk/src/pdfwindow/PWL_FontMap.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp index b5f50022f1..10549d583e 100644 --- a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp @@ -312,11 +312,7 @@ FX_INT32 CPWL_FontMap::GetPWLFontIndex(FX_WORD word, FX_INT32 nCharset) } */ -#ifdef FOXIT_CHROME_BUILD - CFX_ByteString sAlias = EncodeFontAlias("Arial_Chrome", nCharset); -#else - CFX_ByteString sAlias = EncodeFontAlias("Arial_Foxit", nCharset); -#endif + CFX_ByteString sAlias = EncodeFontAlias("Arial_Chrome", nCharset); AddedFont(pNewFont, sAlias); return AddFontData(pNewFont, sAlias, nCharset); |