summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/cpdf_pagerendercontext.cpp2
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_font.cpp2
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_font.h2
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp2
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_simplefont.cpp2
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp2
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_type1font.cpp4
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_type3char.cpp2
-rw-r--r--core/fpdfapi/fpdf_font/fpdf_font.cpp2
-rw-r--r--core/fpdfapi/fpdf_font/fpdf_font_cid.cpp2
-rw-r--r--core/fpdfapi/fpdf_font/ttgsubtable.cpp2
-rw-r--r--core/fpdfapi/fpdf_font/ttgsubtable.h4
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_allstates.cpp2
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_colorstate.cpp2
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_generalstate.h2
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_graphicstates.h2
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_image.cpp2
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_path.h6
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_parser.cpp4
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp4
-rw-r--r--core/fpdfapi/fpdf_page/pageint.h4
-rw-r--r--core/fpdfapi/fpdf_parser/cpdf_document.cpp4
-rw-r--r--core/fpdfapi/fpdf_render/cpdf_renderoptions.h2
-rw-r--r--core/fpdfapi/fpdf_render/cpdf_textrenderer.h2
-rw-r--r--core/fpdfapi/fpdf_render/cpdf_type3cache.cpp4
-rw-r--r--core/fpdfapi/fpdf_render/cpdf_type3glyphs.cpp2
-rw-r--r--core/fpdfapi/fpdf_render/fpdf_render.cpp8
-rw-r--r--core/fpdfapi/fpdf_render/fpdf_render_image.cpp4
-rw-r--r--core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp8
-rw-r--r--core/fpdfapi/fpdf_render/fpdf_render_text.cpp12
-rw-r--r--core/fpdfapi/fpdf_render/render_int.h4
-rw-r--r--core/fpdfdoc/cpdf_annot.cpp6
-rw-r--r--core/fpdfdoc/cpdf_annotlist.cpp2
-rw-r--r--core/fpdfdoc/cpdf_apsettings.h2
-rw-r--r--core/fpdfdoc/cpdf_bookmark.cpp2
-rw-r--r--core/fpdfdoc/cpdf_defaultappearance.h2
-rw-r--r--core/fpdfdoc/cpdf_formcontrol.cpp2
-rw-r--r--core/fpdfdoc/cpdf_formcontrol.h2
-rw-r--r--core/fpdfdoc/cpdf_interform.cpp4
-rw-r--r--core/fpdfdoc/cpdf_variabletext.h2
-rw-r--r--core/fpdfdoc/cpvt_wordprops.h2
-rw-r--r--core/fpdfdoc/fpdf_tagged.h2
-rw-r--r--core/fxcodec/codec/ccodec_progressivedecoder.h2
-rw-r--r--core/fxcodec/codec/fx_codec_bmp.cpp2
-rw-r--r--core/fxcodec/codec/fx_codec_gif.cpp2
-rw-r--r--core/fxcodec/codec/fx_codec_jpeg.cpp2
-rw-r--r--core/fxcodec/codec/fx_codec_png.cpp2
-rw-r--r--core/fxcodec/codec/fx_codec_progress.cpp2
-rw-r--r--core/fxcodec/codec/fx_codec_tiff.cpp2
-rw-r--r--core/fxge/agg/fx_agg_driver.cpp12
-rw-r--r--core/fxge/agg/fx_agg_driver.h2
-rw-r--r--core/fxge/android/fpf_skiafont.cpp2
-rw-r--r--core/fxge/android/fpf_skiafont.h2
-rw-r--r--core/fxge/android/fpf_skiafontmgr.cpp2
-rw-r--r--core/fxge/android/fpf_skiafontmgr.h2
-rw-r--r--core/fxge/android/fx_android_font.cpp2
-rw-r--r--core/fxge/android/fx_android_font.h6
-rw-r--r--core/fxge/android/fx_android_imp.cpp2
-rw-r--r--core/fxge/apple/apple_int.h10
-rw-r--r--core/fxge/apple/cfx_quartzdevice.h2
-rw-r--r--core/fxge/apple/fx_apple_platform.cpp8
-rw-r--r--core/fxge/apple/fx_mac_imp.cpp4
-rw-r--r--core/fxge/apple/fx_quartz_device.cpp10
-rw-r--r--core/fxge/cfx_facecache.h (renamed from core/fxge/include/cfx_facecache.h)10
-rw-r--r--core/fxge/cfx_fontcache.h (renamed from core/fxge/include/cfx_fontcache.h)10
-rw-r--r--core/fxge/cfx_fontmapper.h (renamed from core/fxge/include/cfx_fontmapper.h)10
-rw-r--r--core/fxge/cfx_fontmgr.h (renamed from core/fxge/include/cfx_fontmgr.h)8
-rw-r--r--core/fxge/cfx_fxgedevice.h (renamed from core/fxge/include/cfx_fxgedevice.h)10
-rw-r--r--core/fxge/cfx_gemodule.h (renamed from core/fxge/include/cfx_gemodule.h)10
-rw-r--r--core/fxge/cfx_graphstate.h (renamed from core/fxge/include/cfx_graphstate.h)8
-rw-r--r--core/fxge/cfx_graphstatedata.h (renamed from core/fxge/include/cfx_graphstatedata.h)6
-rw-r--r--core/fxge/cfx_pathdata.h (renamed from core/fxge/include/cfx_pathdata.h)8
-rw-r--r--core/fxge/cfx_renderdevice.h (renamed from core/fxge/include/cfx_renderdevice.h)24
-rw-r--r--core/fxge/cfx_substfont.h (renamed from core/fxge/include/cfx_substfont.h)6
-rw-r--r--core/fxge/cfx_unicodeencoding.h (renamed from core/fxge/include/cfx_unicodeencoding.h)8
-rw-r--r--core/fxge/cfx_unicodeencodingex.h (renamed from core/fxge/include/cfx_unicodeencodingex.h)12
-rw-r--r--core/fxge/cfx_windowsdevice.h (renamed from core/fxge/include/cfx_windowsdevice.h)6
-rw-r--r--core/fxge/dib/dib_int.h2
-rw-r--r--core/fxge/dib/fx_dib_composite.cpp2
-rw-r--r--core/fxge/dib/fx_dib_convert.cpp2
-rw-r--r--core/fxge/dib/fx_dib_engine.cpp2
-rw-r--r--core/fxge/dib/fx_dib_engine_unittest.cpp2
-rw-r--r--core/fxge/dib/fx_dib_main.cpp4
-rw-r--r--core/fxge/dib/fx_dib_transform.cpp2
-rw-r--r--core/fxge/freetype/fx_freetype.cpp2
-rw-r--r--core/fxge/fx_dib.h (renamed from core/fxge/include/fx_dib.h)6
-rw-r--r--core/fxge/fx_font.h (renamed from core/fxge/include/fx_font.h)12
-rw-r--r--core/fxge/fx_freetype.h (renamed from core/fxge/include/fx_freetype.h)6
-rw-r--r--core/fxge/ge/cfx_cliprgn.h2
-rw-r--r--core/fxge/ge/cfx_facecache.cpp12
-rw-r--r--core/fxge/ge/cfx_folderfontinfo.cpp4
-rw-r--r--core/fxge/ge/cfx_folderfontinfo.h6
-rw-r--r--core/fxge/ge/cfx_font.cpp16
-rw-r--r--core/fxge/ge/cfx_fontcache.cpp8
-rw-r--r--core/fxge/ge/cfx_fontmapper.cpp8
-rw-r--r--core/fxge/ge/cfx_fontmgr.cpp10
-rw-r--r--core/fxge/ge/cfx_gemodule.cpp6
-rw-r--r--core/fxge/ge/cfx_graphstate.cpp2
-rw-r--r--core/fxge/ge/cfx_graphstatedata.cpp2
-rw-r--r--core/fxge/ge/cfx_pathdata.cpp2
-rw-r--r--core/fxge/ge/cfx_renderdevice.cpp12
-rw-r--r--core/fxge/ge/cfx_substfont.cpp4
-rw-r--r--core/fxge/ge/cfx_unicodeencoding.cpp6
-rw-r--r--core/fxge/ge/cfx_unicodeencodingex.cpp6
-rw-r--r--core/fxge/ge/cttfontdesc.cpp2
-rw-r--r--core/fxge/ge/cttfontdesc.h2
-rw-r--r--core/fxge/ge/fx_ge_fontmap.cpp4
-rw-r--r--core/fxge/ge/fx_ge_linux.cpp4
-rw-r--r--core/fxge/ge/fx_ge_text.cpp6
-rw-r--r--core/fxge/ge/fx_text_int.h4
-rw-r--r--core/fxge/ifx_renderdevicedriver.cpp6
-rw-r--r--core/fxge/ifx_renderdevicedriver.h (renamed from core/fxge/include/ifx_renderdevicedriver.h)6
-rw-r--r--core/fxge/ifx_systemfontinfo.h (renamed from core/fxge/include/ifx_systemfontinfo.h)10
-rw-r--r--core/fxge/skia/fx_skia_device.cpp10
-rw-r--r--core/fxge/skia/fx_skia_device.h4
-rw-r--r--core/fxge/skia/fx_skia_device_unittest.cpp8
-rw-r--r--core/fxge/win32/fx_win32_device.cpp16
-rw-r--r--core/fxge/win32/fx_win32_dib.cpp2
-rw-r--r--core/fxge/win32/fx_win32_gdipext.cpp6
-rw-r--r--core/fxge/win32/fx_win32_print.cpp6
-rw-r--r--core/fxge/win32/win32_int.h4
121 files changed, 299 insertions, 299 deletions
diff --git a/core/fpdfapi/cpdf_pagerendercontext.cpp b/core/fpdfapi/cpdf_pagerendercontext.cpp
index e9a6f54aa2..dc5836262e 100644
--- a/core/fpdfapi/cpdf_pagerendercontext.cpp
+++ b/core/fpdfapi/cpdf_pagerendercontext.cpp
@@ -11,7 +11,7 @@
#include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
#include "core/fpdfdoc/cpdf_annotlist.h"
#include "core/fpdfdoc/cpdf_occontext.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_renderdevice.h"
CPDF_PageRenderContext::CPDF_PageRenderContext() {}
diff --git a/core/fpdfapi/fpdf_font/cpdf_font.cpp b/core/fpdfapi/fpdf_font/cpdf_font.cpp
index fd9a666d03..9b6fc5e824 100644
--- a/core/fpdfapi/fpdf_font/cpdf_font.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_font.cpp
@@ -23,7 +23,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_name.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
#include "core/fxcrt/fx_memory.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_freetype.h"
#include "third_party/base/stl_util.h"
namespace {
diff --git a/core/fpdfapi/fpdf_font/cpdf_font.h b/core/fpdfapi/fpdf_font/cpdf_font.h
index 00fcfd7ddd..04f942c03c 100644
--- a/core/fpdfapi/fpdf_font/cpdf_font.h
+++ b/core/fpdfapi/fpdf_font/cpdf_font.h
@@ -12,7 +12,7 @@
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/fx_font.h"
#define PDFFONT_FIXEDPITCH 1
#define PDFFONT_SERIF 2
diff --git a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp b/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
index 8704aea365..e373e01233 100644
--- a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
@@ -11,7 +11,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_name.h"
#include "core/fpdfapi/fpdf_parser/cpdf_number.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_freetype.h"
namespace {
diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp b/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp
index 94d8a993b7..dda642380f 100644
--- a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/fpdf_parser/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_freetype.h"
#include "third_party/base/numerics/safe_math.h"
CPDF_SimpleFont::CPDF_SimpleFont() : m_BaseEncoding(PDFFONT_ENCODING_BUILTIN) {
diff --git a/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp b/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp
index c6b8eb6419..08c3e11974 100644
--- a/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp
@@ -8,7 +8,7 @@
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/fx_font.h"
namespace {
diff --git a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp b/core/fpdfapi/fpdf_font/cpdf_type1font.cpp
index 04b872f0e0..d80d59ae9d 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_type1font.cpp
@@ -8,8 +8,8 @@
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/fx_freetype.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
#include "core/fxge/apple/apple_int.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_type3char.cpp b/core/fpdfapi/fpdf_font/cpdf_type3char.cpp
index c97e26d76b..a11f319b78 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3char.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_type3char.cpp
@@ -10,7 +10,7 @@
#include "core/fpdfapi/fpdf_page/cpdf_image.h"
#include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
CPDF_Type3Char::CPDF_Type3Char(CPDF_Form* pForm)
: m_pForm(pForm), m_bColored(FALSE) {}
diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp
index 722e74dde5..cff5223a00 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -18,7 +18,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
#include "core/fxcrt/fx_ext.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_freetype.h"
#include "third_party/base/numerics/safe_conversions.h"
#include "third_party/base/stl_util.h"
diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
index 891ca7f9ea..abedcf0708 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
@@ -14,7 +14,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h"
#include "core/fxcrt/fx_ext.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_freetype.h"
namespace {
diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/fpdfapi/fpdf_font/ttgsubtable.cpp
index fb6287ee28..dde7793050 100644
--- a/core/fpdfapi/fpdf_font/ttgsubtable.cpp
+++ b/core/fpdfapi/fpdf_font/ttgsubtable.cpp
@@ -6,7 +6,7 @@
#include "core/fpdfapi/fpdf_font/ttgsubtable.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_freetype.h"
#include "third_party/base/stl_util.h"
CFX_GlyphMap::CFX_GlyphMap() {}
diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/fpdf_font/ttgsubtable.h
index 759eea4036..492a6a21de 100644
--- a/core/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/fpdfapi/fpdf_font/ttgsubtable.h
@@ -13,8 +13,8 @@
#include <memory>
#include "core/fxcrt/fx_basic.h"
-#include "core/fxge/include/fx_font.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_font.h"
+#include "core/fxge/fx_freetype.h"
class CFX_GlyphMap {
public:
diff --git a/core/fpdfapi/fpdf_page/cpdf_allstates.cpp b/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
index 24ec15f3c1..16eb0dfbae 100644
--- a/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_page/pageint.h"
#include "core/fpdfapi/fpdf_parser/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
+#include "core/fxge/cfx_graphstatedata.h"
namespace {
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp b/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp
index c6a5254c0f..e74b884d68 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp
@@ -8,7 +8,7 @@
#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
#include "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
CPDF_ColorState::CPDF_ColorState() {}
diff --git a/core/fpdfapi/fpdf_page/cpdf_generalstate.h b/core/fpdfapi/fpdf_page/cpdf_generalstate.h
index 35562d9706..9bcce04894 100644
--- a/core/fpdfapi/fpdf_page/cpdf_generalstate.h
+++ b/core/fpdfapi/fpdf_page/cpdf_generalstate.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/fx_basic.h"
#include "core/fxcrt/fx_coordinates.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
class CPDF_Object;
class CPDF_TransferFunc;
diff --git a/core/fpdfapi/fpdf_page/cpdf_graphicstates.h b/core/fpdfapi/fpdf_page/cpdf_graphicstates.h
index f52aba27d8..6e612153d0 100644
--- a/core/fpdfapi/fpdf_page/cpdf_graphicstates.h
+++ b/core/fpdfapi/fpdf_page/cpdf_graphicstates.h
@@ -11,7 +11,7 @@
#include "core/fpdfapi/fpdf_page/cpdf_colorstate.h"
#include "core/fpdfapi/fpdf_page/cpdf_generalstate.h"
#include "core/fpdfapi/fpdf_page/cpdf_textstate.h"
-#include "core/fxge/include/cfx_graphstate.h"
+#include "core/fxge/cfx_graphstate.h"
class CPDF_GraphicStates {
public:
diff --git a/core/fpdfapi/fpdf_page/cpdf_image.cpp b/core/fpdfapi/fpdf_page/cpdf_image.cpp
index 5a1f9af037..21cec2e442 100644
--- a/core/fpdfapi/fpdf_page/cpdf_image.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_image.cpp
@@ -20,7 +20,7 @@
#include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
#include "core/fpdfapi/fpdf_render/render_int.h"
#include "core/fxcodec/fx_codec.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
CPDF_Image::CPDF_Image(CPDF_Document* pDoc)
: CPDF_Image(pDoc, nullptr, false) {}
diff --git a/core/fpdfapi/fpdf_page/cpdf_path.h b/core/fpdfapi/fpdf_page/cpdf_path.h
index b4450c171e..3f77b05d5b 100644
--- a/core/fpdfapi/fpdf_page/cpdf_path.h
+++ b/core/fpdfapi/fpdf_page/cpdf_path.h
@@ -9,9 +9,9 @@
#include "core/fxcrt/cfx_count_ref.h"
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/cfx_fxgedevice.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
class CPDF_Path {
public:
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index 41fefa0580..18a2e2d882 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -34,8 +34,8 @@
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
namespace {
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
index 68c6eca210..3c7a301d29 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
@@ -30,8 +30,8 @@
#include "core/fxcodec/fx_codec.h"
#include "core/fxcrt/fx_ext.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "core/fxge/include/cfx_fxgedevice.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_renderdevice.h"
namespace {
diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h
index 2fbc629136..3c10702b9e 100644
--- a/core/fpdfapi/fpdf_page/pageint.h
+++ b/core/fpdfapi/fpdf_page/pageint.h
@@ -18,8 +18,8 @@
#include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h"
#include "core/fxcrt/cfx_string_pool_template.h"
#include "core/fxcrt/cfx_weak_ptr.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
class CPDF_AllStates;
class CPDF_ColorSpace;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
index 30a50f54ae..f90fa3dc78 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_document.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
@@ -21,8 +21,8 @@
#include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
#include "core/fpdfapi/fpdf_render/render_int.h"
#include "core/fxcodec/JBig2_DocumentContext.h"
-#include "core/fxge/include/cfx_unicodeencoding.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/cfx_unicodeencoding.h"
+#include "core/fxge/fx_font.h"
#include "third_party/base/stl_util.h"
namespace {
diff --git a/core/fpdfapi/fpdf_render/cpdf_renderoptions.h b/core/fpdfapi/fpdf_render/cpdf_renderoptions.h
index 73383ae8f0..bb0bcd3651 100644
--- a/core/fpdfapi/fpdf_render/cpdf_renderoptions.h
+++ b/core/fpdfapi/fpdf_render/cpdf_renderoptions.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_RENDER_CPDF_RENDEROPTIONS_H_
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
class CPDF_OCContext;
diff --git a/core/fpdfapi/fpdf_render/cpdf_textrenderer.h b/core/fpdfapi/fpdf_render/cpdf_textrenderer.h
index ca6d91efe6..b758a01570 100644
--- a/core/fpdfapi/fpdf_render/cpdf_textrenderer.h
+++ b/core/fpdfapi/fpdf_render/cpdf_textrenderer.h
@@ -10,7 +10,7 @@
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
class CFX_RenderDevice;
class CFX_GraphStateData;
diff --git a/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp b/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp
index a1856ba5e1..6de46a6376 100644
--- a/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp
+++ b/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp
@@ -12,8 +12,8 @@
#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
#include "core/fpdfapi/fpdf_render/cpdf_type3glyphs.h"
-#include "core/fxge/include/fx_dib.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/fx_dib.h"
+#include "core/fxge/fx_font.h"
namespace {
diff --git a/core/fpdfapi/fpdf_render/cpdf_type3glyphs.cpp b/core/fpdfapi/fpdf_render/cpdf_type3glyphs.cpp
index f450dffa8c..e811c2bd8c 100644
--- a/core/fpdfapi/fpdf_render/cpdf_type3glyphs.cpp
+++ b/core/fpdfapi/fpdf_render/cpdf_type3glyphs.cpp
@@ -8,7 +8,7 @@
#include <map>
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/fx_font.h"
CPDF_Type3Glyphs::CPDF_Type3Glyphs()
: m_TopBlueCount(0), m_BottomBlueCount(0) {}
diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp
index d610670fd5..a87a40afae 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -30,10 +30,10 @@
#include "core/fpdfapi/fpdf_render/cpdf_textrenderer.h"
#include "core/fpdfapi/fpdf_render/cpdf_type3cache.h"
#include "core/fpdfdoc/cpdf_occontext.h"
-#include "core/fxge/include/cfx_fxgedevice.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc)
: m_pPDFDoc(pPDFDoc) {}
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
index 1b7b7db575..d0bca1a17a 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -26,8 +26,8 @@
#include "core/fpdfdoc/cpdf_occontext.h"
#include "core/fxcodec/fx_codec.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "core/fxge/include/cfx_fxgedevice.h"
-#include "core/fxge/include/cfx_pathdata.h"
+#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_pathdata.h"
#ifdef _SKIA_SUPPORT_
#include "core/fxge/skia/fx_skia_device.h"
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
index b31ae211ab..55887204ef 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
@@ -21,10 +21,10 @@
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h"
#include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
-#include "core/fxge/include/cfx_fxgedevice.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
-#include "core/fxge/include/ifx_renderdevicedriver.h"
+#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
+#include "core/fxge/ifx_renderdevicedriver.h"
namespace {
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
index 0f4becf240..1ddf954d86 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
@@ -23,12 +23,12 @@
#include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
#include "core/fpdfapi/fpdf_render/cpdf_textrenderer.h"
#include "core/fpdfapi/fpdf_render/cpdf_type3cache.h"
-#include "core/fxge/include/cfx_facecache.h"
-#include "core/fxge/include/cfx_fxgedevice.h"
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_facecache.h"
+#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
FX_BOOL CPDF_RenderStatus::ProcessText(CPDF_TextObject* textobj,
const CFX_Matrix* pObj2Device,
diff --git a/core/fpdfapi/fpdf_render/render_int.h b/core/fpdfapi/fpdf_render/render_int.h
index b193344ca5..c913d56a7f 100644
--- a/core/fpdfapi/fpdf_render/render_int.h
+++ b/core/fpdfapi/fpdf_render/render_int.h
@@ -16,8 +16,8 @@
#include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
#include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
-#include "core/fxge/include/cfx_fxgedevice.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_renderdevice.h"
class CCodec_Jbig2Context;
class CCodec_ScanlineDecoder;
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index ed43e5bab8..3df5ca5144 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -14,9 +14,9 @@
#include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
#include "core/fpdfdoc/cpvt_generateap.h"
#include "core/fxcrt/fx_memory.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
namespace {
diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp
index d19f9b4b70..7ddbab38a6 100644
--- a/core/fpdfdoc/cpdf_annotlist.cpp
+++ b/core/fpdfdoc/cpdf_annotlist.cpp
@@ -14,7 +14,7 @@
#include "core/fpdfdoc/cpdf_interform.h"
#include "core/fpdfdoc/cpdf_occontext.h"
#include "core/fpdfdoc/cpvt_generateap.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_renderdevice.h"
namespace {
diff --git a/core/fpdfdoc/cpdf_apsettings.h b/core/fpdfdoc/cpdf_apsettings.h
index b2ae2488a1..ffddffdbe0 100644
--- a/core/fpdfdoc/cpdf_apsettings.h
+++ b/core/fpdfdoc/cpdf_apsettings.h
@@ -10,7 +10,7 @@
#include "core/fpdfdoc/cpdf_iconfit.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
class CPDF_Dictionary;
class CPDF_FormControl;
diff --git a/core/fpdfdoc/cpdf_bookmark.cpp b/core/fpdfdoc/cpdf_bookmark.cpp
index fb74567938..191a26df14 100644
--- a/core/fpdfdoc/cpdf_bookmark.cpp
+++ b/core/fpdfdoc/cpdf_bookmark.cpp
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/cpdf_string.h"
#include "core/fpdfdoc/cpdf_nametree.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
uint32_t CPDF_Bookmark::GetColorRef() const {
if (!m_pDict)
diff --git a/core/fpdfdoc/cpdf_defaultappearance.h b/core/fpdfdoc/cpdf_defaultappearance.h
index 70b1bd4583..4507f4f78f 100644
--- a/core/fpdfdoc/cpdf_defaultappearance.h
+++ b/core/fpdfdoc/cpdf_defaultappearance.h
@@ -11,7 +11,7 @@
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
enum class BorderStyle { SOLID, DASH, BEVELED, INSET, UNDERLINE };
enum class PaintOperation { STROKE, FILL };
diff --git a/core/fpdfdoc/cpdf_formcontrol.cpp b/core/fpdfdoc/cpdf_formcontrol.cpp
index 82a416f942..dab59d773a 100644
--- a/core/fpdfdoc/cpdf_formcontrol.cpp
+++ b/core/fpdfdoc/cpdf_formcontrol.cpp
@@ -15,7 +15,7 @@
#include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
#include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h"
#include "core/fpdfdoc/cpdf_interform.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_renderdevice.h"
namespace {
diff --git a/core/fpdfdoc/cpdf_formcontrol.h b/core/fpdfdoc/cpdf_formcontrol.h
index 1ad79ee6f7..e86443402d 100644
--- a/core/fpdfdoc/cpdf_formcontrol.h
+++ b/core/fpdfdoc/cpdf_formcontrol.h
@@ -18,7 +18,7 @@
#include "core/fpdfdoc/ipdf_formnotify.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
#define TEXTPOS_CAPTION 0
#define TEXTPOS_ICON 1
diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp
index 00fff1acb4..624bb45de4 100644
--- a/core/fpdfdoc/cpdf_interform.cpp
+++ b/core/fpdfdoc/cpdf_interform.cpp
@@ -16,8 +16,8 @@
#include "core/fpdfdoc/cpdf_filespec.h"
#include "core/fpdfdoc/cpdf_formcontrol.h"
#include "core/fpdfdoc/cpdf_interform.h"
-#include "core/fxge/include/cfx_substfont.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/cfx_substfont.h"
+#include "core/fxge/fx_font.h"
#include "third_party/base/stl_util.h"
namespace {
diff --git a/core/fpdfdoc/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h
index e57636e821..21edc35b5b 100644
--- a/core/fpdfdoc/cpdf_variabletext.h
+++ b/core/fpdfdoc/cpdf_variabletext.h
@@ -18,7 +18,7 @@
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/fx_font.h"
class CSection;
class IPVT_FontMap;
diff --git a/core/fpdfdoc/cpvt_wordprops.h b/core/fpdfdoc/cpvt_wordprops.h
index ca95755dbd..2b7084116a 100644
--- a/core/fpdfdoc/cpvt_wordprops.h
+++ b/core/fpdfdoc/cpvt_wordprops.h
@@ -9,7 +9,7 @@
#include "core/fpdfdoc/cpdf_variabletext.h"
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
struct CPVT_WordProps {
CPVT_WordProps()
diff --git a/core/fpdfdoc/fpdf_tagged.h b/core/fpdfdoc/fpdf_tagged.h
index da05b79674..da382579ae 100644
--- a/core/fpdfdoc/fpdf_tagged.h
+++ b/core/fpdfdoc/fpdf_tagged.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFDOC_FPDF_TAGGED_H_
#define CORE_FPDFDOC_FPDF_TAGGED_H_
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
class CPDF_Dictionary;
class CPDF_Document;
diff --git a/core/fxcodec/codec/ccodec_progressivedecoder.h b/core/fxcodec/codec/ccodec_progressivedecoder.h
index e51d0739d2..73fec6457e 100644
--- a/core/fxcodec/codec/ccodec_progressivedecoder.h
+++ b/core/fxcodec/codec/ccodec_progressivedecoder.h
@@ -11,7 +11,7 @@
#include "core/fxcodec/fx_codec_def.h"
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
class CCodec_BmpModule;
class CCodec_GifContext;
diff --git a/core/fxcodec/codec/fx_codec_bmp.cpp b/core/fxcodec/codec/fx_codec_bmp.cpp
index c58aefbef7..45025a188f 100644
--- a/core/fxcodec/codec/fx_codec_bmp.cpp
+++ b/core/fxcodec/codec/fx_codec_bmp.cpp
@@ -7,7 +7,7 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/fx_codec.h"
#include "core/fxcodec/lbmp/fx_bmp.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
struct FXBMP_Context {
bmp_decompress_struct_p bmp_ptr;
void* parent_ptr;
diff --git a/core/fxcodec/codec/fx_codec_gif.cpp b/core/fxcodec/codec/fx_codec_gif.cpp
index f02dace23e..8a8d2dcdf5 100644
--- a/core/fxcodec/codec/fx_codec_gif.cpp
+++ b/core/fxcodec/codec/fx_codec_gif.cpp
@@ -7,7 +7,7 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/fx_codec.h"
#include "core/fxcodec/lgif/fx_gif.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
struct FXGIF_Context {
gif_decompress_struct_p gif_ptr;
void* parent_ptr;
diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp
index 16e43f570c..7670516a25 100644
--- a/core/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/fxcodec/codec/fx_codec_jpeg.cpp
@@ -9,7 +9,7 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/fx_codec.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
extern "C" {
#undef FAR
diff --git a/core/fxcodec/codec/fx_codec_png.cpp b/core/fxcodec/codec/fx_codec_png.cpp
index bfbdf6c675..8630887a70 100644
--- a/core/fxcodec/codec/fx_codec_png.cpp
+++ b/core/fxcodec/codec/fx_codec_png.cpp
@@ -8,7 +8,7 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/fx_codec.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
extern "C" {
#undef FAR
diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp
index d468296acd..605e1b573f 100644
--- a/core/fxcodec/codec/fx_codec_progress.cpp
+++ b/core/fxcodec/codec/fx_codec_progress.cpp
@@ -9,7 +9,7 @@
#include <algorithm>
#include "core/fxcodec/fx_codec.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
#include "third_party/base/numerics/safe_math.h"
#define FXCODEC_BLOCK_SIZE 4096
diff --git a/core/fxcodec/codec/fx_codec_tiff.cpp b/core/fxcodec/codec/fx_codec_tiff.cpp
index d4e5ddeeb8..f4fa01aabc 100644
--- a/core/fxcodec/codec/fx_codec_tiff.cpp
+++ b/core/fxcodec/codec/fx_codec_tiff.cpp
@@ -6,7 +6,7 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/fx_codec.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
extern "C" {
#include "third_party/libtiff/tiffiop.h"
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 72548100ae..4f9c85c8a9 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -10,15 +10,15 @@
#include "core/fxcodec/fx_codec.h"
#include "core/fxcrt/fx_memory.h"
+#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/ge/cfx_cliprgn.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/fxge/include/cfx_fxgedevice.h"
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
-#include "core/fxge/include/ifx_renderdevicedriver.h"
+#include "core/fxge/ifx_renderdevicedriver.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/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h
index 6dcd44c31f..0789d022f3 100644
--- a/core/fxge/agg/fx_agg_driver.h
+++ b/core/fxge/agg/fx_agg_driver.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "core/fxge/include/ifx_renderdevicedriver.h"
+#include "core/fxge/ifx_renderdevicedriver.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"
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();
diff --git a/core/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h
index c7cb24365e..b85d4a784a 100644
--- a/core/fxge/apple/apple_int.h
+++ b/core/fxge/apple/apple_int.h
@@ -11,11 +11,11 @@
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
-#include "core/fxge/include/fx_dib.h"
-#include "core/fxge/include/ifx_renderdevicedriver.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
+#include "core/fxge/fx_dib.h"
+#include "core/fxge/ifx_renderdevicedriver.h"
#if _FX_OS_ == _FX_MACOSX_
#include <Carbon/Carbon.h>
diff --git a/core/fxge/apple/cfx_quartzdevice.h b/core/fxge/apple/cfx_quartzdevice.h
index 826309f3d7..75df61b160 100644
--- a/core/fxge/apple/cfx_quartzdevice.h
+++ b/core/fxge/apple/cfx_quartzdevice.h
@@ -9,7 +9,7 @@
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_renderdevice.h"
class CFX_QuartzDevice : public CFX_RenderDevice {
public:
diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp
index 8a0c1e0538..2108d4d2e4 100644
--- a/core/fxge/apple/fx_apple_platform.cpp
+++ b/core/fxge/apple/fx_apple_platform.cpp
@@ -14,13 +14,13 @@
#include "core/fxge/apple/apple_int.h"
#include "core/fxge/apple/cfx_quartzdevice.h"
+#include "core/fxge/cfx_facecache.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/cfx_renderdevice.h"
#include "core/fxge/dib/dib_int.h"
+#include "core/fxge/fx_freetype.h"
#include "core/fxge/ge/cfx_cliprgn.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/fxge/include/cfx_facecache.h"
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/cfx_renderdevice.h"
-#include "core/fxge/include/fx_freetype.h"
#ifndef _SKIA_SUPPORT_
diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp
index addcb6d815..3df88301b1 100644
--- a/core/fxge/apple/fx_mac_imp.cpp
+++ b/core/fxge/apple/fx_mac_imp.cpp
@@ -5,9 +5,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "core/fxge/apple/apple_int.h"
+#include "core/fxge/cfx_gemodule.h"
#include "core/fxge/ge/cfx_folderfontinfo.h"
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/ifx_systemfontinfo.h"
+#include "core/fxge/ifx_systemfontinfo.h"
#if _FX_OS_ == _FX_MACOSX_
diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp
index 9089710778..d3520d7257 100644
--- a/core/fxge/apple/fx_quartz_device.cpp
+++ b/core/fxge/apple/fx_quartz_device.cpp
@@ -11,13 +11,13 @@
#endif
#include "core/fxcrt/fx_memory.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
#include "core/fxge/dib/dib_int.h"
+#include "core/fxge/fx_freetype.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
-#include "core/fxge/include/fx_freetype.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
#include "core/fxge/apple/apple_int.h"
diff --git a/core/fxge/include/cfx_facecache.h b/core/fxge/cfx_facecache.h
index fc1b28b523..98ffe7a928 100644
--- a/core/fxge/include/cfx_facecache.h
+++ b/core/fxge/cfx_facecache.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_FACECACHE_H_
-#define CORE_FXGE_INCLUDE_CFX_FACECACHE_H_
+#ifndef CORE_FXGE_CFX_FACECACHE_H_
+#define CORE_FXGE_CFX_FACECACHE_H_
#include <map>
-#include "core/fxge/include/fx_font.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_font.h"
+#include "core/fxge/fx_freetype.h"
class CFX_FaceCache {
public:
@@ -61,4 +61,4 @@ class CFX_FaceCache {
#endif
};
-#endif // CORE_FXGE_INCLUDE_CFX_FACECACHE_H_
+#endif // CORE_FXGE_CFX_FACECACHE_H_
diff --git a/core/fxge/include/cfx_fontcache.h b/core/fxge/cfx_fontcache.h
index 7fe0de47f1..52ac3fa342 100644
--- a/core/fxge/include/cfx_fontcache.h
+++ b/core/fxge/cfx_fontcache.h
@@ -4,15 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_FONTCACHE_H_
-#define CORE_FXGE_INCLUDE_CFX_FONTCACHE_H_
+#ifndef CORE_FXGE_CFX_FONTCACHE_H_
+#define CORE_FXGE_CFX_FONTCACHE_H_
#include <map>
#include <memory>
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/fx_font.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_font.h"
+#include "core/fxge/fx_freetype.h"
class CFX_FaceCache;
@@ -39,4 +39,4 @@ class CFX_FontCache {
CFX_FTCacheMap m_ExtFaceMap;
};
-#endif // CORE_FXGE_INCLUDE_CFX_FONTCACHE_H_
+#endif // CORE_FXGE_CFX_FONTCACHE_H_
diff --git a/core/fxge/include/cfx_fontmapper.h b/core/fxge/cfx_fontmapper.h
index 0d82855c41..383550b33a 100644
--- a/core/fxge/include/cfx_fontmapper.h
+++ b/core/fxge/cfx_fontmapper.h
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_FONTMAPPER_H_
-#define CORE_FXGE_INCLUDE_CFX_FONTMAPPER_H_
+#ifndef CORE_FXGE_CFX_FONTMAPPER_H_
+#define CORE_FXGE_CFX_FONTMAPPER_H_
#include <memory>
#include <vector>
-#include "core/fxge/include/cfx_fontmgr.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/cfx_fontmgr.h"
+#include "core/fxge/fx_font.h"
class CFX_SubstFont;
@@ -81,4 +81,4 @@ class CFX_FontMapper {
CFX_FontMgr* const m_pFontMgr;
};
-#endif // CORE_FXGE_INCLUDE_CFX_FONTMAPPER_H_
+#endif // CORE_FXGE_CFX_FONTMAPPER_H_
diff --git a/core/fxge/include/cfx_fontmgr.h b/core/fxge/cfx_fontmgr.h
index c8e66aee14..67357e4265 100644
--- a/core/fxge/include/cfx_fontmgr.h
+++ b/core/fxge/cfx_fontmgr.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_FONTMGR_H_
-#define CORE_FXGE_INCLUDE_CFX_FONTMGR_H_
+#ifndef CORE_FXGE_CFX_FONTMGR_H_
+#define CORE_FXGE_CFX_FONTMGR_H_
#include <map>
#include <memory>
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/fx_font.h"
class IFX_SystemFontInfo;
class CFX_FontMapper;
@@ -66,4 +66,4 @@ class CFX_FontMgr {
bool m_FTLibrarySupportsHinting;
};
-#endif // CORE_FXGE_INCLUDE_CFX_FONTMGR_H_
+#endif // CORE_FXGE_CFX_FONTMGR_H_
diff --git a/core/fxge/include/cfx_fxgedevice.h b/core/fxge/cfx_fxgedevice.h
index 7f34f1ca4a..8358e43666 100644
--- a/core/fxge/include/cfx_fxgedevice.h
+++ b/core/fxge/cfx_fxgedevice.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_FXGEDEVICE_H_
-#define CORE_FXGE_INCLUDE_CFX_FXGEDEVICE_H_
+#ifndef CORE_FXGE_CFX_FXGEDEVICE_H_
+#define CORE_FXGE_CFX_FXGEDEVICE_H_
-#include "core/fxge/include/cfx_renderdevice.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/cfx_renderdevice.h"
+#include "core/fxge/fx_dib.h"
class SkPictureRecorder;
@@ -43,4 +43,4 @@ class CFX_FxgeDevice : public CFX_RenderDevice {
bool m_bOwnedBitmap;
};
-#endif // CORE_FXGE_INCLUDE_CFX_FXGEDEVICE_H_
+#endif // CORE_FXGE_CFX_FXGEDEVICE_H_
diff --git a/core/fxge/include/cfx_gemodule.h b/core/fxge/cfx_gemodule.h
index 351c036b52..c5bd841002 100644
--- a/core/fxge/include/cfx_gemodule.h
+++ b/core/fxge/cfx_gemodule.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_GEMODULE_H_
-#define CORE_FXGE_INCLUDE_CFX_GEMODULE_H_
+#ifndef CORE_FXGE_CFX_GEMODULE_H_
+#define CORE_FXGE_CFX_GEMODULE_H_
#include <memory>
-#include "core/fxge/include/cfx_fontmgr.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/cfx_fontmgr.h"
+#include "core/fxge/fx_font.h"
class CCodec_ModuleMgr;
class CFX_FontCache;
@@ -47,4 +47,4 @@ class CFX_GEModule {
const char** m_pUserFontPaths;
};
-#endif // CORE_FXGE_INCLUDE_CFX_GEMODULE_H_
+#endif // CORE_FXGE_CFX_GEMODULE_H_
diff --git a/core/fxge/include/cfx_graphstate.h b/core/fxge/cfx_graphstate.h
index 1faec0db7e..19cd03c8e1 100644
--- a/core/fxge/include/cfx_graphstate.h
+++ b/core/fxge/cfx_graphstate.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_GRAPHSTATE_H_
-#define CORE_FXGE_INCLUDE_CFX_GRAPHSTATE_H_
+#ifndef CORE_FXGE_CFX_GRAPHSTATE_H_
+#define CORE_FXGE_CFX_GRAPHSTATE_H_
#include "core/fxcrt/cfx_count_ref.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
+#include "core/fxge/cfx_graphstatedata.h"
class CPDF_Array;
@@ -41,4 +41,4 @@ class CFX_GraphState {
CFX_CountRef<CFX_GraphStateData> m_Ref;
};
-#endif // CORE_FXGE_INCLUDE_CFX_GRAPHSTATE_H_
+#endif // CORE_FXGE_CFX_GRAPHSTATE_H_
diff --git a/core/fxge/include/cfx_graphstatedata.h b/core/fxge/cfx_graphstatedata.h
index b5f784702d..03e4a8f51a 100644
--- a/core/fxge/include/cfx_graphstatedata.h
+++ b/core/fxge/cfx_graphstatedata.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_GRAPHSTATEDATA_H_
-#define CORE_FXGE_INCLUDE_CFX_GRAPHSTATEDATA_H_
+#ifndef CORE_FXGE_CFX_GRAPHSTATEDATA_H_
+#define CORE_FXGE_CFX_GRAPHSTATEDATA_H_
#include "core/fxcrt/fx_system.h"
@@ -35,4 +35,4 @@ class CFX_GraphStateData {
FX_FLOAT m_LineWidth;
};
-#endif // CORE_FXGE_INCLUDE_CFX_GRAPHSTATEDATA_H_
+#endif // CORE_FXGE_CFX_GRAPHSTATEDATA_H_
diff --git a/core/fxge/include/cfx_pathdata.h b/core/fxge/cfx_pathdata.h
index 56682dd651..e24feb5888 100644
--- a/core/fxge/include/cfx_pathdata.h
+++ b/core/fxge/cfx_pathdata.h
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_PATHDATA_H_
-#define CORE_FXGE_INCLUDE_CFX_PATHDATA_H_
+#ifndef CORE_FXGE_CFX_PATHDATA_H_
+#define CORE_FXGE_CFX_PATHDATA_H_
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_renderdevice.h"
struct FX_PATHPOINT {
FX_FLOAT m_PointX;
@@ -53,4 +53,4 @@ class CFX_PathData {
FX_PATHPOINT* m_pPoints;
};
-#endif // CORE_FXGE_INCLUDE_CFX_PATHDATA_H_
+#endif // CORE_FXGE_CFX_PATHDATA_H_
diff --git a/core/fxge/include/cfx_renderdevice.h b/core/fxge/cfx_renderdevice.h
index f790cdae68..4d7db1235e 100644
--- a/core/fxge/include/cfx_renderdevice.h
+++ b/core/fxge/cfx_renderdevice.h
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_RENDERDEVICE_H_
-#define CORE_FXGE_INCLUDE_CFX_RENDERDEVICE_H_
+#ifndef CORE_FXGE_CFX_RENDERDEVICE_H_
+#define CORE_FXGE_CFX_RENDERDEVICE_H_
#include <memory>
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/fx_dib.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/fx_dib.h"
+#include "core/fxge/fx_font.h"
class CFX_Font;
class CFX_GraphStateData;
@@ -137,12 +137,12 @@ class CFX_RenderDevice {
uint32_t color,
int blend_type);
FX_BOOL DrawCosmeticLine(FX_FLOAT x1,
- FX_FLOAT y1,
- FX_FLOAT x2,
- FX_FLOAT y2,
- uint32_t color,
- int fill_mode,
- int blend_type);
+ FX_FLOAT y1,
+ FX_FLOAT x2,
+ FX_FLOAT y2,
+ uint32_t color,
+ int fill_mode,
+ int blend_type);
FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap, int left, int top);
CFX_DIBitmap* GetBackDrop();
@@ -255,4 +255,4 @@ class CFX_RenderDevice {
std::unique_ptr<IFX_RenderDeviceDriver> m_pDeviceDriver;
};
-#endif // CORE_FXGE_INCLUDE_CFX_RENDERDEVICE_H_
+#endif // CORE_FXGE_CFX_RENDERDEVICE_H_
diff --git a/core/fxge/include/cfx_substfont.h b/core/fxge/cfx_substfont.h
index 8cce389fb3..943f7bf866 100644
--- a/core/fxge/include/cfx_substfont.h
+++ b/core/fxge/cfx_substfont.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_SUBSTFONT_H_
-#define CORE_FXGE_INCLUDE_CFX_SUBSTFONT_H_
+#ifndef CORE_FXGE_CFX_SUBSTFONT_H_
+#define CORE_FXGE_CFX_SUBSTFONT_H_
#include "core/fxcrt/fx_string.h"
@@ -31,4 +31,4 @@ class CFX_SubstFont {
bool m_bItalicCJK;
};
-#endif // CORE_FXGE_INCLUDE_CFX_SUBSTFONT_H_
+#endif // CORE_FXGE_CFX_SUBSTFONT_H_
diff --git a/core/fxge/include/cfx_unicodeencoding.h b/core/fxge/cfx_unicodeencoding.h
index dee785f9df..7d020894c0 100644
--- a/core/fxge/include/cfx_unicodeencoding.h
+++ b/core/fxge/cfx_unicodeencoding.h
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_UNICODEENCODING_H_
-#define CORE_FXGE_INCLUDE_CFX_UNICODEENCODING_H_
+#ifndef CORE_FXGE_CFX_UNICODEENCODING_H_
+#define CORE_FXGE_CFX_UNICODEENCODING_H_
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/fx_font.h"
#define ENCODING_INTERNAL 0
#define ENCODING_UNICODE 1
@@ -43,4 +43,4 @@ class CFX_UnicodeEncoding {
CFX_Font* m_pFont; // Unowned, not nullptr.
};
-#endif // CORE_FXGE_INCLUDE_CFX_UNICODEENCODING_H_
+#endif // CORE_FXGE_CFX_UNICODEENCODING_H_
diff --git a/core/fxge/include/cfx_unicodeencodingex.h b/core/fxge/cfx_unicodeencodingex.h
index 680b8fb6bd..df2edbe1bf 100644
--- a/core/fxge/include/cfx_unicodeencodingex.h
+++ b/core/fxge/cfx_unicodeencodingex.h
@@ -4,17 +4,17 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_UNICODEENCODINGEX_H_
-#define CORE_FXGE_INCLUDE_CFX_UNICODEENCODINGEX_H_
+#ifndef CORE_FXGE_CFX_UNICODEENCODINGEX_H_
+#define CORE_FXGE_CFX_UNICODEENCODINGEX_H_
#include <map>
#include <memory>
#include <vector>
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/cfx_unicodeencoding.h"
-#include "core/fxge/include/fx_dib.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/cfx_unicodeencoding.h"
+#include "core/fxge/fx_dib.h"
+#include "core/fxge/fx_freetype.h"
class CFX_UnicodeEncodingEx : public CFX_UnicodeEncoding {
public:
@@ -34,4 +34,4 @@ CFX_UnicodeEncodingEx* FX_CreateFontEncodingEx(
CFX_Font* pFont,
uint32_t nEncodingID = FXFM_ENCODING_NONE);
-#endif // CORE_FXGE_INCLUDE_CFX_UNICODEENCODINGEX_H_
+#endif // CORE_FXGE_CFX_UNICODEENCODINGEX_H_
diff --git a/core/fxge/include/cfx_windowsdevice.h b/core/fxge/cfx_windowsdevice.h
index 906442d3d9..ec065edd63 100644
--- a/core/fxge/include/cfx_windowsdevice.h
+++ b/core/fxge/cfx_windowsdevice.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_CFX_WINDOWSDEVICE_H_
-#define CORE_FXGE_INCLUDE_CFX_WINDOWSDEVICE_H_
+#ifndef CORE_FXGE_CFX_WINDOWSDEVICE_H_
+#define CORE_FXGE_CFX_WINDOWSDEVICE_H_
#ifdef _WIN32
#ifndef _WINDOWS_
@@ -36,4 +36,4 @@ class CFX_WindowsDevice : public CFX_RenderDevice {
#endif // _WIN32
-#endif // CORE_FXGE_INCLUDE_CFX_WINDOWSDEVICE_H_
+#endif // CORE_FXGE_CFX_WINDOWSDEVICE_H_
diff --git a/core/fxge/dib/dib_int.h b/core/fxge/dib/dib_int.h
index 0a679e2f5f..aa79b73154 100644
--- a/core/fxge/dib/dib_int.h
+++ b/core/fxge/dib/dib_int.h
@@ -10,7 +10,7 @@
#include <stdint.h>
#include "core/fxcrt/fx_coordinates.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
class IFX_ScanlineComposer;
diff --git a/core/fxge/dib/fx_dib_composite.cpp b/core/fxge/dib/fx_dib_composite.cpp
index fa4cc783df..d180b7a831 100644
--- a/core/fxge/dib/fx_dib_composite.cpp
+++ b/core/fxge/dib/fx_dib_composite.cpp
@@ -5,9 +5,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "core/fxcodec/fx_codec.h"
+#include "core/fxge/cfx_gemodule.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/ge/cfx_cliprgn.h"
-#include "core/fxge/include/cfx_gemodule.h"
namespace {
diff --git a/core/fxge/dib/fx_dib_convert.cpp b/core/fxge/dib/fx_dib_convert.cpp
index 829c2113f1..e3ee626fff 100644
--- a/core/fxge/dib/fx_dib_convert.cpp
+++ b/core/fxge/dib/fx_dib_convert.cpp
@@ -5,7 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "core/fxcodec/fx_codec.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
class CFX_Palette {
public:
diff --git a/core/fxge/dib/fx_dib_engine.cpp b/core/fxge/dib/fx_dib_engine.cpp
index e8401d7663..c8e9558888 100644
--- a/core/fxge/dib/fx_dib_engine.cpp
+++ b/core/fxge/dib/fx_dib_engine.cpp
@@ -9,7 +9,7 @@
#include <algorithm>
#include "core/fxge/dib/dib_int.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
namespace {
diff --git a/core/fxge/dib/fx_dib_engine_unittest.cpp b/core/fxge/dib/fx_dib_engine_unittest.cpp
index eed6b52194..105c342a0f 100644
--- a/core/fxge/dib/fx_dib_engine_unittest.cpp
+++ b/core/fxge/dib/fx_dib_engine_unittest.cpp
@@ -10,7 +10,7 @@
#include "core/fpdfapi/fpdf_render/render_int.h"
#include "core/fxcrt/fx_memory.h"
#include "core/fxge/dib/dib_int.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
#include "testing/gtest/include/gtest/gtest.h"
TEST(CStretchEngine, OverflowInCtor) {
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp
index 5b40b850b9..14cd0f4da6 100644
--- a/core/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -4,15 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
#include <limits.h>
#include <algorithm>
#include "core/fxcodec/fx_codec.h"
+#include "core/fxge/cfx_gemodule.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/ge/cfx_cliprgn.h"
-#include "core/fxge/include/cfx_gemodule.h"
void CmykDecode(uint32_t cmyk, int& c, int& m, int& y, int& k) {
c = FXSYS_GetCValue(cmyk);
diff --git a/core/fxge/dib/fx_dib_transform.cpp b/core/fxge/dib/fx_dib_transform.cpp
index 27dbb82fab..a559fee55d 100644
--- a/core/fxge/dib/fx_dib_transform.cpp
+++ b/core/fxge/dib/fx_dib_transform.cpp
@@ -6,7 +6,7 @@
#include "core/fxge/dib/dib_int.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
namespace {
diff --git a/core/fxge/freetype/fx_freetype.cpp b/core/fxge/freetype/fx_freetype.cpp
index 295513d8b3..6aa59fee68 100644
--- a/core/fxge/freetype/fx_freetype.cpp
+++ b/core/fxge/freetype/fx_freetype.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_freetype.h"
#include "third_party/freetype/src/psnames/pstables.h"
diff --git a/core/fxge/include/fx_dib.h b/core/fxge/fx_dib.h
index 2eaa38ab5e..038d103989 100644
--- a/core/fxge/include/fx_dib.h
+++ b/core/fxge/fx_dib.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_FX_DIB_H_
-#define CORE_FXGE_INCLUDE_FX_DIB_H_
+#ifndef CORE_FXGE_FX_DIB_H_
+#define CORE_FXGE_FX_DIB_H_
#include <memory>
#include <vector>
@@ -677,4 +677,4 @@ class CFX_ImageRenderer {
int m_BlendType;
};
-#endif // CORE_FXGE_INCLUDE_FX_DIB_H_
+#endif // CORE_FXGE_FX_DIB_H_
diff --git a/core/fxge/include/fx_font.h b/core/fxge/fx_font.h
index 2151bf65bb..8dda12af50 100644
--- a/core/fxge/include/fx_font.h
+++ b/core/fxge/fx_font.h
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_FX_FONT_H_
-#define CORE_FXGE_INCLUDE_FX_FONT_H_
+#ifndef CORE_FXGE_FX_FONT_H_
+#define CORE_FXGE_FX_FONT_H_
#include <memory>
#include <vector>
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/cfx_substfont.h"
-#include "core/fxge/include/fx_dib.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/cfx_substfont.h"
+#include "core/fxge/fx_dib.h"
+#include "core/fxge/fx_freetype.h"
typedef struct FT_FaceRec_* FXFT_Face;
typedef void* FXFT_Library;
@@ -245,4 +245,4 @@ CFX_ByteString GetNameFromTT(const uint8_t* name_table,
int PDF_GetStandardFontName(CFX_ByteString* name);
-#endif // CORE_FXGE_INCLUDE_FX_FONT_H_
+#endif // CORE_FXGE_FX_FONT_H_
diff --git a/core/fxge/include/fx_freetype.h b/core/fxge/fx_freetype.h
index 533974dc2e..8ead6b755c 100644
--- a/core/fxge/include/fx_freetype.h
+++ b/core/fxge/fx_freetype.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_FX_FREETYPE_H_
-#define CORE_FXGE_INCLUDE_FX_FREETYPE_H_
+#ifndef CORE_FXGE_FX_FREETYPE_H_
+#define CORE_FXGE_FX_FREETYPE_H_
#include <ft2build.h>
#include FT_FREETYPE_H
@@ -177,4 +177,4 @@ void FXFT_adobe_name_from_unicode(char* name, wchar_t unicode);
};
#endif
-#endif // CORE_FXGE_INCLUDE_FX_FREETYPE_H_
+#endif // CORE_FXGE_FX_FREETYPE_H_
diff --git a/core/fxge/ge/cfx_cliprgn.h b/core/fxge/ge/cfx_cliprgn.h
index 5d6176091b..f3fd5856b6 100644
--- a/core/fxge/ge/cfx_cliprgn.h
+++ b/core/fxge/ge/cfx_cliprgn.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_GE_CFX_CLIPRGN_H_
#define CORE_FXGE_GE_CFX_CLIPRGN_H_
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
class CFX_ClipRgn {
public:
diff --git a/core/fxge/ge/cfx_facecache.cpp b/core/fxge/ge/cfx_facecache.cpp
index b78dd5b2ad..c297afb664 100644
--- a/core/fxge/ge/cfx_facecache.cpp
+++ b/core/fxge/ge/cfx_facecache.cpp
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_facecache.h"
+#include "core/fxge/cfx_facecache.h"
#include <algorithm>
+#include "core/fxge/cfx_fontmgr.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_substfont.h"
+#include "core/fxge/fx_freetype.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/fxge/include/cfx_fontmgr.h"
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_substfont.h"
-#include "core/fxge/include/fx_freetype.h"
#include "third_party/base/numerics/safe_math.h"
#ifdef _SKIA_SUPPORT_
diff --git a/core/fxge/ge/cfx_folderfontinfo.cpp b/core/fxge/ge/cfx_folderfontinfo.cpp
index d4fe325576..31608bdf3a 100644
--- a/core/fxge/ge/cfx_folderfontinfo.cpp
+++ b/core/fxge/ge/cfx_folderfontinfo.cpp
@@ -6,8 +6,8 @@
#include "core/fxge/ge/cfx_folderfontinfo.h"
-#include "core/fxge/include/cfx_fontmapper.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/cfx_fontmapper.h"
+#include "core/fxge/fx_font.h"
#include "third_party/base/stl_util.h"
diff --git a/core/fxge/ge/cfx_folderfontinfo.h b/core/fxge/ge/cfx_folderfontinfo.h
index 2a8d05b3fd..ef4645cf53 100644
--- a/core/fxge/ge/cfx_folderfontinfo.h
+++ b/core/fxge/ge/cfx_folderfontinfo.h
@@ -10,9 +10,9 @@
#include <map>
#include <vector>
-#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 CFX_FolderFontInfo : public IFX_SystemFontInfo {
public:
diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp
index 461cf6f57b..737d7c450b 100644
--- a/core/fxge/ge/cfx_font.cpp
+++ b/core/fxge/ge/cfx_font.cpp
@@ -4,17 +4,17 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/fx_font.h"
#include "core/fpdfapi/fpdf_font/cpdf_font.h"
+#include "core/fxge/cfx_facecache.h"
+#include "core/fxge/cfx_fontcache.h"
+#include "core/fxge/cfx_fontmgr.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_substfont.h"
+#include "core/fxge/fx_freetype.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/fxge/include/cfx_facecache.h"
-#include "core/fxge/include/cfx_fontcache.h"
-#include "core/fxge/include/cfx_fontmgr.h"
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_substfont.h"
-#include "core/fxge/include/fx_freetype.h"
#define EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em)
diff --git a/core/fxge/ge/cfx_fontcache.cpp b/core/fxge/ge/cfx_fontcache.cpp
index acae018c83..2a4d243719 100644
--- a/core/fxge/ge/cfx_fontcache.cpp
+++ b/core/fxge/ge/cfx_fontcache.cpp
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_fontcache.h"
+#include "core/fxge/cfx_fontcache.h"
-#include "core/fxge/include/cfx_facecache.h"
-#include "core/fxge/include/fx_font.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/cfx_facecache.h"
+#include "core/fxge/fx_font.h"
+#include "core/fxge/fx_freetype.h"
CFX_FontCache::CountedFaceCache::CountedFaceCache() {}
diff --git a/core/fxge/ge/cfx_fontmapper.cpp b/core/fxge/ge/cfx_fontmapper.cpp
index f383730e8f..86dc2389d6 100644
--- a/core/fxge/ge/cfx_fontmapper.cpp
+++ b/core/fxge/ge/cfx_fontmapper.cpp
@@ -4,15 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_fontmapper.h"
+#include "core/fxge/cfx_fontmapper.h"
#include <memory>
#include <utility>
#include <vector>
-#include "core/fxge/include/cfx_substfont.h"
-#include "core/fxge/include/fx_font.h"
-#include "core/fxge/include/ifx_systemfontinfo.h"
+#include "core/fxge/cfx_substfont.h"
+#include "core/fxge/fx_font.h"
+#include "core/fxge/ifx_systemfontinfo.h"
#include "third_party/base/stl_util.h"
diff --git a/core/fxge/ge/cfx_fontmgr.cpp b/core/fxge/ge/cfx_fontmgr.cpp
index a3cc796a6d..54000e6b5d 100644
--- a/core/fxge/ge/cfx_fontmgr.cpp
+++ b/core/fxge/ge/cfx_fontmgr.cpp
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_fontmgr.h"
+#include "core/fxge/cfx_fontmgr.h"
+#include "core/fxge/cfx_fontmapper.h"
+#include "core/fxge/cfx_substfont.h"
#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
+#include "core/fxge/fx_font.h"
#include "core/fxge/ge/cttfontdesc.h"
-#include "core/fxge/include/cfx_fontmapper.h"
-#include "core/fxge/include/cfx_substfont.h"
-#include "core/fxge/include/fx_font.h"
-#include "core/fxge/include/ifx_systemfontinfo.h"
+#include "core/fxge/ifx_systemfontinfo.h"
namespace {
diff --git a/core/fxge/ge/cfx_gemodule.cpp b/core/fxge/ge/cfx_gemodule.cpp
index 4eb4094304..ed6d6cb32e 100644
--- a/core/fxge/ge/cfx_gemodule.cpp
+++ b/core/fxge/ge/cfx_gemodule.cpp
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_gemodule.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/cfx_fontcache.h"
+#include "core/fxge/cfx_fontmgr.h"
#include "core/fxge/ge/cfx_folderfontinfo.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/fxge/include/cfx_fontcache.h"
-#include "core/fxge/include/cfx_fontmgr.h"
namespace {
diff --git a/core/fxge/ge/cfx_graphstate.cpp b/core/fxge/ge/cfx_graphstate.cpp
index de76987fa9..aaff154e65 100644
--- a/core/fxge/ge/cfx_graphstate.cpp
+++ b/core/fxge/ge/cfx_graphstate.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_graphstate.h"
+#include "core/fxge/cfx_graphstate.h"
#include "core/fpdfapi/fpdf_parser/cpdf_array.h"
diff --git a/core/fxge/ge/cfx_graphstatedata.cpp b/core/fxge/ge/cfx_graphstatedata.cpp
index c03f08624d..03798a6320 100644
--- a/core/fxge/ge/cfx_graphstatedata.cpp
+++ b/core/fxge/ge/cfx_graphstatedata.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_graphstatedata.h"
+#include "core/fxge/cfx_graphstatedata.h"
#include "core/fxcrt/fx_memory.h"
#include "core/fxcrt/fx_system.h"
diff --git a/core/fxge/ge/cfx_pathdata.cpp b/core/fxge/ge/cfx_pathdata.cpp
index 576e404fc3..73476bf271 100644
--- a/core/fxge/ge/cfx_pathdata.cpp
+++ b/core/fxge/ge/cfx_pathdata.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_pathdata.h"
+#include "core/fxge/cfx_pathdata.h"
#include "core/fxcrt/fx_system.h"
#include "third_party/base/numerics/safe_math.h"
diff --git a/core/fxge/ge/cfx_renderdevice.cpp b/core/fxge/ge/cfx_renderdevice.cpp
index 4b479bae25..d11f2e1582 100644
--- a/core/fxge/ge/cfx_renderdevice.cpp
+++ b/core/fxge/ge/cfx_renderdevice.cpp
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_renderdevice.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "core/fxge/include/cfx_facecache.h"
-#include "core/fxge/include/cfx_fxgedevice.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/ifx_renderdevicedriver.h"
+#include "core/fxge/cfx_facecache.h"
+#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/ifx_renderdevicedriver.h"
#if defined _SKIA_SUPPORT_
#include "third_party/skia/include/core/SkTypes.h"
diff --git a/core/fxge/ge/cfx_substfont.cpp b/core/fxge/ge/cfx_substfont.cpp
index 5014af74f2..475372e3d9 100644
--- a/core/fxge/ge/cfx_substfont.cpp
+++ b/core/fxge/ge/cfx_substfont.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_substfont.h"
+#include "core/fxge/cfx_substfont.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/fx_font.h"
CFX_SubstFont::CFX_SubstFont()
: m_Charset(FXFONT_ANSI_CHARSET),
diff --git a/core/fxge/ge/cfx_unicodeencoding.cpp b/core/fxge/ge/cfx_unicodeencoding.cpp
index 456c2f5d49..cba67ba354 100644
--- a/core/fxge/ge/cfx_unicodeencoding.cpp
+++ b/core/fxge/ge/cfx_unicodeencoding.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_unicodeencoding.h"
+#include "core/fxge/cfx_unicodeencoding.h"
-#include "core/fxge/include/fx_font.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_font.h"
+#include "core/fxge/fx_freetype.h"
CFX_UnicodeEncoding::CFX_UnicodeEncoding(CFX_Font* pFont) : m_pFont(pFont) {}
diff --git a/core/fxge/ge/cfx_unicodeencodingex.cpp b/core/fxge/ge/cfx_unicodeencodingex.cpp
index 5ff5b03e50..5bacba42bd 100644
--- a/core/fxge/ge/cfx_unicodeencodingex.cpp
+++ b/core/fxge/ge/cfx_unicodeencodingex.cpp
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_unicodeencodingex.h"
+#include "core/fxge/cfx_unicodeencodingex.h"
#include "core/fpdfapi/fpdf_font/cpdf_font.h"
-#include "core/fxge/include/fx_font.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_font.h"
+#include "core/fxge/fx_freetype.h"
namespace {
diff --git a/core/fxge/ge/cttfontdesc.cpp b/core/fxge/ge/cttfontdesc.cpp
index 31018cb3da..1e4ece4dc1 100644
--- a/core/fxge/ge/cttfontdesc.cpp
+++ b/core/fxge/ge/cttfontdesc.cpp
@@ -6,7 +6,7 @@
#include "core/fxge/ge/cttfontdesc.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_freetype.h"
CTTFontDesc::~CTTFontDesc() {
if (m_Type == 1) {
diff --git a/core/fxge/ge/cttfontdesc.h b/core/fxge/ge/cttfontdesc.h
index 329b9e6bc0..8fc2a34e71 100644
--- a/core/fxge/ge/cttfontdesc.h
+++ b/core/fxge/ge/cttfontdesc.h
@@ -8,7 +8,7 @@
#define CORE_FXGE_GE_CTTFONTDESC_H_
#include "core/fxcrt/fx_system.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/fx_font.h"
#define FX_FONT_FLAG_SERIF 0x01
#define FX_FONT_FLAG_FIXEDPITCH 0x02
diff --git a/core/fxge/ge/fx_ge_fontmap.cpp b/core/fxge/ge/fx_ge_fontmap.cpp
index 2f5410517d..eed5d929b9 100644
--- a/core/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/fxge/ge/fx_ge_fontmap.cpp
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/cfx_fontmapper.h"
-#include "core/fxge/include/ifx_systemfontinfo.h"
+#include "core/fxge/cfx_fontmapper.h"
+#include "core/fxge/ifx_systemfontinfo.h"
static CFX_ByteString GetStringFromTable(const uint8_t* string_ptr,
uint32_t string_ptr_length,
diff --git a/core/fxge/ge/fx_ge_linux.cpp b/core/fxge/ge/fx_ge_linux.cpp
index b13a133bc1..47cee34766 100644
--- a/core/fxge/ge/fx_ge_linux.cpp
+++ b/core/fxge/ge/fx_ge_linux.cpp
@@ -10,10 +10,10 @@
#include <memory>
+#include "core/fxge/cfx_gemodule.h"
#include "core/fxge/ge/cfx_folderfontinfo.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/ifx_systemfontinfo.h"
+#include "core/fxge/ifx_systemfontinfo.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_
namespace {
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index 747fd83178..ca88879d10 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -10,10 +10,10 @@
#include "core/fxcodec/fx_codec.h"
#include "core/fxcrt/fx_safe_types.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/fx_freetype.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/fx_freetype.h"
-#include "core/fxge/include/ifx_renderdevicedriver.h"
+#include "core/fxge/ifx_renderdevicedriver.h"
namespace {
diff --git a/core/fxge/ge/fx_text_int.h b/core/fxge/ge/fx_text_int.h
index 87a9b3eced..4de6587d41 100644
--- a/core/fxge/ge/fx_text_int.h
+++ b/core/fxge/ge/fx_text_int.h
@@ -9,8 +9,8 @@
#include <map>
-#include "core/fxge/include/fx_font.h"
-#include "core/fxge/include/fx_freetype.h"
+#include "core/fxge/fx_font.h"
+#include "core/fxge/fx_freetype.h"
struct _CFX_UniqueKeyGen {
void Generate(int count, ...);
diff --git a/core/fxge/ifx_renderdevicedriver.cpp b/core/fxge/ifx_renderdevicedriver.cpp
index 0c1f922800..6ae1432a11 100644
--- a/core/fxge/ifx_renderdevicedriver.cpp
+++ b/core/fxge/ifx_renderdevicedriver.cpp
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/ifx_renderdevicedriver.h"
+#include "core/fxge/ifx_renderdevicedriver.h"
#include "core/fxcrt/fx_coordinates.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
IFX_RenderDeviceDriver::~IFX_RenderDeviceDriver() {}
diff --git a/core/fxge/include/ifx_renderdevicedriver.h b/core/fxge/ifx_renderdevicedriver.h
index 995e82d654..84e3ebc97b 100644
--- a/core/fxge/include/ifx_renderdevicedriver.h
+++ b/core/fxge/ifx_renderdevicedriver.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_IFX_RENDERDEVICEDRIVER_H_
-#define CORE_FXGE_INCLUDE_IFX_RENDERDEVICEDRIVER_H_
+#ifndef CORE_FXGE_IFX_RENDERDEVICEDRIVER_H_
+#define CORE_FXGE_IFX_RENDERDEVICEDRIVER_H_
#include "core/fxcrt/fx_system.h"
@@ -105,4 +105,4 @@ class IFX_RenderDeviceDriver {
int blend_type);
};
-#endif // CORE_FXGE_INCLUDE_IFX_RENDERDEVICEDRIVER_H_
+#endif // CORE_FXGE_IFX_RENDERDEVICEDRIVER_H_
diff --git a/core/fxge/include/ifx_systemfontinfo.h b/core/fxge/ifx_systemfontinfo.h
index b5bab6fe31..5eb3147c54 100644
--- a/core/fxge/include/ifx_systemfontinfo.h
+++ b/core/fxge/ifx_systemfontinfo.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXGE_INCLUDE_IFX_SYSTEMFONTINFO_H_
-#define CORE_FXGE_INCLUDE_IFX_SYSTEMFONTINFO_H_
+#ifndef CORE_FXGE_IFX_SYSTEMFONTINFO_H_
+#define CORE_FXGE_IFX_SYSTEMFONTINFO_H_
-#include "core/fxge/include/cfx_fontmapper.h"
-#include "core/fxge/include/fx_font.h"
+#include "core/fxge/cfx_fontmapper.h"
+#include "core/fxge/fx_font.h"
const uint32_t kTableNAME = FXDWORD_GET_MSBFIRST("name");
const uint32_t kTableTTCF = FXDWORD_GET_MSBFIRST("ttcf");
@@ -46,4 +46,4 @@ class IFX_SystemFontInfo {
virtual void DeleteFont(void* hFont) = 0;
};
-#endif // CORE_FXGE_INCLUDE_IFX_SYSTEMFONTINFO_H_
+#endif // CORE_FXGE_IFX_SYSTEMFONTINFO_H_
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index be4d57b5c0..6a492dd074 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -14,11 +14,11 @@
#include "core/fpdfapi/fpdf_parser/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
-#include "core/fxge/include/cfx_fxgedevice.h"
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
#include "core/fxge/skia/fx_skia_device.h"
#include "third_party/skia/include/core/SkCanvas.h"
diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
index 78d8e32ebc..eb5063aafb 100644
--- a/core/fxge/skia/fx_skia_device.h
+++ b/core/fxge/skia/fx_skia_device.h
@@ -7,8 +7,8 @@
#if defined(_SKIA_SUPPORT_)
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/ifx_renderdevicedriver.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/ifx_renderdevicedriver.h"
class SkCanvas;
class SkMatrix;
diff --git a/core/fxge/skia/fx_skia_device_unittest.cpp b/core/fxge/skia/fx_skia_device_unittest.cpp
index 5666feea9f..4cb459b140 100644
--- a/core/fxge/skia/fx_skia_device_unittest.cpp
+++ b/core/fxge/skia/fx_skia_device_unittest.cpp
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fxge/include/cfx_fxgedevice.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_renderdevice.h"
+#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_renderdevice.h"
#include "core/fxge/skia/fx_skia_device.h"
#include "fpdfsdk/include/fsdk_define.h"
#include "public/fpdfview.h"
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index d2aa5ff0ec..8e689240dd 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -20,17 +20,17 @@
#include "core/fxge/agg/fx_agg_driver.h"
#endif
+#include "core/fxge/cfx_fontmapper.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/cfx_windowsdevice.h"
#include "core/fxge/dib/dib_int.h"
+#include "core/fxge/fx_font.h"
+#include "core/fxge/fx_freetype.h"
#include "core/fxge/ge/cfx_folderfontinfo.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/fxge/include/cfx_fontmapper.h"
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/cfx_windowsdevice.h"
-#include "core/fxge/include/fx_font.h"
-#include "core/fxge/include/fx_freetype.h"
-#include "core/fxge/include/ifx_systemfontinfo.h"
+#include "core/fxge/ifx_systemfontinfo.h"
#include "core/fxge/win32/cfx_windowsdib.h"
#include "core/fxge/win32/dwrite_int.h"
#include "core/fxge/win32/win32_int.h"
diff --git a/core/fxge/win32/fx_win32_dib.cpp b/core/fxge/win32/fx_win32_dib.cpp
index 7ab64ca961..cd48ad25b5 100644
--- a/core/fxge/win32/fx_win32_dib.cpp
+++ b/core/fxge/win32/fx_win32_dib.cpp
@@ -9,7 +9,7 @@
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
#include <windows.h>
-#include "core/fxge/include/cfx_gemodule.h"
+#include "core/fxge/cfx_gemodule.h"
#include "core/fxge/win32/cfx_windowsdib.h"
#include "core/fxge/win32/win32_int.h"
diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp
index 7094da5527..d3135a249c 100644
--- a/core/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/fxge/win32/fx_win32_gdipext.cpp
@@ -17,9 +17,9 @@ using std::max;
#include <gdiplus.h>
-#include "core/fxge/include/cfx_gemodule.h"
-#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxge/include/cfx_pathdata.h"
+#include "core/fxge/cfx_gemodule.h"
+#include "core/fxge/cfx_graphstatedata.h"
+#include "core/fxge/cfx_pathdata.h"
#include "core/fxge/win32/cfx_windowsdib.h"
#include "core/fxge/win32/win32_int.h"
diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp
index 5372c19e84..b83714d3e0 100644
--- a/core/fxge/win32/fx_win32_print.cpp
+++ b/core/fxge/win32/fx_win32_print.cpp
@@ -12,11 +12,11 @@
#include <algorithm>
+#include "core/fxge/cfx_renderdevice.h"
+#include "core/fxge/cfx_windowsdevice.h"
#include "core/fxge/dib/dib_int.h"
+#include "core/fxge/fx_freetype.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/fxge/include/cfx_renderdevice.h"
-#include "core/fxge/include/cfx_windowsdevice.h"
-#include "core/fxge/include/fx_freetype.h"
#include "core/fxge/win32/win32_int.h"
#if defined(PDFIUM_PRINT_TEXT_WITH_GDI)
diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h
index 7e35793675..0cea52b908 100644
--- a/core/fxge/win32/win32_int.h
+++ b/core/fxge/win32/win32_int.h
@@ -7,8 +7,8 @@
#ifndef CORE_FXGE_WIN32_WIN32_INT_H_
#define CORE_FXGE_WIN32_WIN32_INT_H_
-#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxge/include/ifx_renderdevicedriver.h"
+#include "core/fxge/cfx_pathdata.h"
+#include "core/fxge/ifx_renderdevicedriver.h"
#include "core/fxge/win32/dwrite_int.h"
struct FXTEXT_CHARPOS;