diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-09-29 16:41:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-29 16:41:42 -0700 |
| commit | 74a34fc71ab02400a4c958709138302a1ab4c0e7 (patch) | |
| tree | ab987bfd6c92679843c030654f62e2fb9ecf45b3 /core/fxge/android | |
| parent | a52ab741019342fbca0468e43a01deb44fa5f1bd (diff) | |
| download | pdfium-74a34fc71ab02400a4c958709138302a1ab4c0e7.tar.xz | |
Move core/fxge/include to core/fxge
BUG=pdfium:611
Review-Url: https://codereview.chromium.org/2377393002
Diffstat (limited to 'core/fxge/android')
| -rw-r--r-- | core/fxge/android/fpf_skiafont.cpp | 2 | ||||
| -rw-r--r-- | core/fxge/android/fpf_skiafont.h | 2 | ||||
| -rw-r--r-- | core/fxge/android/fpf_skiafontmgr.cpp | 2 | ||||
| -rw-r--r-- | core/fxge/android/fpf_skiafontmgr.h | 2 | ||||
| -rw-r--r-- | core/fxge/android/fx_android_font.cpp | 2 | ||||
| -rw-r--r-- | core/fxge/android/fx_android_font.h | 6 | ||||
| -rw-r--r-- | core/fxge/android/fx_android_imp.cpp | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/core/fxge/android/fpf_skiafont.cpp b/core/fxge/android/fpf_skiafont.cpp index b154ec422b..58e472247a 100644 --- a/core/fxge/android/fpf_skiafont.cpp +++ b/core/fxge/android/fpf_skiafont.cpp @@ -12,7 +12,7 @@ #include "core/fxge/android/fpf_skiafont.h" #include "core/fxge/android/fpf_skiafontmgr.h" -#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/fx_freetype.h" #define FPF_EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em) diff --git a/core/fxge/android/fpf_skiafont.h b/core/fxge/android/fpf_skiafont.h index eb5bc44a85..1a952628a9 100644 --- a/core/fxge/android/fpf_skiafont.h +++ b/core/fxge/android/fpf_skiafont.h @@ -11,7 +11,7 @@ #if _FX_OS_ == _FX_ANDROID_ -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_font.h" class CFPF_SkiaFontDescriptor; class CFPF_SkiaFontMgr; diff --git a/core/fxge/android/fpf_skiafontmgr.cpp b/core/fxge/android/fpf_skiafontmgr.cpp index 67b58d74ce..9452c11747 100644 --- a/core/fxge/android/fpf_skiafontmgr.cpp +++ b/core/fxge/android/fpf_skiafontmgr.cpp @@ -16,7 +16,7 @@ #include "core/fxcrt/fx_ext.h" #include "core/fxge/android/fpf_skiafont.h" #include "core/fxge/android/fpf_skiafontmgr.h" -#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/fx_freetype.h" #ifdef __cplusplus extern "C" { diff --git a/core/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h index a0c9f5bffe..897e21f981 100644 --- a/core/fxge/android/fpf_skiafontmgr.h +++ b/core/fxge/android/fpf_skiafontmgr.h @@ -14,7 +14,7 @@ #include <map> #include <vector> -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_font.h" #define FPF_SKIAFONTTYPE_Unknown 0 #define FPF_SKIAFONTTYPE_Path 1 diff --git a/core/fxge/android/fx_android_font.cpp b/core/fxge/android/fx_android_font.cpp index 1c17432a45..2ffc897332 100644 --- a/core/fxge/android/fx_android_font.cpp +++ b/core/fxge/android/fx_android_font.cpp @@ -11,7 +11,7 @@ #include "core/fxge/android/fpf_skiafont.h" #include "core/fxge/android/fpf_skiafontmgr.h" #include "core/fxge/android/fx_android_font.h" -#include "core/fxge/include/cfx_fontmapper.h" +#include "core/fxge/cfx_fontmapper.h" CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(nullptr) {} CFX_AndroidFontInfo::~CFX_AndroidFontInfo() {} diff --git a/core/fxge/android/fx_android_font.h b/core/fxge/android/fx_android_font.h index e9fbb3618c..5b75d9d06e 100644 --- a/core/fxge/android/fx_android_font.h +++ b/core/fxge/android/fx_android_font.h @@ -11,9 +11,9 @@ #if _FX_OS_ == _FX_ANDROID_ -#include "core/fxge/include/cfx_fontmapper.h" -#include "core/fxge/include/fx_font.h" -#include "core/fxge/include/ifx_systemfontinfo.h" +#include "core/fxge/cfx_fontmapper.h" +#include "core/fxge/fx_font.h" +#include "core/fxge/ifx_systemfontinfo.h" class CFPF_SkiaFontMgr; diff --git a/core/fxge/android/fx_android_imp.cpp b/core/fxge/android/fx_android_imp.cpp index 79222b02f4..6e9dafc0e4 100644 --- a/core/fxge/android/fx_android_imp.cpp +++ b/core/fxge/android/fx_android_imp.cpp @@ -13,7 +13,7 @@ #include "core/fxge/android/fpf_skiamodule.h" #include "core/fxge/android/fx_android_font.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_gemodule.h" void CFX_GEModule::InitPlatform() { CFPF_SkiaDeviceModule* pDeviceModule = CFPF_GetSkiaDeviceModule(); |