From 343f2fc5e2789d7a64cb80c814b3b2b24d06e9d7 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 5 Jan 2016 15:49:53 -0800 Subject: 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 . --- core/include/fxge/fx_font.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/include/fxge') 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; -- cgit v1.2.3