Merge to XFA: Fix all relative includes to core.
Do some IWYU to fix build errors due to files that have no #includes but
just happened to work previously because the #includes were in the right
order.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1407423004 .
(cherry picked from commit 9e7cd8ffb81c564e1102f6c6459ec0942a0b11ea)
Review URL: https://codereview.chromium.org/1425163004 .
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h b/core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h
index 28d8ae3..e4c3265 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h
+++ b/core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h
@@ -7,7 +7,7 @@
#ifndef _JBIG2_HUFFMAN_TABLE_STANDARD_H_
#define _JBIG2_HUFFMAN_TABLE_STANDARD_H_
-#include "../../../../core/include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
struct JBig2TableLine {
int PREFLEN;
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h
index f1c8b2d..ce244d8 100644
--- a/fpdfsdk/include/formfiller/FFL_ComboBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
#define FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
-#include "../../../core/include/fxcrt/fx_string.h"
#include "FFL_FormFiller.h"
+#include "core/include/fxcrt/fx_string.h"
class CBA_FontMap;
class CPDFSDK_Document;
diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h
index 90351f5..acbf52e 100644
--- a/fpdfsdk/include/formfiller/FormFiller.h
+++ b/fpdfsdk/include/formfiller/FormFiller.h
@@ -7,11 +7,11 @@
#ifndef FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
#define FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
-#include "../../../core/include/fpdfapi/fpdf_module.h"
-#include "../../../core/include/fpdfdoc/fpdf_doc.h"
-#include "../../../core/include/fpdfdoc/fpdf_vt.h"
#include "../fsdk_mgr.h"
#include "../fxedit/fx_edit.h"
#include "../pdfwindow/IPDFWindow.h"
+#include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fpdfdoc/fpdf_doc.h"
+#include "core/include/fpdfdoc/fpdf_vt.h"
#endif // FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h
index 9324b85..4417280 100644
--- a/fpdfsdk/include/fsdk_actionhandler.h
+++ b/fpdfsdk/include/fsdk_actionhandler.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_
#define FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_
-#include "../../core/include/fpdfdoc/fpdf_doc.h"
-#include "../../core/include/fxcrt/fx_string.h"
+#include "core/include/fpdfdoc/fpdf_doc.h"
+#include "core/include/fxcrt/fx_string.h"
#include "fsdk_baseform.h"
#include "third_party/base/nonstd_unique_ptr.h"
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index 6ce9e12..19051ee 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -10,7 +10,7 @@
#include <map>
#include <vector>
-#include "../../core/include/fxcrt/fx_basic.h"
+#include "core/include/fxcrt/fx_basic.h"
#define FSDK_XFAWIDGET_TYPENAME "XFAWidget"
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h
index 1cd29b1..c54310c 100644
--- a/fpdfsdk/include/fsdk_baseannot.h
+++ b/fpdfsdk/include/fsdk_baseannot.h
@@ -13,8 +13,8 @@
#include <ctime>
#endif
-#include "../../core/include/fpdfdoc/fpdf_doc.h"
-#include "../../core/include/fxcrt/fx_basic.h"
+#include "core/include/fpdfdoc/fpdf_doc.h"
+#include "core/include/fxcrt/fx_basic.h"
#include "fx_systemhandler.h"
class CPDFSDK_PageView;
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
index a6716c5..dd119b5 100644
--- a/fpdfsdk/include/fsdk_baseform.h
+++ b/fpdfsdk/include/fsdk_baseform.h
@@ -15,10 +15,10 @@
#include <map>
-#include "../../core/include/fpdfapi/fpdf_parser.h"
-#include "../../core/include/fpdfdoc/fpdf_doc.h"
-#include "../../core/include/fxcrt/fx_basic.h"
-#include "../../core/include/fxge/fx_dib.h"
+#include "core/include/fpdfapi/fpdf_parser.h"
+#include "core/include/fpdfdoc/fpdf_doc.h"
+#include "core/include/fxcrt/fx_basic.h"
+#include "core/include/fxge/fx_dib.h"
#include "fsdk_baseannot.h"
class CFFL_FormFiller;
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index c7ca71c..389e8e5 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -7,21 +7,21 @@
#ifndef FPDFSDK_INCLUDE_FSDK_DEFINE_H_
#define FPDFSDK_INCLUDE_FSDK_DEFINE_H_
-#include "../../core/include/fpdfapi/fpdfapi.h"
-#include "../../core/include/fpdfapi/fpdf_module.h"
-#include "../../core/include/fpdfapi/fpdf_pageobj.h"
-#include "../../core/include/fpdfapi/fpdf_parser.h"
-#include "../../core/include/fpdfapi/fpdf_render.h"
-#include "../../core/include/fpdfapi/fpdf_serial.h"
-#include "../../core/include/fpdfdoc/fpdf_doc.h"
-#include "../../core/include/fpdfdoc/fpdf_vt.h"
-#include "../../core/include/fxge/fx_ge.h"
-#include "../../core/include/fxge/fx_ge_win32.h"
#include "../../xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
#include "../../xfa/include/fxbarcode/BC_BarCode.h"
#include "../../xfa/include/fxfa/fxfa.h"
#include "../../xfa/include/fxgraphics/fx_graphics.h"
#include "../../xfa/include/fxjse/fxjse.h"
+#include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fpdfapi/fpdf_pageobj.h"
+#include "core/include/fpdfapi/fpdf_parser.h"
+#include "core/include/fpdfapi/fpdf_render.h"
+#include "core/include/fpdfapi/fpdf_serial.h"
+#include "core/include/fpdfapi/fpdfapi.h"
+#include "core/include/fpdfdoc/fpdf_doc.h"
+#include "core/include/fpdfdoc/fpdf_vt.h"
+#include "core/include/fxge/fx_ge.h"
+#include "core/include/fxge/fx_ge_win32.h"
#include "public/fpdfview.h"
#ifdef _WIN32
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 76d7adf..709a137 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -9,7 +9,7 @@
#include <map>
-#include "../../core/include/fpdftext/fpdf_text.h"
+#include "core/include/fpdftext/fpdf_text.h"
#include "fpdfxfa/fpdfxfa_doc.h"
#include "fpdfxfa/fpdfxfa_page.h"
#include "fsdk_actionhandler.h"
diff --git a/fpdfsdk/include/fx_systemhandler.h b/fpdfsdk/include/fx_systemhandler.h
index 31d3347..224e075 100644
--- a/fpdfsdk/include/fx_systemhandler.h
+++ b/fpdfsdk/include/fx_systemhandler.h
@@ -7,6 +7,13 @@
#ifndef FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_
#define FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_
+#include "core/include/fpdfapi/fpdf_parser.h"
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_system.h"
+
+class CPDF_Document;
+class CPDF_Font;
+
typedef void* FX_HWND;
typedef void* FX_HMENU;
typedef void (*TimerCallback)(int32_t idEvent);
diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h
index 23acbfa..d4788cd 100644
--- a/fpdfsdk/include/fxedit/fx_edit.h
+++ b/fpdfsdk/include/fxedit/fx_edit.h
@@ -7,15 +7,15 @@
#ifndef FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
#define FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
-#include "../../../core/include/fxcrt/fx_basic.h"
-#include "../../../core/include/fxge/fx_dib.h"
+#include "core/include/fpdfapi/fpdf_parser.h"
+#include "core/include/fxcrt/fx_basic.h"
+#include "core/include/fxge/fx_dib.h"
class CFX_RenderDevice;
class CPDF_Font;
class CPDF_Matrix;
class CPDF_PageObjects;
class CPDF_Point;
-class CPDF_Rect;
class CPDF_TextObject;
class IFX_Edit;
class IFX_Edit_FontMap;
diff --git a/fpdfsdk/include/fxedit/fxet_edit.h b/fpdfsdk/include/fxedit/fxet_edit.h
index c7c17a4..21ebe6b 100644
--- a/fpdfsdk/include/fxedit/fxet_edit.h
+++ b/fpdfsdk/include/fxedit/fxet_edit.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
#define FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
-#include "../../../core/include/fpdfdoc/fpdf_vt.h"
+#include "core/include/fpdfdoc/fpdf_vt.h"
#include "fx_edit.h"
class CFX_Edit_Page;
diff --git a/fpdfsdk/include/fxedit/fxet_list.h b/fpdfsdk/include/fxedit/fxet_list.h
index f032078..63c6617 100644
--- a/fpdfsdk/include/fxedit/fxet_list.h
+++ b/fpdfsdk/include/fxedit/fxet_list.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_
#define FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_
-#include "../../../core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point.
+#include "core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point.
#include "fx_edit.h"
class IFX_Edit;
diff --git a/fpdfsdk/include/fxedit/fxet_stub.h b/fpdfsdk/include/fxedit/fxet_stub.h
index 8fe2f0c..b752bff 100644
--- a/fpdfsdk/include/fxedit/fxet_stub.h
+++ b/fpdfsdk/include/fxedit/fxet_stub.h
@@ -7,10 +7,10 @@
#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
#define FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
-#include "../../../core/include/fpdfapi/fpdf_module.h"
-#include "../../../core/include/fpdfapi/fpdf_render.h"
-#include "../../../core/include/fpdfapi/fpdf_pageobj.h"
-#include "../../../core/include/fpdfdoc/fpdf_vt.h"
#include "../fx_systemhandler.h"
+#include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fpdfapi/fpdf_pageobj.h"
+#include "core/include/fpdfapi/fpdf_render.h"
+#include "core/include/fpdfdoc/fpdf_vt.h"
#endif // FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
index 291b8f1..f654696 100644
--- a/fpdfsdk/include/javascript/IJavaScript.h
+++ b/fpdfsdk/include/javascript/IJavaScript.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
#define FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
-#include "../../../core/include/fxcrt/fx_string.h"
-#include "../../../core/include/fxcrt/fx_system.h"
#include "../../../xfa/include/fxjse/fxjse.h"
+#include "core/include/fxcrt/fx_string.h"
+#include "core/include/fxcrt/fx_system.h"
class CPDFDoc_Environment;
class CPDFSDK_Annot;
diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h
index b3a073b..00eb704 100644
--- a/fpdfsdk/include/jsapi/fxjs_v8.h
+++ b/fpdfsdk/include/jsapi/fxjs_v8.h
@@ -15,7 +15,8 @@
#define FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
#include <v8.h>
-#include "../../../core/include/fxcrt/fx_basic.h"
+
+#include "core/include/fxcrt/fx_basic.h"
// FXJS_V8 places no restrictions on these two classes; it merely passes them
// on to caller-provided methods.
diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h
index 1b5e71f..fb2ccb5 100644
--- a/fpdfsdk/include/pdfwindow/PDFWindow.h
+++ b/fpdfsdk/include/pdfwindow/PDFWindow.h
@@ -7,11 +7,11 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
-#include "../../../core/include/fpdfapi/fpdf_module.h"
-#include "../../../core/include/fpdfdoc/fpdf_doc.h"
-#include "../../../core/include/fpdfdoc/fpdf_vt.h"
#include "../fx_systemhandler.h"
#include "../fxedit/fx_edit.h"
+#include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fpdfdoc/fpdf_doc.h"
+#include "core/include/fpdfdoc/fpdf_vt.h"
#include "public/fpdf_fwlevent.h"
#endif // FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h
index 2b59421..1a8db78 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
-#include "../../../core/include/fxcrt/fx_basic.h"
#include "PWL_EditCtrl.h"
#include "PWL_Wnd.h"
+#include "core/include/fxcrt/fx_basic.h"
class CPWL_Edit;
class IPWL_Filler_Notify;
diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
index bd241a3..b4f019b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
-#include "../../../core/include/fxcrt/fx_string.h"
#include "../fxedit/fx_edit.h"
#include "PWL_Wnd.h"
+#include "core/include/fxcrt/fx_string.h"
class CPWL_Caret;
class CPWL_Edit;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h
index 8277411..8c60c7b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Icon.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
-#include "../../../core/include/fxcrt/fx_string.h"
#include "PWL_Wnd.h"
+#include "core/include/fxcrt/fx_string.h"
class CPWL_Image : public CPWL_Wnd {
public:
diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h
index 9ffb5ee..c25f3b1 100644
--- a/fpdfsdk/include/pdfwindow/PWL_IconList.h
+++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
-#include "../../../core/include/fxcrt/fx_string.h"
#include "PWL_ListCtrl.h"
#include "PWL_Wnd.h"
+#include "core/include/fxcrt/fx_string.h"
class IPWL_IconList_Notify;
class CPWL_IconList_Item;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h
index e797510..f8f1358 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h
@@ -7,10 +7,10 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
-#include "../../../core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point.
-#include "../../../core/include/fpdfdoc/fpdf_vt.h" // For CPVT_WordRange.
#include "../fxedit/fx_edit.h"
#include "PWL_Wnd.h"
+#include "core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point.
+#include "core/include/fpdfdoc/fpdf_vt.h" // For CPVT_WordRange.
class CFX_PathData;
struct CPWL_Color;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index e8340c3..7216bf5 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
-#include "../../../core/include/fxcrt/fx_basic.h"
-#include "../../../core/include/fpdfdoc/fpdf_doc.h"
#include "../fx_systemhandler.h"
+#include "core/include/fpdfdoc/fpdf_doc.h"
+#include "core/include/fxcrt/fx_basic.h"
class CPWL_MsgControl;
class CPWL_ScrollBar;
diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp
index 74ff880..77b0d01 100644
--- a/fpdfsdk/src/fpdf_ext.cpp
+++ b/fpdfsdk/src/fpdf_ext.cpp
@@ -6,9 +6,9 @@
#include "public/fpdf_ext.h"
-#include "../../core/include/fxcrt/fx_xml.h"
-#include "../include/fsdk_define.h"
#include "../include/fpdfxfa/fpdfxfa_doc.h"
+#include "../include/fsdk_define.h"
+#include "core/include/fxcrt/fx_xml.h"
#define FPDFSDK_UNSUPPORT_CALL 100
diff --git a/fpdfsdk/src/fpdf_searchex.cpp b/fpdfsdk/src/fpdf_searchex.cpp
index 2e0cb56..96c5e53 100644
--- a/fpdfsdk/src/fpdf_searchex.cpp
+++ b/fpdfsdk/src/fpdf_searchex.cpp
@@ -6,7 +6,7 @@
#include "public/fpdf_searchex.h"
-#include "../../core/include/fpdftext/fpdf_text.h"
+#include "core/include/fpdftext/fpdf_text.h"
DLLEXPORT int STDCALL
FPDFText_GetCharIndexFromTextIndex(FPDF_TEXTPAGE text_page, int nTextIndex) {
diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp
index 333ef3b..7675dad 100644
--- a/fpdfsdk/src/fpdftext.cpp
+++ b/fpdfsdk/src/fpdftext.cpp
@@ -6,10 +6,10 @@
#include "public/fpdf_text.h"
-#include "../../core/include/fpdfdoc/fpdf_doc.h"
-#include "../../core/include/fpdftext/fpdf_text.h"
#include "../include/fpdfxfa/fpdfxfa_doc.h"
#include "../include/fpdfxfa/fpdfxfa_page.h"
+#include "core/include/fpdfdoc/fpdf_doc.h"
+#include "core/include/fpdftext/fpdf_text.h"
#ifdef _WIN32
#include <tchar.h>
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index 31d9477..799decf 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -6,17 +6,17 @@
#include "public/fpdfview.h"
-#include "../../core/include/fpdfapi/fpdf_module.h"
-#include "../../core/include/fxcodec/fx_codec.h"
-#include "../../core/include/fxcrt/fx_safe_types.h"
+#include "../include/fpdfxfa/fpdfxfa_app.h"
+#include "../include/fpdfxfa/fpdfxfa_doc.h"
+#include "../include/fpdfxfa/fpdfxfa_page.h"
+#include "../include/fpdfxfa/fpdfxfa_util.h"
#include "../include/fsdk_define.h"
#include "../include/fsdk_mgr.h"
#include "../include/fsdk_rendercontext.h"
-#include "../include/fpdfxfa/fpdfxfa_doc.h"
-#include "../include/fpdfxfa/fpdfxfa_app.h"
-#include "../include/fpdfxfa/fpdfxfa_page.h"
-#include "../include/fpdfxfa/fpdfxfa_util.h"
#include "../include/javascript/IJavaScript.h"
+#include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fxcodec/fx_codec.h"
+#include "core/include/fxcrt/fx_safe_types.h"
#include "public/fpdf_ext.h"
#include "public/fpdf_formfill.h"
#include "public/fpdf_progressive.h"
diff --git a/fpdfsdk/src/javascript/JS_Context.h b/fpdfsdk/src/javascript/JS_Context.h
index dc5d833..e450ba5 100644
--- a/fpdfsdk/src/javascript/JS_Context.h
+++ b/fpdfsdk/src/javascript/JS_Context.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_CONTEXT_H_
#define FPDFSDK_SRC_JAVASCRIPT_JS_CONTEXT_H_
-#include "../../../core/include/fxcrt/fx_system.h"
-#include "../../../core/include/fxcrt/fx_string.h"
#include "../../include/javascript/IJavaScript.h"
+#include "core/include/fxcrt/fx_string.h"
+#include "core/include/fxcrt/fx_system.h"
class CJS_EventHandler;
class CJS_Runtime;
diff --git a/fpdfsdk/src/javascript/JS_EventHandler.h b/fpdfsdk/src/javascript/JS_EventHandler.h
index 5b67ec4..2af19d9 100644
--- a/fpdfsdk/src/javascript/JS_EventHandler.h
+++ b/fpdfsdk/src/javascript/JS_EventHandler.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_EVENTHANDLER_H_
#define FPDFSDK_SRC_JAVASCRIPT_JS_EVENTHANDLER_H_
-#include "../../../core/include/fxcrt/fx_string.h"
-#include "../../../core/include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_string.h"
+#include "core/include/fxcrt/fx_system.h"
class CJS_Context;
class CPDFSDK_Annot;
diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp
index cf5b997..36b81a2 100644
--- a/fpdfsdk/src/javascript/JS_GlobalData.cpp
+++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp
@@ -6,8 +6,8 @@
#include "JS_GlobalData.h"
-#include "../../../core/include/fdrm/fx_crypt.h"
#include "../../include/javascript/IJavaScript.h"
+#include "core/include/fdrm/fx_crypt.h"
#define JS_MAXGLOBALDATA (1024 * 4 - 8)
diff --git a/fpdfsdk/src/javascript/JS_GlobalData.h b/fpdfsdk/src/javascript/JS_GlobalData.h
index a358e80..6a07fa8 100644
--- a/fpdfsdk/src/javascript/JS_GlobalData.h
+++ b/fpdfsdk/src/javascript/JS_GlobalData.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_GLOBALDATA_H_
#define FPDFSDK_SRC_JAVASCRIPT_JS_GLOBALDATA_H_
-#include "../../../core/include/fxcrt/fx_basic.h"
+#include "core/include/fxcrt/fx_basic.h"
#define JS_GLOBALDATA_TYPE_NUMBER 0
#define JS_GLOBALDATA_TYPE_BOOLEAN 1
diff --git a/fpdfsdk/src/javascript/JS_Runtime.h b/fpdfsdk/src/javascript/JS_Runtime.h
index 01a8827..db77eeb 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.h
+++ b/fpdfsdk/src/javascript/JS_Runtime.h
@@ -10,10 +10,10 @@
#include <set>
#include <utility>
-#include "../../../core/include/fxcrt/fx_basic.h"
#include "../../include/javascript/IJavaScript.h"
#include "../../include/jsapi/fxjs_v8.h"
#include "JS_EventHandler.h"
+#include "core/include/fxcrt/fx_basic.h"
class CJS_Context;
diff --git a/fpdfsdk/src/javascript/JS_Value.h b/fpdfsdk/src/javascript/JS_Value.h
index d64fdc6..b8c5563 100644
--- a/fpdfsdk/src/javascript/JS_Value.h
+++ b/fpdfsdk/src/javascript/JS_Value.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_VALUE_H_
#define FPDFSDK_SRC_JAVASCRIPT_JS_VALUE_H_
-#include "../../../core/include/fxcrt/fx_basic.h"
#include "../../include/jsapi/fxjs_v8.h"
+#include "core/include/fxcrt/fx_basic.h"
class CJS_Array;
class CJS_Date;
diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
index 4dd93c1..84af76a 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/src/javascript/global.cpp
@@ -6,7 +6,6 @@
#include "global.h"
-#include "../../../core/include/fxcrt/fx_ext.h"
#include "../../include/javascript/IJavaScript.h"
#include "JS_Context.h"
#include "JS_Define.h"
@@ -14,6 +13,7 @@
#include "JS_GlobalData.h"
#include "JS_Object.h"
#include "JS_Value.h"
+#include "core/include/fxcrt/fx_ext.h"
#include "resource.h"
/* ---------------------------- global ---------------------------- */
diff --git a/fpdfsdk/src/javascript/resource.h b/fpdfsdk/src/javascript/resource.h
index fcefcd4..8e07d47 100644
--- a/fpdfsdk/src/javascript/resource.h
+++ b/fpdfsdk/src/javascript/resource.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_SRC_JAVASCRIPT_RESOURCE_H_
#define FPDFSDK_SRC_JAVASCRIPT_RESOURCE_H_
-#include "../../../core/include/fxcrt/fx_string.h" // For CFX_WideString.
-#include "../../include/fsdk_define.h" // For FX_UINT.
+#include "../../include/fsdk_define.h" // For FX_UINT.
+#include "core/include/fxcrt/fx_string.h" // For CFX_WideString.
class CJS_Context;
diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp
index 5340ff4..9be02cc 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8.cpp
+++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp
@@ -6,7 +6,7 @@
#include "../../include/jsapi/fxjs_v8.h"
-#include "../../../core/include/fxcrt/fx_basic.h"
+#include "core/include/fxcrt/fx_basic.h"
const wchar_t kFXJSValueNameString[] = L"string";
const wchar_t kFXJSValueNameNumber[] = L"number";
diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
index a81e038..bb7e146 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
+++ b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "../../../core/include/fpdfapi/fpdf_parser.h"
#include "../../../testing/embedder_test.h"
#include "../../include/jsapi/fxjs_v8.h"
+#include "core/include/fpdfapi/fpdf_parser.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/base/nonstd_unique_ptr.h"
diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
index 8e45060..ce9bd26 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
@@ -4,8 +4,6 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../../core/include/fxcrt/fx_safe_types.h"
-#include "../../../core/include/fxcrt/fx_xml.h"
#include "../../include/pdfwindow/PDFWindow.h"
#include "../../include/pdfwindow/PWL_Caret.h"
#include "../../include/pdfwindow/PWL_Edit.h"
@@ -14,6 +12,8 @@
#include "../../include/pdfwindow/PWL_ScrollBar.h"
#include "../../include/pdfwindow/PWL_Utils.h"
#include "../../include/pdfwindow/PWL_Wnd.h"
+#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/include/fxcrt/fx_xml.h"
/* ---------------------------- CPWL_Edit ------------------------------ */
diff --git a/testing/fx_string_testhelpers.h b/testing/fx_string_testhelpers.h
index 2880f84..4dd37c6 100644
--- a/testing/fx_string_testhelpers.h
+++ b/testing/fx_string_testhelpers.h
@@ -7,7 +7,7 @@
#include <ostream>
-#include "../core/include/fxcrt/fx_string.h"
+#include "core/include/fxcrt/fx_string.h"
// Output stream operator so GTEST macros work with FX strings.
std::ostream& operator<<(std::ostream& out, const CFX_ByteStringC& str);
diff --git a/third_party/agg23/agg_array.h b/third_party/agg23/agg_array.h
index 810eb4e..a22a5c2 100644
--- a/third_party/agg23/agg_array.h
+++ b/third_party/agg23/agg_array.h
@@ -15,11 +15,14 @@
//----------------------------------------------------------------------------
#ifndef AGG_ARRAY_INCLUDED
#define AGG_ARRAY_INCLUDED
+
#include "agg_basics.h"
+#include "core/include/fxcrt/fx_memory.h" // For FXSYS_* macros.
+
namespace agg
{
-template<class T> class pod_array
-{
+template <class T>
+class pod_array {
public:
typedef T value_type;
~pod_array()
diff --git a/third_party/agg23/agg_basics.h b/third_party/agg23/agg_basics.h
index d2fad58..752560b 100644
--- a/third_party/agg23/agg_basics.h
+++ b/third_party/agg23/agg_basics.h
@@ -40,6 +40,9 @@
#define AGG_INT64U unsigned long long
#endif
#define AGG_INLINE inline
+
+#include "core/include/fxcrt/fx_system.h" // For FX_FLOAT
+
namespace agg
{
typedef AGG_INT8 int8;
diff --git a/third_party/agg23/agg_curves.cpp b/third_party/agg23/agg_curves.cpp
index 5a2d563..e19221d 100644
--- a/third_party/agg23/agg_curves.cpp
+++ b/third_party/agg23/agg_curves.cpp
@@ -18,9 +18,11 @@
// mcseemagg@yahoo.com
// http://www.antigrain.com
//----------------------------------------------------------------------------
-#include "../../core/include/fxcrt/fx_basic.h"
+
#include "agg_curves.h"
#include "agg_math.h"
+#include "core/include/fxcrt/fx_basic.h"
+
namespace agg
{
const FX_FLOAT curve_collinearity_epsilon = 1e-30f;
diff --git a/third_party/agg23/agg_path_storage.cpp b/third_party/agg23/agg_path_storage.cpp
index f5c9843..b803a1c 100644
--- a/third_party/agg23/agg_path_storage.cpp
+++ b/third_party/agg23/agg_path_storage.cpp
@@ -22,9 +22,11 @@
// Class path_storage
//
//----------------------------------------------------------------------------
-#include "../../core/include/fxcrt/fx_basic.h"
-#include "agg_path_storage.h"
+
#include "agg_math.h"
+#include "agg_path_storage.h"
+#include "core/include/fxcrt/fx_basic.h"
+
namespace agg
{
path_storage::~path_storage()
diff --git a/third_party/agg23/agg_rasterizer_scanline_aa.h b/third_party/agg23/agg_rasterizer_scanline_aa.h
index af31e0f..dceb3e8 100644
--- a/third_party/agg23/agg_rasterizer_scanline_aa.h
+++ b/third_party/agg23/agg_rasterizer_scanline_aa.h
@@ -29,13 +29,15 @@
//----------------------------------------------------------------------------
#ifndef AGG_RASTERIZER_SCANLINE_AA_INCLUDED
#define AGG_RASTERIZER_SCANLINE_AA_INCLUDED
-#include "../../core/include/fxcrt/fx_coordinates.h"
-#include "../../core/include/fxcrt/fx_memory.h"
-#include "agg_basics.h"
-#include "agg_math.h"
+
#include "agg_array.h"
+#include "agg_basics.h"
#include "agg_clip_liang_barsky.h"
+#include "agg_math.h"
#include "agg_render_scanlines.h"
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_memory.h"
+
namespace agg
{
enum poly_base_scale_e {
diff --git a/third_party/agg23/agg_vcgen_dash.cpp b/third_party/agg23/agg_vcgen_dash.cpp
index 43f8edf..5c5bd78 100644
--- a/third_party/agg23/agg_vcgen_dash.cpp
+++ b/third_party/agg23/agg_vcgen_dash.cpp
@@ -17,9 +17,11 @@
// Line dash generator
//
//----------------------------------------------------------------------------
-#include "../../core/include/fxcrt/fx_basic.h"
-#include "agg_vcgen_dash.h"
+
#include "agg_shorten_path.h"
+#include "agg_vcgen_dash.h"
+#include "core/include/fxcrt/fx_basic.h"
+
namespace agg
{
vcgen_dash::vcgen_dash() :
diff --git a/third_party/agg23/agg_vcgen_stroke.cpp b/third_party/agg23/agg_vcgen_stroke.cpp
index 9b8cb66..ef8bc27 100644
--- a/third_party/agg23/agg_vcgen_stroke.cpp
+++ b/third_party/agg23/agg_vcgen_stroke.cpp
@@ -22,8 +22,10 @@
// Stroke generator
//
//----------------------------------------------------------------------------
-#include "../../core/include/fxcrt/fx_basic.h"
+
#include "agg_vcgen_stroke.h"
+#include "core/include/fxcrt/fx_basic.h"
+
namespace agg
{
diff --git a/third_party/lcms2-2.6/src/cmserr.c b/third_party/lcms2-2.6/src/cmserr.c
index 743b4f5..dfad4c9 100644
--- a/third_party/lcms2-2.6/src/cmserr.c
+++ b/third_party/lcms2-2.6/src/cmserr.c
@@ -251,8 +251,8 @@
return TRUE;
}
#else
-#include "../../../core/include/fxcrt/fx_memory.h"
-#include "../../../core/include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_memory.h"
+#include "core/include/fxcrt/fx_system.h"
cmsBool _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plugin)
{
diff --git a/third_party/libjpeg/jinclude.h b/third_party/libjpeg/jinclude.h
index bae2b02..157a606 100644
--- a/third_party/libjpeg/jinclude.h
+++ b/third_party/libjpeg/jinclude.h
@@ -20,7 +20,8 @@
#include "jconfig.h" /* auto configuration options */
#define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */
-#include "../../core/include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
+
/*
* We need the NULL macro and size_t typedef.
* On an ANSI-conforming system it is sufficient to include <stddef.h>.
diff --git a/third_party/zlib_v128/zutil.h b/third_party/zlib_v128/zutil.h
index f271873..053dd60 100644
--- a/third_party/zlib_v128/zutil.h
+++ b/third_party/zlib_v128/zutil.h
@@ -13,7 +13,7 @@
#ifndef ZUTIL_H
#define ZUTIL_H
-#include "../../core/include/fxcrt/fx_system.h" /* XYQ 2007-5-22 */
+#include "core/include/fxcrt/fx_system.h"
#ifdef HAVE_HIDDEN
# define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
diff --git a/xfa/include/fwl/core/fwl_error.h b/xfa/include/fwl/core/fwl_error.h
index 4c0f3b9..4f22dbb 100644
--- a/xfa/include/fwl/core/fwl_error.h
+++ b/xfa/include/fwl/core/fwl_error.h
@@ -4,9 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FWL_ERROR_H
-#define _FWL_ERROR_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_ERROR_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_ERROR_H_
+
+#include <stdint.h>
+
typedef int32_t FWL_ERR;
+
#define FWL_ERR_Succeeded 0
#define FWL_ERR_Indefinite -1
#define FWL_ERR_Parameter_Invalid -100
@@ -14,6 +18,7 @@
#define FWL_ERR_Intermediate_Value__Invalid -300
#define FWL_ERR_Method_Not_Supported -400
#define FWL_ERR_Out_Of_Memory -500
+
#if defined(__WIN32__) || defined(_WIN32)
#define _FWL_ALARM_IF_FAIL(arg, alarm) \
{ \
@@ -78,4 +83,5 @@
if ((arg) != FWL_ERR_Succeeded) \
goto pos; \
}
-#endif
+
+#endif // XFA_INCLUDE_FWL_CORE_FWL_ERROR_H_
diff --git a/xfa/include/fwl/core/fwl_timer.h b/xfa/include/fwl/core/fwl_timer.h
index 4c8b466..8ed4da6 100644
--- a/xfa/include/fwl/core/fwl_timer.h
+++ b/xfa/include/fwl/core/fwl_timer.h
@@ -4,10 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FWL_TIMER_H
-#define _FWL_TIMER_H
-class IFWL_Timer;
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_TIMER_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_TIMER_H_
+
+#include "core/include/fxcrt/fx_system.h"
+
typedef struct _FWL_HTIMER { void* pData; } * FWL_HTIMER;
+
class IFWL_Timer {
public:
virtual ~IFWL_Timer() {}
@@ -17,4 +20,5 @@
FX_DWORD dwElapse,
FX_BOOL bImmediately = TRUE);
int32_t FWL_StopTimer(FWL_HTIMER hTimer);
-#endif
+
+#endif // XFA_INCLUDE_FWL_CORE_FWL_TIMER_H_
diff --git a/xfa/include/fxgraphics/fx_graphics.h b/xfa/include/fxgraphics/fx_graphics.h
index d65918e..fb18dce 100644
--- a/xfa/include/fxgraphics/fx_graphics.h
+++ b/xfa/include/fxgraphics/fx_graphics.h
@@ -4,8 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef __H_FX_GRAPHICS__
-#define __H_FX_GRAPHICS__
+#ifndef XFA_INCLUDE_FXGRAPHICS_FX_GRAPHICS_H_
+#define XFA_INCLUDE_FXGRAPHICS_FX_GRAPHICS_H_
+
+#include "core/include/fpdfapi/fpdf_pageobj.h"
typedef int FX_ERR;
#define FX_ERR_Succeeded 0
@@ -496,4 +498,5 @@
FX_ARGB _argbArray[FX_SHADING_Steps];
friend class CFX_Graphics;
};
-#endif
+
+#endif // XFA_INCLUDE_FXGRAPHICS_FX_GRAPHICS_H_
