From a8a28e0702a1874d29d3c9f2b155bce1557eb4fd Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 23 Mar 2016 15:41:39 -0400 Subject: Move core/include/fxcrt to core/fxcrt/include. This CL moves the fxcrt code into the core/fxcrt directory. The only exception was fx_bidi.h which was moved into core/fxcrt as it is not used outside of core/. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1825953002 . --- core/fxge/android/fpf_skiafont.cpp | 2 +- core/fxge/android/fpf_skiafont.h | 2 +- core/fxge/android/fpf_skiafontmgr.cpp | 4 ++-- core/fxge/android/fpf_skiafontmgr.h | 2 +- core/fxge/android/fpf_skiamodule.cpp | 2 +- core/fxge/android/fx_android_font.cpp | 2 +- core/fxge/android/fx_android_font.h | 2 +- core/fxge/android/fx_android_imp.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'core/fxge/android') diff --git a/core/fxge/android/fpf_skiafont.cpp b/core/fxge/android/fpf_skiafont.cpp index b94ec055bf..58b937f3d4 100644 --- a/core/fxge/android/fpf_skiafont.cpp +++ b/core/fxge/android/fpf_skiafont.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #if _FX_OS_ == _FX_ANDROID_ diff --git a/core/fxge/android/fpf_skiafont.h b/core/fxge/android/fpf_skiafont.h index f1ccedb56d..d077f38606 100644 --- a/core/fxge/android/fpf_skiafont.h +++ b/core/fxge/android/fpf_skiafont.h @@ -7,7 +7,7 @@ #ifndef CORE_FXGE_ANDROID_FPF_SKIAFONT_H_ #define CORE_FXGE_ANDROID_FPF_SKIAFONT_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #if _FX_OS_ == _FX_ANDROID_ diff --git a/core/fxge/android/fpf_skiafontmgr.cpp b/core/fxge/android/fpf_skiafontmgr.cpp index e9249ba76f..13d030cf26 100644 --- a/core/fxge/android/fpf_skiafontmgr.cpp +++ b/core/fxge/android/fpf_skiafontmgr.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #if _FX_OS_ == _FX_ANDROID_ @@ -13,9 +13,9 @@ #define FPF_SKIAMATCHWEIGHT_1 16 #define FPF_SKIAMATCHWEIGHT_2 8 +#include "core/fxcrt/include/fx_ext.h" #include "core/fxge/android/fpf_skiafont.h" #include "core/fxge/android/fpf_skiafontmgr.h" -#include "core/include/fxcrt/fx_ext.h" #include "core/include/fxge/fx_freetype.h" #ifdef __cplusplus diff --git a/core/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h index 9f5cafbed5..5ba5b16475 100644 --- a/core/fxge/android/fpf_skiafontmgr.h +++ b/core/fxge/android/fpf_skiafontmgr.h @@ -7,7 +7,7 @@ #ifndef CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ #define CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #if _FX_OS_ == _FX_ANDROID_ diff --git a/core/fxge/android/fpf_skiamodule.cpp b/core/fxge/android/fpf_skiamodule.cpp index 91f00c78e8..0454524829 100644 --- a/core/fxge/android/fpf_skiamodule.cpp +++ b/core/fxge/android/fpf_skiamodule.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #if _FX_OS_ == _FX_ANDROID_ diff --git a/core/fxge/android/fx_android_font.cpp b/core/fxge/android/fx_android_font.cpp index 58d20faa7b..7218b5e7d0 100644 --- a/core/fxge/android/fx_android_font.cpp +++ b/core/fxge/android/fx_android_font.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #if _FX_OS_ == _FX_ANDROID_ diff --git a/core/fxge/android/fx_android_font.h b/core/fxge/android/fx_android_font.h index ef8062dda8..1ce4694f77 100644 --- a/core/fxge/android/fx_android_font.h +++ b/core/fxge/android/fx_android_font.h @@ -7,7 +7,7 @@ #ifndef CORE_FXGE_ANDROID_FX_ANDROID_FONT_H_ #define CORE_FXGE_ANDROID_FX_ANDROID_FONT_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #if _FX_OS_ == _FX_ANDROID_ diff --git a/core/fxge/android/fx_android_imp.cpp b/core/fxge/android/fx_android_imp.cpp index 6d04e4ffc2..3fac3706cf 100644 --- a/core/fxge/android/fx_android_imp.cpp +++ b/core/fxge/android/fx_android_imp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #if _FX_OS_ == _FX_ANDROID_ -- cgit v1.2.3