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 .

15 files changed, 27 insertions, 27 deletions

diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp
index 74ff88022f..77b0d0164f 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 2e0cb568fa..96c5e53309 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 333ef3b9a1..7675dada61 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 31d94770fa..799decf607 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/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_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/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 dc5d8339bf..e450ba5703 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 5b67ec4baf..2af19d9ad5 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 cf5b997dd2..36b81a20ac 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 a358e80e55..6a07fa84e4 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 01a8827561..db77eeb8ed 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 d64fdc6a11..b8c5563f70 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 4dd93c150f..84af76a3de 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 fcefcd486f..8e07d47768 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 5340ff4fd9..9be02ccb1e 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 a81e038e1a..bb7e14660d 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 8e45060ea9..ce9bd26050 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 ------------------------------ */