From 48baa5f230a886b0579a9626711e7d71376b085e Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 6 Apr 2016 10:00:40 -0700 Subject: Move core/include/fxge to core/fxge/include. This CL is a straight move of the fxge includes into core/fxge/include. Review URL: https://codereview.chromium.org/1868533002 --- core/fxge/ge/fx_ge.cpp | 2 +- core/fxge/ge/fx_ge_device.cpp | 2 +- core/fxge/ge/fx_ge_font.cpp | 4 ++-- core/fxge/ge/fx_ge_fontmap.cpp | 4 ++-- core/fxge/ge/fx_ge_linux.cpp | 2 +- core/fxge/ge/fx_ge_path.cpp | 2 +- core/fxge/ge/fx_ge_ps.cpp | 2 +- core/fxge/ge/fx_ge_text.cpp | 4 ++-- core/fxge/ge/fx_text_int.h | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) (limited to 'core/fxge/ge') diff --git a/core/fxge/ge/fx_ge.cpp b/core/fxge/ge/fx_ge.cpp index 7ae9942dec..9e45dc7434 100644 --- a/core/fxge/ge/fx_ge.cpp +++ b/core/fxge/ge/fx_ge.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_ge.h" #include "core/fxge/ge/fx_text_int.h" diff --git a/core/fxge/ge/fx_ge_device.cpp b/core/fxge/ge/fx_ge_device.cpp index d791859b03..0d6addab75 100644 --- a/core/fxge/ge/fx_ge_device.cpp +++ b/core/fxge/ge/fx_ge_device.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_ge.h" CFX_RenderDevice::CFX_RenderDevice() { m_pDeviceDriver = NULL; diff --git a/core/fxge/ge/fx_ge_font.cpp b/core/fxge/ge/fx_ge_font.cpp index fab5ea28a9..144228ff28 100644 --- a/core/fxge/ge/fx_ge_font.cpp +++ b/core/fxge/ge/fx_ge_font.cpp @@ -6,8 +6,8 @@ #include "core/fpdfapi/fpdf_font/include/cpdf_font.h" #include "core/fxge/ge/fx_text_int.h" -#include "core/include/fxge/fx_freetype.h" -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/include/fx_ge.h" #define EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em) diff --git a/core/fxge/ge/fx_ge_fontmap.cpp b/core/fxge/ge/fx_ge_fontmap.cpp index c6b208c624..e3a6d68d0d 100644 --- a/core/fxge/ge/fx_ge_fontmap.cpp +++ b/core/fxge/ge/fx_ge_fontmap.cpp @@ -10,8 +10,8 @@ #include "core/fxge/fontdata/chromefontdata/chromefontdata.h" #include "core/fxge/ge/fx_text_int.h" -#include "core/include/fxge/fx_freetype.h" -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/include/fx_ge.h" #include "third_party/base/stl_util.h" #define GET_TT_SHORT(w) (uint16_t)(((w)[0] << 8) | (w)[1]) diff --git a/core/fxge/ge/fx_ge_linux.cpp b/core/fxge/ge/fx_ge_linux.cpp index af731f78da..0bd67b01be 100644 --- a/core/fxge/ge/fx_ge_linux.cpp +++ b/core/fxge/ge/fx_ge_linux.cpp @@ -6,7 +6,7 @@ #include "core/fxge/agg/fx_agg_driver.h" #include "core/fxge/ge/fx_text_int.h" -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_ge.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ class CFX_LinuxFontInfo : public CFX_FolderFontInfo { diff --git a/core/fxge/ge/fx_ge_path.cpp b/core/fxge/ge/fx_ge_path.cpp index 90793c4746..baa391fef2 100644 --- a/core/fxge/ge/fx_ge_path.cpp +++ b/core/fxge/ge/fx_ge_path.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fxcrt/include/fx_system.h" -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_ge.h" #include "third_party/base/numerics/safe_math.h" CFX_ClipRgn::CFX_ClipRgn(int width, int height) { diff --git a/core/fxge/ge/fx_ge_ps.cpp b/core/fxge/ge/fx_ge_ps.cpp index ec8f18e774..0d8ccbf566 100644 --- a/core/fxge/ge/fx_ge_ps.cpp +++ b/core/fxge/ge/fx_ge_ps.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_ge.h" #include "core/fxge/ge/fx_text_int.h" #include "core/include/fxcodec/fx_codec.h" diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp index 0815bfaa67..78d1c15687 100644 --- a/core/fxge/ge/fx_ge_text.cpp +++ b/core/fxge/ge/fx_ge_text.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fxge/ge/fx_text_int.h" +#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/include/fx_ge.h" #include "core/include/fxcodec/fx_codec.h" -#include "core/include/fxge/fx_freetype.h" -#include "core/include/fxge/fx_ge.h" #ifdef _SKIA_SUPPORT_ #include "third_party/skia/include/core/SkStream.h" diff --git a/core/fxge/ge/fx_text_int.h b/core/fxge/ge/fx_text_int.h index 04587c37cb..c3e9cd7679 100644 --- a/core/fxge/ge/fx_text_int.h +++ b/core/fxge/ge/fx_text_int.h @@ -9,8 +9,8 @@ #include -#include "core/include/fxge/fx_font.h" -#include "core/include/fxge/fx_freetype.h" +#include "core/fxge/include/fx_font.h" +#include "core/fxge/include/fx_freetype.h" struct _CFX_UniqueKeyGen { void Generate(int count, ...); -- cgit v1.2.3