summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-01-05 15:49:53 -0800
committerTom Sepez <tsepez@chromium.org>2016-01-05 15:49:53 -0800
commit343f2fc5e2789d7a64cb80c814b3b2b24d06e9d7 (patch)
treec7dd371aa44a5c41479a29d8b3760329e0046bbc /core
parent63f9be7ce9871b102df1575e3c88a52c63ab5565 (diff)
downloadpdfium-343f2fc5e2789d7a64cb80c814b3b2b24d06e9d7.tar.xz
Merge 3d8f56d back to xfa
Required to build XFA branch in non-xfa mode. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1560313002 .
Diffstat (limited to 'core')
-rw-r--r--core/include/fxge/fx_font.h2
-rw-r--r--core/src/fxge/ge/fx_ge_fontmap.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 7d5aa638a1..954824e728 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -323,8 +323,8 @@ class CFX_FontMapper {
FX_DWORD flags,
int weight,
int italic_angle);
- FX_BOOL IsBuiltinFace(const FXFT_Face face) const;
#endif // PDF_ENABLE_XFA
+ FX_BOOL IsBuiltinFace(const FXFT_Face face) const;
private:
static const size_t MM_FACE_COUNT = 2;
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp
index 4105e79a69..be71f6bfac 100644
--- a/core/src/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/src/fxge/ge/fx_ge_fontmap.cpp
@@ -1286,6 +1286,7 @@ FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(FX_DWORD dwUnicode,
m_pFontInfo->DeleteFont(hFont);
return face;
}
+#endif // PDF_ENABLE_XFA
FX_BOOL CFX_FontMapper::IsBuiltinFace(const FXFT_Face face) const {
for (int i = 0; i < MM_FACE_COUNT; ++i) {
@@ -1300,7 +1301,6 @@ FX_BOOL CFX_FontMapper::IsBuiltinFace(const FXFT_Face face) const {
}
return FALSE;
}
-#endif // PDF_ENABLE_XFA
extern "C" {
unsigned long _FTStreamRead(FXFT_Stream stream,