Move core/fxge/include to core/fxge BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2377393002
diff --git a/BUILD.gn b/BUILD.gn index 0c3bd09..315eaa2 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -758,6 +758,19 @@ "core/fxge/apple/cfx_quartzdevice.h", "core/fxge/apple/fx_mac_imp.cpp", "core/fxge/apple/fx_quartz_device.cpp", + "core/fxge/cfx_facecache.h", + "core/fxge/cfx_fontcache.h", + "core/fxge/cfx_fontmapper.h", + "core/fxge/cfx_fontmgr.h", + "core/fxge/cfx_fxgedevice.h", + "core/fxge/cfx_gemodule.h", + "core/fxge/cfx_graphstate.h", + "core/fxge/cfx_graphstatedata.h", + "core/fxge/cfx_pathdata.h", + "core/fxge/cfx_renderdevice.h", + "core/fxge/cfx_substfont.h", + "core/fxge/cfx_unicodeencoding.h", + "core/fxge/cfx_windowsdevice.h", "core/fxge/dib/dib_int.h", "core/fxge/dib/fx_dib_composite.cpp", "core/fxge/dib/fx_dib_convert.cpp", @@ -782,6 +795,9 @@ "core/fxge/fontdata/chromefontdata/FoxitSymbol.cpp", "core/fxge/fontdata/chromefontdata/chromefontdata.h", "core/fxge/freetype/fx_freetype.cpp", + "core/fxge/fx_dib.h", + "core/fxge/fx_font.h", + "core/fxge/fx_freetype.h", "core/fxge/ge/cfx_cliprgn.cpp", "core/fxge/ge/cfx_cliprgn.h", "core/fxge/ge/cfx_facecache.cpp", @@ -805,24 +821,8 @@ "core/fxge/ge/fx_ge_text.cpp", "core/fxge/ge/fx_text_int.h", "core/fxge/ifx_renderdevicedriver.cpp", - "core/fxge/include/cfx_facecache.h", - "core/fxge/include/cfx_fontcache.h", - "core/fxge/include/cfx_fontmapper.h", - "core/fxge/include/cfx_fontmgr.h", - "core/fxge/include/cfx_fxgedevice.h", - "core/fxge/include/cfx_gemodule.h", - "core/fxge/include/cfx_graphstate.h", - "core/fxge/include/cfx_graphstatedata.h", - "core/fxge/include/cfx_pathdata.h", - "core/fxge/include/cfx_renderdevice.h", - "core/fxge/include/cfx_substfont.h", - "core/fxge/include/cfx_unicodeencoding.h", - "core/fxge/include/cfx_windowsdevice.h", - "core/fxge/include/fx_dib.h", - "core/fxge/include/fx_font.h", - "core/fxge/include/fx_freetype.h", - "core/fxge/include/ifx_renderdevicedriver.h", - "core/fxge/include/ifx_systemfontinfo.h", + "core/fxge/ifx_renderdevicedriver.h", + "core/fxge/ifx_systemfontinfo.h", "core/fxge/win32/cfx_windowsdib.h", ] @@ -837,8 +837,8 @@ if (pdf_enable_xfa) { sources += [ + "core/fxge/cfx_unicodeencodingex.h", "core/fxge/ge/cfx_unicodeencodingex.cpp", - "core/fxge/include/cfx_unicodeencodingex.h", ] }
diff --git a/core/fpdfapi/cpdf_pagerendercontext.cpp b/core/fpdfapi/cpdf_pagerendercontext.cpp index e9a6f54..dc58362 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 fd9a666..9b6fc5e 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 00fcfd7..04f942c 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 8704aea..e373e01 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 94d8a99..dda6423 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 c6b8eb6..08c3e11 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 04b872f..d80d59a 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 c97e26d..a11f319 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 722e74d..cff5223 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 891ca7f..abedcf0 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 fb6287e..dde7793 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 759eea4..492a6a2 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 24ec15f..16eb0df 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 c6a5254..e74b884 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 35562d9..9bcce04 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 f52aba2..6e61215 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 5a1f9af..21cec2e 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 b4450c1..3f77b05 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 41fefa0..18a2e2d 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 68c6eca..3c7a301 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 2fbc629..3c10702 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 30a50f5..f90fa3d 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 73383ae..bb0bcd3 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 ca6d91e..b758a01 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 a1856ba..6de46a6 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 f450dff..e811c2b 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 d610670..a87a40a 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 1b7b7db..d0bca1a 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 b31ae21..5588720 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 0f4becf..1ddf954 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 b193344..c913d56 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 ed43e5b..3df5ca5 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 d19f9b4..7ddbab3 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 b2ae248..ffddffd 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 fb74567..191a26d 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 70b1bd4..4507f4f 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 82a416f..dab59d7 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 1ad79ee..e864434 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 00fff1a..624bb45 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 e57636e..21edc35 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 ca95755..2b70841 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 da05b79..da38257 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 e51d073..73fec64 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 c58aefb..45025a1 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 f02dace..8a8d2dc 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 16e43f5..7670516 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 bfbdf6c..8630887 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 d468296..605e1b5 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 d4e5dde..f4fa01a 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 7254810..4f9c85c 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 6dcd44c..0789d02 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 b154ec4..58e4722 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 eb5bc44..1a95262 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 67b58d7..9452c11 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 a0c9f5b..897e21f 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 1c17432..2ffc897 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 e9fbb36..5b75d9d 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 79222b0..6e9dafc 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 c7cb243..b85d4a7 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 826309f..75df61b 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 8a0c1e0..2108d4d 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 addcb6d..3df8830 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 9089710..d3520d7 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 similarity index 91% rename from core/fxge/include/cfx_facecache.h rename to core/fxge/cfx_facecache.h index fc1b28b..98ffe7a 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 @@ #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 similarity index 80% rename from core/fxge/include/cfx_fontcache.h rename to core/fxge/cfx_fontcache.h index 7fe0de4..52ac3fa 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 @@ 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 similarity index 92% rename from core/fxge/include/cfx_fontmapper.h rename to core/fxge/cfx_fontmapper.h index 0d82855..383550b 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 @@ 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 similarity index 93% rename from core/fxge/include/cfx_fontmgr.h rename to core/fxge/cfx_fontmgr.h index c8e66ae..67357e4 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 @@ 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 similarity index 84% rename from core/fxge/include/cfx_fxgedevice.h rename to core/fxge/cfx_fxgedevice.h index 7f34f1c..8358e43 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 @@ 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 similarity index 83% rename from core/fxge/include/cfx_gemodule.h rename to core/fxge/cfx_gemodule.h index 351c036..c5bd841 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 @@ 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 similarity index 84% rename from core/fxge/include/cfx_graphstate.h rename to core/fxge/cfx_graphstate.h index 1faec0d..19cd03c 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 @@ 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 similarity index 84% rename from core/fxge/include/cfx_graphstatedata.h rename to core/fxge/cfx_graphstatedata.h index b5f7847..03e4a8f 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 @@ 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 similarity index 90% rename from core/fxge/include/cfx_pathdata.h rename to core/fxge/cfx_pathdata.h index 56682dd..e24feb5 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 @@ 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 similarity index 93% rename from core/fxge/include/cfx_renderdevice.h rename to core/fxge/cfx_renderdevice.h index f790cda..4d7db12 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 @@ 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 @@ 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 similarity index 84% rename from core/fxge/include/cfx_substfont.h rename to core/fxge/cfx_substfont.h index 8cce389..943f7bf 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 @@ 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 similarity index 89% rename from core/fxge/include/cfx_unicodeencoding.h rename to core/fxge/cfx_unicodeencoding.h index dee785f..7d02089 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 @@ 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 similarity index 73% rename from core/fxge/include/cfx_unicodeencodingex.h rename to core/fxge/cfx_unicodeencodingex.h index 680b8fb..df2edbe 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_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 similarity index 86% rename from core/fxge/include/cfx_windowsdevice.h rename to core/fxge/cfx_windowsdevice.h index 906442d..ec065ed 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 @@ #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 0a679e2..aa79b73 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 fa4cc78..d180b7a 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 829c211..e3ee626 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 e8401d7..c8e9558 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 eed6b52..105c342 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 5b40b85..14cd0f4 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 27dbb82..a559fee 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 295513d..6aa59fe 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 similarity index 99% rename from core/fxge/include/fx_dib.h rename to core/fxge/fx_dib.h index 2eaa38a..038d103 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 @@ 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 similarity index 96% rename from core/fxge/include/fx_font.h rename to core/fxge/fx_font.h index 2151bf6..8dda12a 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 @@ 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 similarity index 98% rename from core/fxge/include/fx_freetype.h rename to core/fxge/fx_freetype.h index 533974d..8ead6b7 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 @@ }; #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 5d61760..f3fd585 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 b78dd5b..c297afb 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 d4fe325..31608bd 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 2a8d05b..ef4645c 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 461cf6f..737d7c4 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 acae018..2a4d243 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 f383730..86dc238 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 a3cc796..54000e6 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 4eb4094..ed6d6cb 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 de76987..aaff154 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 c03f086..03798a6 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 576e404..73476bf 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 4b479ba..d11f2e1 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 5014af7..475372e 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 456c2f5..cba67ba 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 5ff5b03..5bacba4 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 31018cb..1e4ece4 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 329b9e6..8fc2a34 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 2f54105..eed5d92 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 b13a133..47cee34 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 747fd83..ca88879 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 87a9b3e..4de6587 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 0c1f922..6ae1432 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 similarity index 96% rename from core/fxge/include/ifx_renderdevicedriver.h rename to core/fxge/ifx_renderdevicedriver.h index 995e82d..84e3ebc 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 @@ 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 similarity index 86% rename from core/fxge/include/ifx_systemfontinfo.h rename to core/fxge/ifx_systemfontinfo.h index b5bab6f..5eb3147 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 @@ 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 be4d57b..6a492dd 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 78d8e32..eb5063a 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 5666fee..4cb459b 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 d2aa5ff..8e68924 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 7ab64ca..cd48ad2 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 7094da5..d3135a2 100644 --- a/core/fxge/win32/fx_win32_gdipext.cpp +++ b/core/fxge/win32/fx_win32_gdipext.cpp
@@ -17,9 +17,9 @@ #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 5372c19..b83714d 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 7e35793..0cea52b 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;
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index d01574d..0fed7f3 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS
@@ -8,7 +8,7 @@ '+core/fpdfdoc', '+core/fxcodec', '+core/fxcrt', - '+core/fxge/include', + '+core/fxge', '+public', '+v8', '+xfa/fwl/core/include',
diff --git a/fpdfsdk/cfx_systemhandler.cpp b/fpdfsdk/cfx_systemhandler.cpp index c7d81d5..03a7374 100644 --- a/fpdfsdk/cfx_systemhandler.cpp +++ b/fpdfsdk/cfx_systemhandler.cpp
@@ -9,9 +9,9 @@ #include <memory> #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fxge/include/cfx_fontmapper.h" -#include "core/fxge/include/cfx_fontmgr.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_fontmapper.h" +#include "core/fxge/cfx_fontmgr.h" +#include "core/fxge/cfx_gemodule.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/include/cpdfsdk_annot.h" #include "fpdfsdk/include/cpdfsdk_document.h"
diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp index 9afd30b..eb257cc 100644 --- a/fpdfsdk/cpdfsdk_interform.cpp +++ b/fpdfsdk/cpdfsdk_interform.cpp
@@ -17,9 +17,9 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfdoc/cpdf_actionfields.h" #include "core/fpdfdoc/cpdf_interform.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" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/include/cba_annotiterator.h"
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index 284fe8a..d41f892 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -16,9 +16,9 @@ #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fpdfdoc/cpdf_iconfit.h" #include "core/fpdfdoc/cpdf_interform.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" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/include/cpdfsdk_document.h"
diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp index 60e17a3..43932a3 100644 --- a/fpdfsdk/formfiller/cba_fontmap.cpp +++ b/fpdfsdk/formfiller/cba_fontmap.cpp
@@ -13,7 +13,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfdoc/cpdf_formfield.h" -#include "core/fxge/include/cfx_substfont.h" +#include "core/fxge/cfx_substfont.h" #include "fpdfsdk/include/cpdfsdk_annot.h" CBA_FontMap::CBA_FontMap(CPDFSDK_Annot* pAnnot,
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 64a7636..ca3c8f0 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -7,7 +7,7 @@ #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h"
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp index 1289bec..dd30b8e 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -8,9 +8,9 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.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" #include "fpdfsdk/formfiller/cffl_checkbox.h" #include "fpdfsdk/formfiller/cffl_combobox.h" #include "fpdfsdk/formfiller/cffl_formfiller.h"
diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp index 4722a9f..70eff8b 100644 --- a/fpdfsdk/fpdf_progressive.cpp +++ b/fpdfsdk/fpdf_progressive.cpp
@@ -10,8 +10,8 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h" #include "core/fxcrt/fx_memory.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" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fsdk_pauseadapter.h" #include "public/fpdfview.h"
diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp index c5eab95..a50a8ba 100644 --- a/fpdfsdk/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/fpdf_sysfontinfo.cpp
@@ -6,10 +6,10 @@ #include "public/fpdf_sysfontinfo.h" -#include "core/fxge/include/cfx_fontmapper.h" -#include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/fx_font.h" -#include "core/fxge/include/ifx_systemfontinfo.h" +#include "core/fxge/cfx_fontmapper.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/fx_font.h" +#include "core/fxge/ifx_systemfontinfo.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/pdfwindow/PWL_FontMap.h"
diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp index 4fb0a50..dfc0ea0 100644 --- a/fpdfsdk/fpdf_transformpage.cpp +++ b/fpdfsdk/fpdf_transformpage.cpp
@@ -15,7 +15,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_number.h" #include "core/fpdfapi/fpdf_parser/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" -#include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/cfx_pathdata.h" #include "fpdfsdk/include/fsdk_define.h" namespace {
diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 11d4467..dfa63da 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp
@@ -16,7 +16,7 @@ #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fpdfdoc/cpdf_interform.h" #include "core/fpdfdoc/cpdf_occontext.h" -#include "core/fxge/include/cfx_fxgedevice.h" +#include "core/fxge/cfx_fxgedevice.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_interform.h"
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 5f115f2..50831d6 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp
@@ -24,8 +24,8 @@ #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/fx_safe_types.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" #include "fpdfsdk/include/cpdfsdk_pageview.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fsdk_pauseadapter.h" @@ -43,7 +43,7 @@ #endif // PDF_ENABLE_XFA #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -#include "core/fxge/include/cfx_windowsdevice.h" +#include "core/fxge/cfx_windowsdevice.h" #endif UnderlyingDocumentType* UnderlyingFromFPDFDocument(FPDF_DOCUMENT doc) {
diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index db299e5..bed91dc 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp
@@ -21,9 +21,9 @@ #include "core/fpdfdoc/cpvt_section.h" #include "core/fpdfdoc/cpvt_word.h" #include "core/fpdfdoc/ipvt_fontmap.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" #include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/fxedit/include/fx_edit.h" #include "fpdfsdk/pdfwindow/PWL_Edit.h"
diff --git a/fpdfsdk/include/cpdfsdk_interform.h b/fpdfsdk/include/cpdfsdk_interform.h index 6bea3cf..133fe90 100644 --- a/fpdfsdk/include/cpdfsdk_interform.h +++ b/fpdfsdk/include/cpdfsdk_interform.h
@@ -13,7 +13,7 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/ipdf_formnotify.h" #include "core/fxcrt/fx_basic.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" class CPDF_Dictionary; class CPDF_FormControl;
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index d9c9b46..ec99dbb 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h
@@ -8,7 +8,7 @@ #define FPDFSDK_INCLUDE_FSDK_DEFINE_H_ #include "core/fpdfapi/fpdf_parser/cpdf_parser.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "public/fpdfview.h" #ifdef PDF_ENABLE_XFA
diff --git a/fpdfsdk/pdfwindow/PWL_Caret.cpp b/fpdfsdk/pdfwindow/PWL_Caret.cpp index 62f424b..0965ce1 100644 --- a/fpdfsdk/pdfwindow/PWL_Caret.cpp +++ b/fpdfsdk/pdfwindow/PWL_Caret.cpp
@@ -6,9 +6,9 @@ #include "fpdfsdk/pdfwindow/PWL_Caret.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" #include "fpdfsdk/pdfwindow/PWL_Utils.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
diff --git a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp index c02b268..ad39076 100644 --- a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp +++ b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
@@ -6,8 +6,8 @@ #include "fpdfsdk/pdfwindow/PWL_ComboBox.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" #include "fpdfsdk/fxedit/include/fxet_list.h" #include "fpdfsdk/pdfwindow/PWL_Edit.h" #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp index 8c02607..c5e9287 100644 --- a/fpdfsdk/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
@@ -12,10 +12,10 @@ #include "core/fpdfdoc/cpvt_word.h" #include "core/fxcrt/fx_safe_types.h" #include "core/fxcrt/fx_xml.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_font.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/fx_font.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_Caret.h" #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp index c99af4d..8452feb 100644 --- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp +++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
@@ -8,7 +8,7 @@ #include "core/fpdfdoc/cpvt_section.h" #include "core/fpdfdoc/cpvt_word.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_font.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_Caret.h" #include "fpdfsdk/pdfwindow/PWL_FontMap.h"
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h index 3dcd339..5acba98 100644 --- a/fpdfsdk/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/pdfwindow/PWL_FontMap.h
@@ -10,7 +10,7 @@ #include <memory> #include "core/fpdfdoc/ipvt_fontmap.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_font.h" #include "fpdfsdk/fxedit/include/fx_edit.h" #include "public/fpdf_sysfontinfo.h"
diff --git a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp index 17f62f5..684f6c3 100644 --- a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp +++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
@@ -6,8 +6,8 @@ #include "fpdfsdk/pdfwindow/PWL_ScrollBar.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" #include "fpdfsdk/pdfwindow/PWL_Utils.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
diff --git a/fpdfsdk/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp index 4b19fd5..6503fc6 100644 --- a/fpdfsdk/pdfwindow/PWL_Utils.cpp +++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp
@@ -9,9 +9,9 @@ #include <algorithm> #include "core/fpdfdoc/cpvt_word.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" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_Icon.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
diff --git a/xfa/DEPS b/xfa/DEPS index fc47df4..02e836e 100644 --- a/xfa/DEPS +++ b/xfa/DEPS
@@ -1,6 +1,6 @@ include_rules = [ '+core/fxcrt', '+core/fpdfapi/fpdf_parser', - '+core/fxge/include', + '+core/fxge', '+third_party/bigint' ]
diff --git a/xfa/fde/cfde_path.h b/xfa/fde/cfde_path.h index 54bebf3..34619d4 100644 --- a/xfa/fde/cfde_path.h +++ b/xfa/fde/cfde_path.h
@@ -7,8 +7,8 @@ #ifndef XFA_FDE_CFDE_PATH_H_ #define XFA_FDE_CFDE_PATH_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" #include "xfa/fgas/crt/fgas_memory.h" class CFDE_Path : public CFX_Target {
diff --git a/xfa/fde/css/fde_css.h b/xfa/fde/css/fde_css.h index 74a0ef6..5b033cf 100644 --- a/xfa/fde/css/fde_css.h +++ b/xfa/fde/css/fde_css.h
@@ -7,7 +7,7 @@ #ifndef XFA_FDE_CSS_FDE_CSS_H_ #define XFA_FDE_CSS_FDE_CSS_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fgas/crt/fgas_stream.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/font/fgas_font.h"
diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/fde_gedevice.cpp index 15c849f..076e70d 100644 --- a/xfa/fde/fde_gedevice.cpp +++ b/xfa/fde/fde_gedevice.cpp
@@ -8,10 +8,10 @@ #include <algorithm> -#include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_renderdevice.h" -#include "core/fxge/include/cfx_substfont.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/cfx_substfont.h" #include "xfa/fde/cfde_path.h" #include "xfa/fde/fde_object.h" #include "xfa/fgas/font/fgas_font.h"
diff --git a/xfa/fde/fde_gedevice.h b/xfa/fde/fde_gedevice.h index e3b9208..d290f16 100644 --- a/xfa/fde/fde_gedevice.h +++ b/xfa/fde/fde_gedevice.h
@@ -7,7 +7,7 @@ #ifndef XFA_FDE_FDE_GEDEVICE_H_ #define XFA_FDE_FDE_GEDEVICE_H_ -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_renderdevice.h" #include "xfa/fgas/crt/fgas_memory.h" class CFDE_Brush;
diff --git a/xfa/fde/fde_object.h b/xfa/fde/fde_object.h index 2af18ec..bf1ec41 100644 --- a/xfa/fde/fde_object.h +++ b/xfa/fde/fde_object.h
@@ -9,7 +9,7 @@ #include <cstdint> -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fgas/crt/fgas_memory.h" class CFDE_Brush : public CFX_Target {
diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/fde_visualset.h index 45b9391..103e725 100644 --- a/xfa/fde/fde_visualset.h +++ b/xfa/fde/fde_visualset.h
@@ -9,7 +9,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fde/cfde_path.h" #include "xfa/fde/fde_object.h" #include "xfa/fgas/crt/fgas_memory.h"
diff --git a/xfa/fde/ifde_txtedtengine.h b/xfa/fde/ifde_txtedtengine.h index cf76003..cb9ec55 100644 --- a/xfa/fde/ifde_txtedtengine.h +++ b/xfa/fde/ifde_txtedtengine.h
@@ -7,7 +7,7 @@ #ifndef XFA_FDE_IFDE_TXTEDTENGINE_H_ #define XFA_FDE_IFDE_TXTEDTENGINE_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fgas/font/fgas_font.h" class CFDE_TxtEdtEngine;
diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index 6ce32d2..3415471 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h
@@ -10,9 +10,9 @@ #include <memory> #include <vector> -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_renderdevice.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/fx_dib.h" #include "xfa/fde/fde_object.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/font/fgas_font.h"
diff --git a/xfa/fgas/font/fgas_font.h b/xfa/fgas/font/fgas_font.h index f91c015..07bfc1d 100644 --- a/xfa/fgas/font/fgas_font.h +++ b/xfa/fgas/font/fgas_font.h
@@ -7,7 +7,7 @@ #ifndef XFA_FGAS_FONT_FGAS_FONT_H_ #define XFA_FGAS_FONT_FGAS_FONT_H_ -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_font.h" #include "xfa/fgas/crt/fgas_stream.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp index c272f91..08cb80e 100644 --- a/xfa/fgas/font/fgas_gefont.cpp +++ b/xfa/fgas/font/fgas_gefont.cpp
@@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "core/fxge/include/cfx_substfont.h" -#include "core/fxge/include/cfx_unicodeencoding.h" -#include "core/fxge/include/cfx_unicodeencodingex.h" +#include "core/fxge/cfx_substfont.h" +#include "core/fxge/cfx_unicodeencoding.h" +#include "core/fxge/cfx_unicodeencodingex.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fgas/font/fgas_fontutils.h" #include "xfa/fxfa/include/xfa_fontmgr.h"
diff --git a/xfa/fgas/font/fgas_stdfontmgr.cpp b/xfa/fgas/font/fgas_stdfontmgr.cpp index 93f1a7a..de72628 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.cpp +++ b/xfa/fgas/font/fgas_stdfontmgr.cpp
@@ -7,10 +7,10 @@ #include "xfa/fgas/font/fgas_stdfontmgr.h" #include "core/fxcrt/fx_stream.h" -#include "core/fxge/include/cfx_fontmapper.h" -#include "core/fxge/include/cfx_fontmgr.h" -#include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/ifx_systemfontinfo.h" +#include "core/fxge/cfx_fontmapper.h" +#include "core/fxge/cfx_fontmgr.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/ifx_systemfontinfo.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fgas/font/fgas_fontutils.h" #include "xfa/fgas/font/fgas_gefont.h"
diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h index f2d87b9..9d5cb68 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.h +++ b/xfa/fgas/font/fgas_stdfontmgr.h
@@ -10,9 +10,9 @@ #include <vector> #include "core/fxcrt/fx_ext.h" -#include "core/fxge/include/cfx_fontmapper.h" -#include "core/fxge/include/fx_freetype.h" -#include "core/fxge/include/ifx_systemfontinfo.h" +#include "core/fxge/cfx_fontmapper.h" +#include "core/fxge/fx_freetype.h" +#include "core/fxge/ifx_systemfontinfo.h" #include "third_party/freetype/include/freetype/fttypes.h" #include "xfa/fgas/font/fgas_font.h"
diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h index 062646f..d8464ab 100644 --- a/xfa/fgas/layout/fgas_textbreak.h +++ b/xfa/fgas/layout/fgas_textbreak.h
@@ -10,7 +10,7 @@ #include <memory> #include "core/fxcrt/fx_ucd.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_renderdevice.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/layout/fgas_unicode.h"
diff --git a/xfa/fwl/basewidget/cfx_barcode.h b/xfa/fwl/basewidget/cfx_barcode.h index 7665476..da2aabf 100644 --- a/xfa/fwl/basewidget/cfx_barcode.h +++ b/xfa/fwl/basewidget/cfx_barcode.h
@@ -12,7 +12,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" #include "xfa/fxbarcode/include/BC_Library.h" class CBC_CodeBase;
diff --git a/xfa/fwl/core/cfwl_themebackground.h b/xfa/fwl/core/cfwl_themebackground.h index 9761183..54d58b3 100644 --- a/xfa/fwl/core/cfwl_themebackground.h +++ b/xfa/fwl/core/cfwl_themebackground.h
@@ -7,7 +7,7 @@ #ifndef XFA_FWL_CORE_CFWL_THEMEBACKGROUND_H_ #define XFA_FWL_CORE_CFWL_THEMEBACKGROUND_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fwl/core/cfwl_themepart.h" class CFX_DIBitmpa;
diff --git a/xfa/fwl/theme/cfwl_arrowdata.h b/xfa/fwl/theme/cfwl_arrowdata.h index e549c15..efec1b5 100644 --- a/xfa/fwl/theme/cfwl_arrowdata.h +++ b/xfa/fwl/theme/cfwl_arrowdata.h
@@ -10,7 +10,7 @@ #include <memory> #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" class CFWL_ArrowData { public:
diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp index 45b0154..033ee14 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.cpp +++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp
@@ -6,7 +6,7 @@ #include "xfa/fwl/theme/cfwl_checkboxtp.h" -#include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/cfx_pathdata.h" #include "xfa/fde/tto/fde_textout.h" #include "xfa/fwl/basewidget/ifwl_checkbox.h" #include "xfa/fwl/core/cfwl_themebackground.h"
diff --git a/xfa/fxbarcode/BC_TwoDimWriter.cpp b/xfa/fxbarcode/BC_TwoDimWriter.cpp index cda0467..2ad60bb 100644 --- a/xfa/fxbarcode/BC_TwoDimWriter.cpp +++ b/xfa/fxbarcode/BC_TwoDimWriter.cpp
@@ -6,9 +6,9 @@ #include <algorithm> -#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" #include "third_party/base/numerics/safe_math.h" #include "xfa/fxbarcode/BC_TwoDimWriter.h" #include "xfa/fxbarcode/BC_Writer.h"
diff --git a/xfa/fxbarcode/BC_Writer.h b/xfa/fxbarcode/BC_Writer.h index 8e4eaf1..888db56 100644 --- a/xfa/fxbarcode/BC_Writer.h +++ b/xfa/fxbarcode/BC_Writer.h
@@ -8,7 +8,7 @@ #define XFA_FXBARCODE_BC_WRITER_H_ #include "core/fxcrt/fx_string.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxbarcode/utils.h" class CBC_Writer {
diff --git a/xfa/fxbarcode/cbc_codabar.h b/xfa/fxbarcode/cbc_codabar.h index b0a587b..2a4ee79 100644 --- a/xfa/fxbarcode/cbc_codabar.h +++ b/xfa/fxbarcode/cbc_codabar.h
@@ -9,7 +9,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_Codabar : public CBC_OneCode {
diff --git a/xfa/fxbarcode/cbc_code128.h b/xfa/fxbarcode/cbc_code128.h index 2088bdd..4404f6c 100644 --- a/xfa/fxbarcode/cbc_code128.h +++ b/xfa/fxbarcode/cbc_code128.h
@@ -9,7 +9,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_Code128 : public CBC_OneCode {
diff --git a/xfa/fxbarcode/cbc_code39.h b/xfa/fxbarcode/cbc_code39.h index 51f1759..42edf8e3 100644 --- a/xfa/fxbarcode/cbc_code39.h +++ b/xfa/fxbarcode/cbc_code39.h
@@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_Code39 : public CBC_OneCode {
diff --git a/xfa/fxbarcode/cbc_codebase.h b/xfa/fxbarcode/cbc_codebase.h index a6448db..d185d0e 100644 --- a/xfa/fxbarcode/cbc_codebase.h +++ b/xfa/fxbarcode/cbc_codebase.h
@@ -10,7 +10,7 @@ #include <memory> #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxbarcode/include/BC_Library.h" class CBC_Writer;
diff --git a/xfa/fxbarcode/cbc_datamatrix.h b/xfa/fxbarcode/cbc_datamatrix.h index 51d7c3d..df2e5ad 100644 --- a/xfa/fxbarcode/cbc_datamatrix.h +++ b/xfa/fxbarcode/cbc_datamatrix.h
@@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_codebase.h" class CBC_DataMatrix : public CBC_CodeBase {
diff --git a/xfa/fxbarcode/cbc_ean13.h b/xfa/fxbarcode/cbc_ean13.h index fae8c50..d42c2fd 100644 --- a/xfa/fxbarcode/cbc_ean13.h +++ b/xfa/fxbarcode/cbc_ean13.h
@@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_EAN13 : public CBC_OneCode {
diff --git a/xfa/fxbarcode/cbc_ean8.h b/xfa/fxbarcode/cbc_ean8.h index c345af3..ffd06e5 100644 --- a/xfa/fxbarcode/cbc_ean8.h +++ b/xfa/fxbarcode/cbc_ean8.h
@@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_EAN8 : public CBC_OneCode {
diff --git a/xfa/fxbarcode/cbc_pdf417i.h b/xfa/fxbarcode/cbc_pdf417i.h index ca6ac11..6067282 100644 --- a/xfa/fxbarcode/cbc_pdf417i.h +++ b/xfa/fxbarcode/cbc_pdf417i.h
@@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_codebase.h" class CBC_PDF417I : public CBC_CodeBase {
diff --git a/xfa/fxbarcode/cbc_qrcode.h b/xfa/fxbarcode/cbc_qrcode.h index e8c9ced..e3b554b 100644 --- a/xfa/fxbarcode/cbc_qrcode.h +++ b/xfa/fxbarcode/cbc_qrcode.h
@@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_codebase.h" class CBC_QRCode : public CBC_CodeBase {
diff --git a/xfa/fxbarcode/cbc_upca.h b/xfa/fxbarcode/cbc_upca.h index 7e869b6..11769f3 100644 --- a/xfa/fxbarcode/cbc_upca.h +++ b/xfa/fxbarcode/cbc_upca.h
@@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_UPCA : public CBC_OneCode {
diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp index 80f76fb..72c956a 100644 --- a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -25,12 +25,12 @@ #include <algorithm> #include <memory> -#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/cfx_unicodeencodingex.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/cfx_unicodeencodingex.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.h b/xfa/fxbarcode/oned/BC_OneDimWriter.h index 91763a9..910b206 100644 --- a/xfa/fxbarcode/oned/BC_OneDimWriter.h +++ b/xfa/fxbarcode/oned/BC_OneDimWriter.h
@@ -9,7 +9,7 @@ #include <memory> -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_renderdevice.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/include/BC_Library.h"
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp index 6327387..51f77b5 100644 --- a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -20,8 +20,8 @@ * limitations under the License. */ -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" #include "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h"
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp index fb95f26..2305b18 100644 --- a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp +++ b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp
@@ -20,8 +20,8 @@ * limitations under the License. */ -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp index 12acb52..e594bc7 100644 --- a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp
@@ -20,8 +20,8 @@ * limitations under the License. */ -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" #include "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h"
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index 31cbf25..10b5870 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp
@@ -12,9 +12,9 @@ #include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h" #include "core/fxcodec/codec/ccodec_progressivedecoder.h" #include "core/fxcodec/fx_codec.h" -#include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "xfa/fxfa/app/xfa_textlayout.h" #include "xfa/fxfa/include/cxfa_eventparam.h" #include "xfa/fxfa/include/fxfa_widget.h"
diff --git a/xfa/fxfa/include/fxfa_widget.h b/xfa/fxfa/include/fxfa_widget.h index 9bab36f..07b25ef 100644 --- a/xfa/fxfa/include/fxfa_widget.h +++ b/xfa/fxfa/include/fxfa_widget.h
@@ -8,7 +8,7 @@ #define XFA_FXFA_INCLUDE_FXFA_WIDGET_H_ #include "core/fxcrt/fx_coordinates.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/parser/cxfa_box.h" #include "xfa/fxfa/parser/cxfa_event.h" #include "xfa/fxfa/parser/cxfa_image.h"
diff --git a/xfa/fxfa/include/xfa_ffwidget.h b/xfa/fxfa/include/xfa_ffwidget.h index 7b6130f..a44dd78 100644 --- a/xfa/fxfa/include/xfa_ffwidget.h +++ b/xfa/fxfa/include/xfa_ffwidget.h
@@ -10,7 +10,7 @@ #include <vector> #include "core/fxcodec/fx_codec_def.h" -#include "core/fxge/include/cfx_graphstatedata.h" +#include "core/fxge/cfx_graphstatedata.h" #include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h"
diff --git a/xfa/fxfa/parser/cxfa_data.h b/xfa/fxfa/parser/cxfa_data.h index 8432cf4..e3c6390 100644 --- a/xfa/fxfa/parser/cxfa_data.h +++ b/xfa/fxfa/parser/cxfa_data.h
@@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_CXFA_DATA_H_ #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/include/fxfa_basic.h" class CXFA_Node;
diff --git a/xfa/fxfa/parser/cxfa_fill.h b/xfa/fxfa/parser/cxfa_fill.h index 70b0886..2a5f673 100644 --- a/xfa/fxfa/parser/cxfa_fill.h +++ b/xfa/fxfa/parser/cxfa_fill.h
@@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_CXFA_FILL_H_ #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node;
diff --git a/xfa/fxfa/parser/cxfa_font.cpp b/xfa/fxfa/parser/cxfa_font.cpp index 52d12bb..2dcb405 100644 --- a/xfa/fxfa/parser/cxfa_font.cpp +++ b/xfa/fxfa/parser/cxfa_font.cpp
@@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_font.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/parser/cxfa_fill.h" #include "xfa/fxfa/parser/cxfa_measurement.h" #include "xfa/fxfa/parser/xfa_object.h"
diff --git a/xfa/fxfa/parser/cxfa_font.h b/xfa/fxfa/parser/cxfa_font.h index e2e1809..0151dfb 100644 --- a/xfa/fxfa/parser/cxfa_font.h +++ b/xfa/fxfa/parser/cxfa_font.h
@@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_FONT_H_ #define XFA_FXFA_PARSER_CXFA_FONT_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node;
diff --git a/xfa/fxfa/parser/cxfa_stroke.h b/xfa/fxfa/parser/cxfa_stroke.h index 7d817e0..8db1b29 100644 --- a/xfa/fxfa/parser/cxfa_stroke.h +++ b/xfa/fxfa/parser/cxfa_stroke.h
@@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_CXFA_STROKE_H_ #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/include/fxfa_basic.h" #include "xfa/fxfa/parser/cxfa_data.h"
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp index 0bcfe0b..b7f0fbe 100644 --- a/xfa/fxfa/parser/xfa_localemgr.cpp +++ b/xfa/fxfa/parser/xfa_localemgr.cpp
@@ -11,7 +11,7 @@ #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_xml.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_gemodule.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/xfa_locale.h" #include "xfa/fxfa/parser/xfa_object.h"
diff --git a/xfa/fxgraphics/cagg_graphics.h b/xfa/fxgraphics/cagg_graphics.h index 5f53c73..30117e8 100644 --- a/xfa/fxgraphics/cagg_graphics.h +++ b/xfa/fxgraphics/cagg_graphics.h
@@ -7,7 +7,7 @@ #ifndef XFA_FXGRAPHICS_CAGG_GRAPHICS_H_ #define XFA_FXGRAPHICS_CAGG_GRAPHICS_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxgraphics/include/cfx_graphics.h" class CFX_Graphics;
diff --git a/xfa/fxgraphics/cfx_color.h b/xfa/fxgraphics/cfx_color.h index 0f32176..6af1f37 100644 --- a/xfa/fxgraphics/cfx_color.h +++ b/xfa/fxgraphics/cfx_color.h
@@ -7,7 +7,7 @@ #ifndef XFA_FXGRAPHICS_CFX_COLOR_H_ #define XFA_FXGRAPHICS_CFX_COLOR_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxgraphics/include/cfx_graphics.h" class CFX_Pattern;
diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp index b9f8287..85a9f43 100644 --- a/xfa/fxgraphics/cfx_graphics.cpp +++ b/xfa/fxgraphics/cfx_graphics.cpp
@@ -8,10 +8,10 @@ #include <memory> -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/cfx_renderdevice.h" -#include "core/fxge/include/cfx_unicodeencoding.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/cfx_unicodeencoding.h" #include "xfa/fxgraphics/cagg_graphics.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h"
diff --git a/xfa/fxgraphics/cfx_path.cpp b/xfa/fxgraphics/cfx_path.cpp index 5adeded..e4fb727 100644 --- a/xfa/fxgraphics/cfx_path.cpp +++ b/xfa/fxgraphics/cfx_path.cpp
@@ -6,7 +6,7 @@ #include "xfa/fxgraphics/cfx_path.h" -#include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/cfx_pathdata.h" #include "xfa/fxgraphics/cfx_path_generator.h" CFX_Path::CFX_Path() {}
diff --git a/xfa/fxgraphics/cfx_path_generator.cpp b/xfa/fxgraphics/cfx_path_generator.cpp index 2af39c4..b5843ed 100644 --- a/xfa/fxgraphics/cfx_path_generator.cpp +++ b/xfa/fxgraphics/cfx_path_generator.cpp
@@ -6,8 +6,8 @@ #include "xfa/fxgraphics/cfx_path_generator.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" CFX_PathGenerator::CFX_PathGenerator() : m_pPathData(new CFX_PathData) {}
diff --git a/xfa/fxgraphics/cfx_path_generator.h b/xfa/fxgraphics/cfx_path_generator.h index aa17a7e..75e3a57 100644 --- a/xfa/fxgraphics/cfx_path_generator.h +++ b/xfa/fxgraphics/cfx_path_generator.h
@@ -9,7 +9,7 @@ #include <memory> -#include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/cfx_pathdata.h" class CFX_PathGenerator { public:
diff --git a/xfa/fxgraphics/cfx_shading.h b/xfa/fxgraphics/cfx_shading.h index eb01112..2cc37cf 100644 --- a/xfa/fxgraphics/cfx_shading.h +++ b/xfa/fxgraphics/cfx_shading.h
@@ -9,7 +9,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #define FX_SHADING_Steps 256
diff --git a/xfa/fxgraphics/include/cfx_graphics.h b/xfa/fxgraphics/include/cfx_graphics.h index 3d818d7..584a5cb 100644 --- a/xfa/fxgraphics/include/cfx_graphics.h +++ b/xfa/fxgraphics/include/cfx_graphics.h
@@ -10,11 +10,11 @@ #include <memory> #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_renderdevice.h" -#include "core/fxge/include/fx_dib.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/fx_dib.h" +#include "core/fxge/fx_font.h" #include "xfa/fwl/core/fwl_error.h" class CFX_Color;