diff options
author | Lei Zhang <thestig@chromium.org> | 2015-09-23 15:31:44 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-09-23 15:31:44 -0700 |
commit | 6f62d53b7650311afc490bfdaa48f5e8536b8b4e (patch) | |
tree | 9b1e1cc17f3d75d6f9bd2413281d5b29450f1fcd /core/src/fxge/ge/fx_ge_fontmap.cpp | |
parent | 5377ebf967ea860eec4b3cfa3877ed30b84509dc (diff) | |
download | pdfium-6f62d53b7650311afc490bfdaa48f5e8536b8b4e.tar.xz |
Merge to XFA: Allow external font-path configuration from pdfium_test.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1268323004 .
(cherry picked from commit 9311163b564785a3a3ccdcb09bd3b7d0b2976d1a)
Review URL: https://codereview.chromium.org/1368513002 .
Diffstat (limited to 'core/src/fxge/ge/fx_ge_fontmap.cpp')
-rw-r--r-- | core/src/fxge/ge/fx_ge_fontmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index 63d8181656..e1f25684ad 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -1343,7 +1343,7 @@ CFontFileFaceInfo::~CFontFileFaceInfo() { m_Face = NULL; } #if _FX_OS_ == _FX_ANDROID_ -IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { +IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) { return NULL; } #endif |