From 9fb27cb9797937499c9678bc74cf7846cbf5d2b8 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 10 Nov 2015 09:41:05 -0800 Subject: Fix relative includes within core/ R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1427633010 . --- core/src/fxge/agg/include/fx_agg_driver.h | 10 +++++++--- core/src/fxge/agg/src/fx_agg_driver.cpp | 7 ++++--- core/src/fxge/android/fpf_skiafont.h | 2 +- core/src/fxge/android/fpf_skiafontmgr.cpp | 3 ++- core/src/fxge/android/fpf_skiafontmgr.h | 2 +- core/src/fxge/android/fpf_skiamodule.h | 2 +- core/src/fxge/android/fx_fpf.h | 6 +++--- core/src/fxge/apple/apple_int.h | 2 +- core/src/fxge/apple/fx_apple_platform.cpp | 10 +++++----- core/src/fxge/apple/fx_mac_imp.cpp | 3 ++- core/src/fxge/apple/fx_quartz_device.cpp | 11 ++++++----- core/src/fxge/dib/dib_int.h | 5 +++++ core/src/fxge/dib/fx_dib_composite.cpp | 5 +++-- core/src/fxge/dib/fx_dib_convert.cpp | 7 ++++--- core/src/fxge/dib/fx_dib_engine.cpp | 4 ++-- core/src/fxge/dib/fx_dib_main.cpp | 11 +++++++---- core/src/fxge/dib/fx_dib_transform.cpp | 3 ++- core/src/fxge/freetype/fx_freetype.c | 5 +++-- core/src/fxge/ge/fx_ge.cpp | 4 +++- core/src/fxge/ge/fx_ge_device.cpp | 3 ++- core/src/fxge/ge/fx_ge_font.cpp | 4 ++-- core/src/fxge/ge/fx_ge_fontmap.cpp | 4 ++-- core/src/fxge/ge/fx_ge_linux.cpp | 4 ++-- core/src/fxge/ge/fx_ge_path.cpp | 4 ++-- core/src/fxge/ge/fx_ge_ps.cpp | 5 +++-- core/src/fxge/ge/fx_ge_text.cpp | 7 ++++--- core/src/fxge/ge/text_int.h | 3 ++- core/src/fxge/skia/fx_skia_blitter_new.cpp | 6 ++++-- core/src/fxge/skia/fx_skia_device.cpp | 26 ++++++++++++-------------- core/src/fxge/win32/fx_win32_device.cpp | 10 +++++----- core/src/fxge/win32/fx_win32_dib.cpp | 7 +++++-- core/src/fxge/win32/fx_win32_dwrite.cpp | 9 ++++++--- core/src/fxge/win32/fx_win32_gdipext.cpp | 4 ++-- core/src/fxge/win32/fx_win32_print.cpp | 14 +++++++++----- core/src/fxge/win32/win32_int.h | 3 ++- 35 files changed, 126 insertions(+), 89 deletions(-) (limited to 'core/src/fxge') diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h index c0b23dddb4..77d2f2af6e 100644 --- a/core/src/fxge/agg/include/fx_agg_driver.h +++ b/core/src/fxge/agg/include/fx_agg_driver.h @@ -4,13 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FX_AGG_DRIVER_H_ -#define FX_AGG_DRIVER_H_ +#ifndef CORE_SRC_FXGE_AGG_INCLUDE_FX_AGG_DRIVER_H_ +#define CORE_SRC_FXGE_AGG_INCLUDE_FX_AGG_DRIVER_H_ +#include "core/include/fxge/fx_ge.h" #include "third_party/agg23/agg_clip_liang_barsky.h" #include "third_party/agg23/agg_path_storage.h" #include "third_party/agg23/agg_rasterizer_scanline_aa.h" +class CFX_AffineMatrix; +class CFX_PathData; + class CAgg_PathData { public: CAgg_PathData() {} @@ -144,4 +148,4 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver { FX_BOOL m_bGroupKnockout; }; -#endif // FX_AGG_DRIVER_H_ +#endif // CORE_SRC_FXGE_AGG_INCLUDE_FX_AGG_DRIVER_H_ diff --git a/core/src/fxge/agg/src/fx_agg_driver.cpp b/core/src/fxge/agg/src/fx_agg_driver.cpp index 57ece1e6a1..5b5100bcc5 100644 --- a/core/src/fxge/agg/src/fx_agg_driver.cpp +++ b/core/src/fxge/agg/src/fx_agg_driver.cpp @@ -4,11 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../include/fxcodec/fx_codec.h" -#include "../../../../include/fxge/fx_ge.h" +#include "core/src/fxge/agg/include/fx_agg_driver.h" + #include "../../dib/dib_int.h" #include "../../ge/text_int.h" -#include "../include/fx_agg_driver.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_ge.h" #include "third_party/agg23/agg_conv_dash.h" #include "third_party/agg23/agg_conv_stroke.h" #include "third_party/agg23/agg_curves.h" diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h index 6ee2f258e4..c88f2407c1 100644 --- a/core/src/fxge/android/fpf_skiafont.h +++ b/core/src/fxge/android/fpf_skiafont.h @@ -9,7 +9,7 @@ #if _FX_OS_ == _FX_ANDROID_ -#include "../../../include/fxge/fpf.h" +#include "core/include/fxge/fpf.h" class CFPF_SkiaFontDescriptor; class CFPF_SkiaFontMgr; diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp index 7e7aee3c06..a263416521 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ b/core/src/fxge/android/fpf_skiafontmgr.cpp @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcrt/fx_ext.h" +#include "core/include/fxcrt/fx_ext.h" #include "fx_fpf.h" + #if _FX_OS_ == _FX_ANDROID_ #define FPF_SKIAMATCHWEIGHT_NAME1 62 #define FPF_SKIAMATCHWEIGHT_NAME2 60 diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h index 0b33627cf3..cd503f58a9 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.h +++ b/core/src/fxge/android/fpf_skiafontmgr.h @@ -9,7 +9,7 @@ #if _FX_OS_ == _FX_ANDROID_ -#include "../../../include/fxge/fpf.h" +#include "core/include/fxge/fpf.h" #define FPF_SKIAFONTTYPE_Unknown 0 #define FPF_SKIAFONTTYPE_Path 1 diff --git a/core/src/fxge/android/fpf_skiamodule.h b/core/src/fxge/android/fpf_skiamodule.h index 5d1da7be32..ff99eda75d 100644 --- a/core/src/fxge/android/fpf_skiamodule.h +++ b/core/src/fxge/android/fpf_skiamodule.h @@ -9,7 +9,7 @@ #if _FX_OS_ == _FX_ANDROID_ -#include "../../../include/fxge/fpf.h" +#include "core/include/fxge/fpf.h" class CFPF_SkiaFontMgr; diff --git a/core/src/fxge/android/fx_fpf.h b/core/src/fxge/android/fx_fpf.h index a484c1e076..6096884ca9 100644 --- a/core/src/fxge/android/fx_fpf.h +++ b/core/src/fxge/android/fx_fpf.h @@ -7,9 +7,9 @@ #ifndef CORE_SRC_FXGE_ANDROID_FX_FPF_H_ #define CORE_SRC_FXGE_ANDROID_FX_FPF_H_ -#include "../../../include/fxge/fpf.h" -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fpf.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge.h" #include "fx_android_font.h" #endif // CORE_SRC_FXGE_ANDROID_FX_FPF_H_ diff --git a/core/src/fxge/apple/apple_int.h b/core/src/fxge/apple/apple_int.h index 9bff4ebcbc..504e144327 100644 --- a/core/src/fxge/apple/apple_int.h +++ b/core/src/fxge/apple/apple_int.h @@ -9,7 +9,7 @@ #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" #if _FX_OS_ == _FX_MACOSX_ #include diff --git a/core/src/fxge/apple/fx_apple_platform.cpp b/core/src/fxge/apple/fx_apple_platform.cpp index 03b5629d4b..c289b93041 100644 --- a/core/src/fxge/apple/fx_apple_platform.cpp +++ b/core/src/fxge/apple/fx_apple_platform.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcrt/fx_system.h" -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxcrt/fx_system.h" +#include "core/include/fxge/fx_ge.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxge/fx_ge_apple.h" -#include "../agg/include/fx_agg_driver.h" #include "../dib/dib_int.h" #include "../ge/text_int.h" #include "apple_int.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge_apple.h" +#include "core/src/fxge/agg/include/fx_agg_driver.h" void CFX_AggDeviceDriver::InitPlatform() { CQuartz2D& quartz2d = diff --git a/core/src/fxge/apple/fx_mac_imp.cpp b/core/src/fxge/apple/fx_mac_imp.cpp index 41333f8bf4..166d3b46f9 100644 --- a/core/src/fxge/apple/fx_mac_imp.cpp +++ b/core/src/fxge/apple/fx_mac_imp.cpp @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" #include "apple_int.h" + #if _FX_OS_ == _FX_MACOSX_ static const struct { const FX_CHAR* m_pName; diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp index eba27c0049..67b438fc28 100644 --- a/core/src/fxge/apple/fx_quartz_device.cpp +++ b/core/src/fxge/apple/fx_quartz_device.cpp @@ -4,19 +4,20 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcrt/fx_ext.h" -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxge/fx_ge.h" -#include "../agg/include/fx_agg_driver.h" #include "../dib/dib_int.h" #include "../ge/text_int.h" +#include "core/include/fxcrt/fx_ext.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge.h" +#include "core/src/fxge/agg/include/fx_agg_driver.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ #include "apple_int.h" -#include "../../../include/fxge/fx_ge_apple.h" +#include "core/include/fxge/fx_ge_apple.h" #ifndef CGFLOAT_IS_DOUBLE #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers #endif + void* CQuartz2D::createGraphics(CFX_DIBitmap* pBitmap) { if (!pBitmap) { return NULL; diff --git a/core/src/fxge/dib/dib_int.h b/core/src/fxge/dib/dib_int.h index 69f28234eb..c90e3b105e 100644 --- a/core/src/fxge/dib/dib_int.h +++ b/core/src/fxge/dib/dib_int.h @@ -7,6 +7,11 @@ #ifndef CORE_SRC_FXGE_DIB_DIB_INT_H_ #define CORE_SRC_FXGE_DIB_DIB_INT_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxge/fx_dib.h" + +class IFX_ScanlineComposer; + extern const int SDP_Table[513]; class CPDF_FixedMatrix { diff --git a/core/src/fxge/dib/fx_dib_composite.cpp b/core/src/fxge/dib/fx_dib_composite.cpp index 85741fdc54..e89fdcec99 100644 --- a/core/src/fxge/dib/fx_dib_composite.cpp +++ b/core/src/fxge/dib/fx_dib_composite.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_ge.h" +#include "core/include/fxcodec/fx_codec.h" #include "dib_int.h" + const uint8_t _color_sqrt[256] = { 0x00, 0x03, 0x07, 0x0B, 0x0F, 0x12, 0x16, 0x19, 0x1D, 0x20, 0x23, 0x26, 0x29, 0x2C, 0x2F, 0x32, 0x35, 0x37, 0x3A, 0x3C, 0x3F, 0x41, 0x43, 0x46, diff --git a/core/src/fxge/dib/fx_dib_convert.cpp b/core/src/fxge/dib/fx_dib_convert.cpp index 7e7a619595..956ff7ccc4 100644 --- a/core/src/fxge/dib/fx_dib_convert.cpp +++ b/core/src/fxge/dib/fx_dib_convert.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_dib.h" -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxcodec/fx_codec.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_dib.h" +#include "core/include/fxge/fx_ge.h" + const FX_DWORD g_dwWinPalette[256] = { 0xff000000, 0xff800000, 0xff008000, 0xff808000, 0xff000080, 0xff800080, 0xff008080, 0xff808080, 0xffC0DCC0, 0xffA6CAF0, 0xff2A3FAA, 0xff2A3FFF, diff --git a/core/src/fxge/dib/fx_dib_engine.cpp b/core/src/fxge/dib/fx_dib_engine.cpp index 56bb5abafa..314b600b6c 100644 --- a/core/src/fxge/dib/fx_dib_engine.cpp +++ b/core/src/fxge/dib/fx_dib_engine.cpp @@ -6,8 +6,8 @@ #include -#include "../../../include/fxge/fx_dib.h" -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_dib.h" +#include "core/include/fxge/fx_ge.h" #include "dib_int.h" void CWeightTable::Calc(int dest_len, diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index 8c7e831e8c..d8335f96bd 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -4,11 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_dib.h" -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxcodec/fx_codec.h" -#include "dib_int.h" +#include "core/include/fxge/fx_dib.h" + #include + +#include "core/include/fxge/fx_ge.h" +#include "core/include/fxcodec/fx_codec.h" +#include "dib_int.h" + FX_BOOL ConvertBuffer(FXDIB_Format dest_format, uint8_t* dest_buf, int dest_pitch, diff --git a/core/src/fxge/dib/fx_dib_transform.cpp b/core/src/fxge/dib/fx_dib_transform.cpp index d368a95c35..99c38afe22 100644 --- a/core/src/fxge/dib/fx_dib_transform.cpp +++ b/core/src/fxge/dib/fx_dib_transform.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_dib.h" #include "dib_int.h" +#include "core/include/fxge/fx_dib.h" + const int SDP_Table[513] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 255, 255, 255, 255, 255, 255, 254, 254, 254, 254, 253, 253, 253, 252, 252, 252, 251, 251, 251, 250, 250, diff --git a/core/src/fxge/freetype/fx_freetype.c b/core/src/fxge/freetype/fx_freetype.c index 4804bc1d1b..1ff2cc6d62 100644 --- a/core/src/fxge/freetype/fx_freetype.c +++ b/core/src/fxge/freetype/fx_freetype.c @@ -1,10 +1,11 @@ // Copyright 2014 PDFium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. - + // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_freetype.h" + #include "third_party/freetype/src/psnames/pstables.h" static int xyq_search_node(char* glyph_name, int name_offset, int table_offset, wchar_t unicode) diff --git a/core/src/fxge/ge/fx_ge.cpp b/core/src/fxge/ge/fx_ge.cpp index 6dfed8837c..138f81840e 100644 --- a/core/src/fxge/ge/fx_ge.cpp +++ b/core/src/fxge/ge/fx_ge.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" + #include "text_int.h" + static CFX_GEModule* g_pGEModule = NULL; CFX_GEModule::CFX_GEModule(const char** pUserFontPaths) { m_pFontCache = NULL; diff --git a/core/src/fxge/ge/fx_ge_device.cpp b/core/src/fxge/ge/fx_ge_device.cpp index 7ab399a3bd..a1790bdd22 100644 --- a/core/src/fxge/ge/fx_ge_device.cpp +++ b/core/src/fxge/ge/fx_ge_device.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" + CFX_RenderDevice::CFX_RenderDevice() { m_pDeviceDriver = NULL; m_pBitmap = NULL; diff --git a/core/src/fxge/ge/fx_ge_font.cpp b/core/src/fxge/ge/fx_ge_font.cpp index fed80e6165..f3c63a0e8e 100644 --- a/core/src/fxge/ge/fx_ge_font.cpp +++ b/core/src/fxge/ge/fx_ge_font.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge.h" #include "text_int.h" #define EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em) diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index ba3e28ea06..94e4753746 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -6,9 +6,9 @@ #include -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxge/fx_freetype.h" #include "../fontdata/chromefontdata/chromefontdata.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge.h" #include "text_int.h" #define GET_TT_SHORT(w) (FX_WORD)(((w)[0] << 8) | (w)[1]) diff --git a/core/src/fxge/ge/fx_ge_linux.cpp b/core/src/fxge/ge/fx_ge_linux.cpp index 72971f7f5d..d581627b7e 100644 --- a/core/src/fxge/ge/fx_ge_linux.cpp +++ b/core/src/fxge/ge/fx_ge_linux.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" -#include "../agg/include/fx_agg_driver.h" +#include "core/include/fxge/fx_ge.h" +#include "core/src/fxge/agg/include/fx_agg_driver.h" #include "text_int.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ diff --git a/core/src/fxge/ge/fx_ge_path.cpp b/core/src/fxge/ge/fx_ge_path.cpp index c8e4f61ad8..4f6c54cac0 100644 --- a/core/src/fxge/ge/fx_ge_path.cpp +++ b/core/src/fxge/ge/fx_ge_path.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcrt/fx_system.h" -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxcrt/fx_system.h" +#include "core/include/fxge/fx_ge.h" #include "third_party/base/numerics/safe_math.h" CFX_ClipRgn::CFX_ClipRgn(int width, int height) { diff --git a/core/src/fxge/ge/fx_ge_ps.cpp b/core/src/fxge/ge/fx_ge_ps.cpp index dacec0455c..018a6005e3 100644 --- a/core/src/fxge/ge/fx_ge_ps.cpp +++ b/core/src/fxge/ge/fx_ge_ps.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_ge.h" +#include "core/include/fxcodec/fx_codec.h" #include "text_int.h" + struct PSGlyph { CFX_Font* m_pFont; FX_DWORD m_GlyphIndex; diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp index efb4366423..f01bdcfb3e 100644 --- a/core/src/fxge/ge/fx_ge_text.cpp +++ b/core/src/fxge/ge/fx_ge_text.cpp @@ -4,10 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_ge.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxcodec/fx_codec.h" #include "text_int.h" + #undef FX_GAMMA #undef FX_GAMMA_INVERSE #define FX_GAMMA(value) (value) diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h index e3bfb5ba34..f17cf7f18f 100644 --- a/core/src/fxge/ge/text_int.h +++ b/core/src/fxge/ge/text_int.h @@ -7,7 +7,8 @@ #ifndef CORE_SRC_FXGE_GE_TEXT_INT_H_ #define CORE_SRC_FXGE_GE_TEXT_INT_H_ -#include "../../../include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_font.h" +#include "core/include/fxge/fx_freetype.h" struct _CFX_UniqueKeyGen { void Generate(int count, ...); diff --git a/core/src/fxge/skia/fx_skia_blitter_new.cpp b/core/src/fxge/skia/fx_skia_blitter_new.cpp index a3ed75b9cb..ed7b1c74bf 100644 --- a/core/src/fxge/skia/fx_skia_blitter_new.cpp +++ b/core/src/fxge/skia/fx_skia_blitter_new.cpp @@ -2,12 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" + //#define _SKIA_SUPPORT_ #if defined(_SKIA_SUPPORT_) -#include "../../../include/fxcodec/fx_codec.h" #include "SkBlitter.h" +#include "core/include/fxcodec/fx_codec.h" #include "fx_skia_blitter_new.h" + // We use our own renderer here to make it simple void CFX_SkiaRenderer::blitAntiH(int x, int y, diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp index fcd8e9871e..7cce7b3326 100644 --- a/core/src/fxge/skia/fx_skia_device.cpp +++ b/core/src/fxge/skia/fx_skia_device.cpp @@ -2,13 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../../include/fxge/fx_ge.h" -//#define _SKIA_SUPPORT_ +#include "core/include/fxge/fx_ge.h" + #if defined(_SKIA_SUPPORT_) -#include "../../../include/fxcodec/fx_codec.h" +#include "core/include/fxcodec/fx_codec.h" -//#define _FOXIT_DEBUG_ -//#define _FOXIT_BENCHMARK_ +#include "SkDashPathEffect.h" +#include "SkTLazy.h" +#include "SkScan.h" +#include "SkRasterClip.h" +#include "SkStroke.h" + +#include "core/src/fxge/agg/include/fx_agg_driver.h" +#include "fx_skia_blitter_new.h" +#include "fx_skia_device.h" extern "C" { extern void FX_OUTPUT_LOG_FUNC(const char*, ...); @@ -31,15 +38,6 @@ extern int FX_GET_TICK_FUNC(); #define FOXIT_DEBUG5(msg, para1, para2, para3, param4) #endif -#include "SkDashPathEffect.h" -#include "SkTLazy.h" -#include "SkScan.h" -#include "SkRasterClip.h" -#include "SkStroke.h" - -#include "fx_skia_blitter_new.h" -#include "../agg/fx_agg_driver.h" -#include "fx_skia_device.h" /// Run-length-encoded supersampling antialiased blitter. class SuperBlitter_skia { public: diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index a32f9ade78..696e5f0179 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxge/fx_ge_win32.h" -#include "../agg/include/fx_agg_driver.h" #include "../dib/dib_int.h" #include "../ge/text_int.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge_win32.h" +#include "core/src/fxge/agg/include/fx_agg_driver.h" #include "dwrite_int.h" #include "win32_int.h" diff --git a/core/src/fxge/win32/fx_win32_dib.cpp b/core/src/fxge/win32/fx_win32_dib.cpp index b1ffe8080d..1aa60f084e 100644 --- a/core/src/fxge/win32/fx_win32_dib.cpp +++ b/core/src/fxge/win32/fx_win32_dib.cpp @@ -4,11 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" + #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include -#include "../../../include/fxge/fx_ge_win32.h" + +#include "core/include/fxge/fx_ge_win32.h" #include "win32_int.h" + CFX_ByteString CFX_WindowsDIB::GetBitmapInfo(const CFX_DIBitmap* pBitmap) { CFX_ByteString result; int len = sizeof(BITMAPINFOHEADER); diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp index 0a78dbf1cd..0d533436b5 100644 --- a/core/src/fxge/win32/fx_win32_dwrite.cpp +++ b/core/src/fxge/win32/fx_win32_dwrite.cpp @@ -4,11 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" + #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ -#include "../../../include/fxge/fx_ge_win32.h" -#include "dwrite_int.h" #include + +#include "core/include/fxge/fx_ge_win32.h" +#include "dwrite_int.h" + typedef HRESULT(__stdcall* FuncType_DWriteCreateFactory)( __in DWRITE_FACTORY_TYPE, __in REFIID, diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index 42f8a4a29f..368b15fcc0 100644 --- a/core/src/fxge/win32/fx_win32_gdipext.cpp +++ b/core/src/fxge/win32/fx_win32_gdipext.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include @@ -16,7 +16,7 @@ using std::max; } // namespace Gdiplus #include -#include "../../../include/fxge/fx_ge_win32.h" +#include "core/include/fxge/fx_ge_win32.h" #include "win32_int.h" using namespace Gdiplus; diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp index 595d1e9494..d973d893af 100644 --- a/core/src/fxge/win32/fx_win32_print.cpp +++ b/core/src/fxge/win32/fx_win32_print.cpp @@ -4,14 +4,18 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" + #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ + #include -#include "../../../include/fxge/fx_ge_win32.h" -#include "win32_int.h" -#include "../../../include/fxge/fx_freetype.h" -#include "../ge/text_int.h" + #include "../dib/dib_int.h" +#include "../ge/text_int.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge_win32.h" +#include "win32_int.h" + #define SIZETHRESHOLD 1000 #define OUTPUTPSLEN 4096 CGdiPrinterDriver::CGdiPrinterDriver(HDC hDC) diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h index 7f73fdbb1a..95d31d159d 100644 --- a/core/src/fxge/win32/win32_int.h +++ b/core/src/fxge/win32/win32_int.h @@ -3,10 +3,11 @@ // found in the LICENSE file. // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + #ifndef CORE_SRC_FXGE_WIN32_WIN32_INT_H_ #define CORE_SRC_FXGE_WIN32_WIN32_INT_H_ -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" struct WINDIB_Open_Args_; class CGdiplusExt { -- cgit v1.2.3