Merge to XFA: Fix relative includes within core/

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1427633010 .

(cherry picked from commit 9fb27cb9797937499c9678bc74cf7846cbf5d2b8)

Review URL: https://codereview.chromium.org/1438573002 .

10 files changed, 29 insertions, 24 deletions

diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
index 94617a4ab9..914e2bd766 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
+++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
@@ -4,12 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../../include/fpdfapi/fpdf_resource.h"
-#include "../../../../include/fpdfapi/fpdf_module.h"
-#include "../../../../include/fxcrt/fx_basic.h"  // For FX_ArraySize().
+#include "cmaps_cns1.h"
+
 #include "../../fpdf_font/font_int.h"
 #include "../cmap_int.h"
-#include "cmaps_cns1.h"
+#include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fpdfapi/fpdf_resource.h"
+#include "core/include/fxcrt/fx_basic.h"  // For FX_ArraySize().
 
 static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = {
     {"B5pc-H", FXCMAP_CMap::Range, g_FXCMAP_B5pc_H_0, 247, FXCMAP_CMap::None,
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h
index 93cfd2d10d..8edd85c633 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h
+++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h
@@ -7,7 +7,7 @@
 #ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
 #define CORE_SRC_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_
 
-#include "../../../../include/fxcrt/fx_system.h"  // For FX_WORD.
+#include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
 
 extern const FX_WORD g_FXCMAP_B5pc_H_0[];
 extern const FX_WORD g_FXCMAP_B5pc_V_0[];
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
index bf79ced6e6..4ddabbf870 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
+++ b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
@@ -4,12 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../../include/fpdfapi/fpdf_resource.h"
-#include "../../../../include/fpdfapi/fpdf_module.h"
-#include "../../../../include/fxcrt/fx_basic.h"  // For FX_ArraySize().
+#include "cmaps_gb1.h"
+
 #include "../../fpdf_font/font_int.h"
 #include "../cmap_int.h"
-#include "cmaps_gb1.h"
+#include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fpdfapi/fpdf_resource.h"
+#include "core/include/fxcrt/fx_basic.h"  // For FX_ArraySize().
 
 static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = {
     {"GB-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_H_0, 90, FXCMAP_CMap::None,
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h
index c74ed71b06..beae68d382 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h
+++ b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h
@@ -7,7 +7,7 @@
 #ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_
 #define CORE_SRC_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_
 
-#include "../../../../include/fxcrt/fx_system.h"  // For FX_WORD.
+#include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
 
 extern const FX_WORD g_FXCMAP_GB_EUC_H_0[];
 extern const FX_WORD g_FXCMAP_GB_EUC_V_0[];
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
index 1c788dc27a..30c3b3d97c 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
@@ -4,12 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../../include/fpdfapi/fpdf_resource.h"
-#include "../../../../include/fpdfapi/fpdf_module.h"
-#include "../../../../include/fxcrt/fx_basic.h"  // For FX_ArraySize().
+#include "cmaps_japan1.h"
+
 #include "../../fpdf_font/font_int.h"
 #include "../cmap_int.h"
-#include "cmaps_japan1.h"
+#include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fpdfapi/fpdf_resource.h"
+#include "core/include/fxcrt/fx_basic.h"  // For FX_ArraySize().
 
 static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = {
     {"83pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_83pv_RKSJ_H_1, 222,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h
index f45f104edf..471dd36065 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h
+++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h
@@ -7,7 +7,7 @@
 #ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
 #define CORE_SRC_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
 
-#include "../../../../include/fxcrt/fx_system.h"  // For FX_WORD.
+#include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
 
 extern const FX_WORD g_FXCMAP_83pv_RKSJ_H_1[];
 extern const FX_WORD g_FXCMAP_90ms_RKSJ_H_2[];
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
index 17435941d1..d7c5b1b4c5 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
+++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
@@ -4,12 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../../include/fpdfapi/fpdf_resource.h"
-#include "../../../../include/fpdfapi/fpdf_module.h"
-#include "../../../../include/fxcrt/fx_basic.h"  // For FX_ArraySize().
+#include "cmaps_korea1.h"
+
 #include "../../fpdf_font/font_int.h"
 #include "../cmap_int.h"
-#include "cmaps_korea1.h"
+#include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fpdfapi/fpdf_resource.h"
+#include "core/include/fxcrt/fx_basic.h"  // For FX_ArraySize().
 
 static const FXCMAP_CMap g_FXCMAP_Korea1_cmaps[] = {
     {"KSC-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_KSC_EUC_H_0, 467,
diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h
index 853e695343..646a9b9cf1 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h
+++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h
@@ -7,7 +7,7 @@
 #ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_
 #define CORE_SRC_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_
 
-#include "../../../../include/fxcrt/fx_system.h"  // For FX_WORD.
+#include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
 
 extern const FX_WORD g_FXCMAP_KSC_EUC_H_0[];
 extern const FX_WORD g_FXCMAP_KSC_EUC_V_0[];
diff --git a/core/src/fpdfapi/fpdf_cmaps/cmap_int.h b/core/src/fpdfapi/fpdf_cmaps/cmap_int.h
index 7d51cee4cf..a486ac3d4a 100644
--- a/core/src/fpdfapi/fpdf_cmaps/cmap_int.h
+++ b/core/src/fpdfapi/fpdf_cmaps/cmap_int.h
@@ -7,7 +7,7 @@
 #ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
 #define CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
 
-#include "../../../include/fxcrt/fx_system.h"  // For FX_WORD.
+#include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
 
 struct FXCMAP_CMap {
   enum MapType { None, Single, Range, Reverse };
diff --git a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
index 252a4d6e4f..cbae496920 100644
--- a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
+++ b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
@@ -4,11 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../include/fpdfapi/fpdf_resource.h"
-#include "../../../include/fpdfapi/fpdf_module.h"
-#include "../fpdf_font/font_int.h"
 #include "cmap_int.h"
 
+#include "../fpdf_font/font_int.h"
+#include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fpdfapi/fpdf_resource.h"
+
 void FPDFAPI_FindEmbeddedCMap(const char* name,
                               int charset,
                               int coding,