diff options
| author | npm <npm@chromium.org> | 2016-10-17 13:02:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-17 13:02:28 -0700 |
| commit | 11e966a2dd931d4676a1b6a7d074a40dd4c1a5d1 (patch) | |
| tree | f39447f89bc1c5301e04418d009698fc7fb73288 /core/fxge/android/fpf_skiafont.cpp | |
| parent | 2239cee23e914b974b458699d52733d7dd3116a6 (diff) | |
| download | pdfium-11e966a2dd931d4676a1b6a7d074a40dd4c1a5d1.tar.xz | |
Move fxge/android to if(is_android) on buildchromium/2894
core/fxge/android files all have if _FX_OS_ == _FX_ANDROID_. Instead,
put the files inside if (is_android) on Build.gn. Also, the skia file
is already under if (pdf_use_skia), so the if defined(_SKIA_SUPPORT_)
can be removed.
Review-Url: https://codereview.chromium.org/2413983004
Diffstat (limited to 'core/fxge/android/fpf_skiafont.cpp')
| -rw-r--r-- | core/fxge/android/fpf_skiafont.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/fxge/android/fpf_skiafont.cpp b/core/fxge/android/fpf_skiafont.cpp index 58e472247a..9c19697387 100644 --- a/core/fxge/android/fpf_skiafont.cpp +++ b/core/fxge/android/fpf_skiafont.cpp @@ -4,13 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fxcrt/fx_system.h" - -#if _FX_OS_ == _FX_ANDROID_ +#include "core/fxge/android/fpf_skiafont.h" #include <algorithm> -#include "core/fxge/android/fpf_skiafont.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/android/fpf_skiafontmgr.h" #include "core/fxge/fx_freetype.h" @@ -215,5 +213,3 @@ FX_BOOL CFPF_SkiaFont::InitFont(CFPF_SkiaFontMgr* pFontMgr, m_dwRefCount = 1; return TRUE; } - -#endif // _FX_OS_ == _FX_ANDROID_ |