summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-11-12 21:17:40 -0800
committerLei Zhang <thestig@chromium.org>2015-11-12 21:17:40 -0800
commit22bc4227fbbda5a5e9abad2a2c0a98c04fe7f228 (patch)
tree2efddfef7327e6ab3af34305ee451563abc62bf7 /core
parent4274ea205ca2219f6a4cfc54025284c1aa3b14b8 (diff)
downloadpdfium-22bc4227fbbda5a5e9abad2a2c0a98c04fe7f228.tar.xz
Remove relative includes.
That refer to parent directories. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1434223002 .
Diffstat (limited to 'core')
-rw-r--r--core/include/fdrm/fx_crypt.h2
-rw-r--r--core/include/fpdfapi/fpdf_module.h4
-rw-r--r--core/include/fpdfapi/fpdf_objects.h4
-rw-r--r--core/include/fpdfapi/fpdf_page.h2
-rw-r--r--core/include/fpdfapi/fpdf_pageobj.h2
-rw-r--r--core/include/fpdfapi/fpdf_parser.h2
-rw-r--r--core/include/fpdfapi/fpdf_render.h2
-rw-r--r--core/include/fpdfapi/fpdf_resource.h4
-rw-r--r--core/include/fpdfapi/fpdfapi.h2
-rw-r--r--core/include/fpdfdoc/fpdf_ap.h2
-rw-r--r--core/include/fpdfdoc/fpdf_doc.h4
-rw-r--r--core/include/fpdfdoc/fpdf_vt.h4
-rw-r--r--core/include/fpdftext/fpdf_text.h2
-rw-r--r--core/include/fxcodec/fx_codec.h2
-rw-r--r--core/include/fxge/fpf.h2
-rw-r--r--core/include/fxge/fx_dib.h4
-rw-r--r--core/include/fxge/fx_font.h2
-rw-r--r--core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp4
-rw-r--r--core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp4
-rw-r--r--core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp4
-rw-r--r--core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp4
-rw-r--r--core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp4
-rw-r--r--core/src/fpdfapi/fpdf_font/fpdf_font.cpp9
-rw-r--r--core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp4
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp2
-rw-r--r--core/src/fxcodec/codec/codec_int.h2
-rw-r--r--core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp2
-rw-r--r--core/src/fxcrt/fx_basic_bstring_unittest.cpp2
-rw-r--r--core/src/fxcrt/fx_basic_wstring_unittest.cpp2
-rw-r--r--core/src/fxcrt/fx_system_unittest.cpp2
-rw-r--r--core/src/fxge/agg/src/fx_agg_driver.cpp4
-rw-r--r--core/src/fxge/apple/fx_apple_platform.cpp4
-rw-r--r--core/src/fxge/apple/fx_quartz_device.cpp4
-rw-r--r--core/src/fxge/ge/fx_ge_fontmap.cpp2
-rw-r--r--core/src/fxge/win32/fx_win32_device.cpp4
-rw-r--r--core/src/fxge/win32/fx_win32_print.cpp4
48 files changed, 69 insertions, 68 deletions
diff --git a/core/include/fdrm/fx_crypt.h b/core/include/fdrm/fx_crypt.h
index e3b21c5175..259dc85477 100644
--- a/core/include/fdrm/fx_crypt.h
+++ b/core/include/fdrm/fx_crypt.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FDRM_FX_CRYPT_H_
#define CORE_INCLUDE_FDRM_FX_CRYPT_H_
-#include "../fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
#ifdef __cplusplus
extern "C" {
diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h
index e9c38306b7..5e99753d74 100644
--- a/core/include/fpdfapi/fpdf_module.h
+++ b/core/include/fpdfapi/fpdf_module.h
@@ -7,8 +7,8 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
#define CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
-#include "../fxcrt/fx_coordinates.h"
-#include "../fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_system.h"
#include "third_party/base/nonstd_unique_ptr.h"
class CCodec_ModuleMgr;
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index b754ab2b2b..f910cc188e 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -7,8 +7,8 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
#define CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
-#include "../fxcrt/fx_coordinates.h"
-#include "../fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_system.h"
class CPDF_Array;
class CPDF_Boolean;
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h
index 5f716b2c2e..27e40f4486 100644
--- a/core/include/fpdfapi/fpdf_page.h
+++ b/core/include/fpdfapi/fpdf_page.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
#define CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
-#include "../fxge/fx_dib.h"
+#include "core/include/fxge/fx_dib.h"
#include "fpdf_parser.h"
#include "fpdf_resource.h"
diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h
index a3695f7e7b..886930ffe7 100644
--- a/core/include/fpdfapi/fpdf_pageobj.h
+++ b/core/include/fpdfapi/fpdf_pageobj.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_
#define CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_
-#include "../fxge/fx_ge.h"
+#include "core/include/fxge/fx_ge.h"
#include "fpdf_resource.h"
class CPDF_ClipPath;
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index 2937d05938..174430e440 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
#define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
-#include "../fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
#include "fpdf_objects.h"
#include "third_party/base/nonstd_unique_ptr.h"
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index 1726988dd8..cdd7e38d65 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
#define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
-#include "../fxge/fx_ge.h"
+#include "core/include/fxge/fx_ge.h"
#include "fpdf_page.h"
#include "third_party/base/nonstd_unique_ptr.h"
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 233f07c57a..ccecce83eb 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -9,8 +9,8 @@
#include <map>
-#include "../fxcrt/fx_system.h"
-#include "../fxge/fx_font.h"
+#include "core/include/fxcrt/fx_system.h"
+#include "core/include/fxge/fx_font.h"
#include "fpdf_parser.h"
class CFX_CTTGSUBTable;
diff --git a/core/include/fpdfapi/fpdfapi.h b/core/include/fpdfapi/fpdfapi.h
index c2938a5dc4..c4a62d3aea 100644
--- a/core/include/fpdfapi/fpdfapi.h
+++ b/core/include/fpdfapi/fpdfapi.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDFAPI_H_
#define CORE_INCLUDE_FPDFAPI_FPDFAPI_H_
-#include "../fxge/fx_ge.h"
+#include "core/include/fxge/fx_ge.h"
#include "fpdf_module.h"
#include "fpdf_pageobj.h"
#include "fpdf_render.h"
diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h
index 305834e96a..6d0478c23f 100644
--- a/core/include/fpdfdoc/fpdf_ap.h
+++ b/core/include/fpdfdoc/fpdf_ap.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
#define CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
-#include "../fpdfapi/fpdf_parser.h"
+#include "core/include/fpdfapi/fpdf_parser.h"
#include "fpdf_vt.h"
class IPVT_FontMap {
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 76264c93f9..c7a85ef9b9 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -10,8 +10,8 @@
#include <map>
#include <vector>
-#include "../fpdfapi/fpdf_parser.h"
-#include "../fpdfapi/fpdf_render.h"
+#include "core/include/fpdfapi/fpdf_parser.h"
+#include "core/include/fpdfapi/fpdf_render.h"
#include "third_party/base/nonstd_unique_ptr.h"
class CFieldTree;
diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h
index 141b3c6a1c..91a93884e8 100644
--- a/core/include/fpdfdoc/fpdf_vt.h
+++ b/core/include/fpdfdoc/fpdf_vt.h
@@ -7,8 +7,8 @@
#ifndef CORE_INCLUDE_FPDFDOC_FPDF_VT_H_
#define CORE_INCLUDE_FPDFDOC_FPDF_VT_H_
-#include "../fpdfapi/fpdf_parser.h"
-#include "../fxge/fx_dib.h"
+#include "core/include/fpdfapi/fpdf_parser.h"
+#include "core/include/fxge/fx_dib.h"
class IPDF_VariableText;
class IPDF_VariableText_Iterator;
diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h
index a14552ef24..360e256ce6 100644
--- a/core/include/fpdftext/fpdf_text.h
+++ b/core/include/fpdftext/fpdf_text.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
#define CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
-#include "../fpdfapi/fpdf_parser.h"
+#include "core/include/fpdfapi/fpdf_parser.h"
class CPDF_Page;
class CPDF_PageObjects;
diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h
index 7eec175c89..90bde10b5a 100644
--- a/core/include/fxcodec/fx_codec.h
+++ b/core/include/fxcodec/fx_codec.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "../fxcrt/fx_basic.h"
+#include "core/include/fxcrt/fx_basic.h"
#include "fx_codec_def.h"
#include "third_party/base/nonstd_unique_ptr.h"
diff --git a/core/include/fxge/fpf.h b/core/include/fxge/fpf.h
index e65fae0bbd..11e2bf1e40 100644
--- a/core/include/fxge/fpf.h
+++ b/core/include/fxge/fpf.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FXGE_FPF_H_
#define CORE_INCLUDE_FXGE_FPF_H_
-#include "../fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_coordinates.h"
class IFPF_FontMgr;
diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h
index e22ab58065..e57b3c9a83 100644
--- a/core/include/fxge/fx_dib.h
+++ b/core/include/fxge/fx_dib.h
@@ -7,8 +7,8 @@
#ifndef CORE_INCLUDE_FXGE_FX_DIB_H_
#define CORE_INCLUDE_FXGE_FX_DIB_H_
-#include "../fxcrt/fx_basic.h"
-#include "../fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_basic.h"
+#include "core/include/fxcrt/fx_coordinates.h"
enum FXDIB_Format {
FXDIB_Invalid = 0,
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index bc76c6e2e2..277b45ebaa 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -9,7 +9,7 @@
#include <map>
-#include "../fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
#include "fx_dib.h"
#include "third_party/base/nonstd_unique_ptr.h"
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
index 914e2bd766..e105402896 100644
--- a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
+++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
@@ -6,11 +6,11 @@
#include "cmaps_cns1.h"
-#include "../../fpdf_font/font_int.h"
-#include "../cmap_int.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().
+#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/src/fpdfapi/fpdf_font/font_int.h"
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/GB1/cmaps_gb1.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
index 4ddabbf870..949d0a121c 100644
--- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
+++ b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
@@ -6,11 +6,11 @@
#include "cmaps_gb1.h"
-#include "../../fpdf_font/font_int.h"
-#include "../cmap_int.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().
+#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/src/fpdfapi/fpdf_font/font_int.h"
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/Japan1/cmaps_japan1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
index 30c3b3d97c..5978f0c363 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
@@ -6,11 +6,11 @@
#include "cmaps_japan1.h"
-#include "../../fpdf_font/font_int.h"
-#include "../cmap_int.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().
+#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/src/fpdfapi/fpdf_font/font_int.h"
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/Korea1/cmaps_korea1.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
index d7c5b1b4c5..f6ae70a8dc 100644
--- a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
+++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
@@ -6,11 +6,11 @@
#include "cmaps_korea1.h"
-#include "../../fpdf_font/font_int.h"
-#include "../cmap_int.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().
+#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/src/fpdfapi/fpdf_font/font_int.h"
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/fpdf_cmaps.cpp b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
index cbae496920..fba3a2b031 100644
--- a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
+++ b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
@@ -6,9 +6,9 @@
#include "cmap_int.h"
-#include "../fpdf_font/font_int.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfapi/fpdf_resource.h"
+#include "core/src/fpdfapi/fpdf_font/font_int.h"
void FPDFAPI_FindEmbeddedCMap(const char* name,
int charset,
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp
index 452bf0eaa0..59fa1afb50 100644
--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp
+++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../fpdf_page/pageint.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfapi/fpdf_page.h"
#include "core/include/fpdfapi/fpdf_serial.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& ar, CFX_AffineMatrix& matrix) {
ar << matrix.a << " " << matrix.b << " " << matrix.c << " " << matrix.d << " "
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp
index 8944d4eba7..349b007c43 100644
--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp
+++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp
@@ -6,9 +6,9 @@
#include <limits.h>
-#include "../fpdf_page/pageint.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfapi/fpdf_page.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
CPDF_Document::CPDF_Document() : CPDF_IndirectObjects(NULL) {
m_pRootDict = NULL;
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp
index 3ffe482026..33af620dab 100644
--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp
+++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../fpdf_page/pageint.h"
-#include "../fpdf_render/render_int.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfapi/fpdf_page.h"
#include "core/include/fpdfapi/fpdf_render.h"
#include "core/include/fxcodec/fx_codec.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
+#include "core/src/fpdfapi/fpdf_render/render_int.h"
CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, FX_DWORD size) {
int32_t width;
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
index fb0f628147..9f83da062c 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -6,13 +6,17 @@
#include "font_int.h"
-#include "../fpdf_page/pageint.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfapi/fpdf_page.h"
#include "core/include/fpdfapi/fpdf_pageobj.h"
#include "core/include/fpdfapi/fpdf_resource.h"
#include "core/include/fxge/fx_freetype.h"
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#include "core/src/fxge/apple/apple_int.h"
+#endif
+
FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) {
for (int i = 0; i < FXFT_Get_Face_CharmapCount(face); i++) {
if (FXFT_Get_Charmap_PlatformID(FXFT_Get_Face_Charmaps(face)[i]) ==
@@ -1049,9 +1053,6 @@ static FX_BOOL FT_UseType1Charmap(FXFT_Face face) {
}
return TRUE;
}
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-#include "../../fxge/apple/apple_int.h"
-#endif
int CPDF_Type1Font::GlyphFromCharCodeExt(FX_DWORD charcode) {
if (charcode > 0xff) {
return -1;
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
index 1ecb6a6d12..65b4b781b1 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
@@ -6,12 +6,12 @@
#include "font_int.h"
-#include "../fpdf_cmaps/cmap_int.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfapi/fpdf_page.h"
#include "core/include/fpdfapi/fpdf_resource.h"
#include "core/include/fxge/fx_freetype.h"
#include "core/include/fxge/fx_ge.h"
+#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"
namespace {
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp
index 1e82642c12..2adf9f4e19 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp
@@ -6,10 +6,10 @@
#include "pageint.h"
-#include "../fpdf_font/font_int.h"
#include "core/include/fdrm/fx_crypt.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfapi/fpdf_page.h"
+#include "core/src/fpdfapi/fpdf_font/font_int.h"
class CPDF_PageModule : public IPDF_PageModule {
public:
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp
index 3094e48c0c..5c43b44e76 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp
@@ -6,11 +6,11 @@
#include "pageint.h"
-#include "../fpdf_render/render_int.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfapi/fpdf_page.h"
#include "core/include/fpdfapi/fpdf_pageobj.h"
#include "core/include/fpdfapi/fpdf_render.h"
+#include "core/src/fpdfapi/fpdf_render/render_int.h"
void CPDF_GraphicStates::DefaultStates() {
m_ColorState.New()->Default();
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
index 62da88b9ba..a5a198e7b2 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
@@ -5,10 +5,10 @@
#include <cstring>
#include <string>
-#include "../../../../testing/fx_string_testhelpers.h"
-#include "../../../testing/embedder_test.h"
#include "core/include/fpdfapi/fpdf_parser.h"
#include "core/include/fxcrt/fx_basic.h"
+#include "testing/embedder_test.h"
+#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
class FPDFParserDecodeEmbeddertest : public EmbedderTest {};
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
index 2fa2762906..6e927e1a88 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
@@ -10,11 +10,11 @@
#include <utility>
#include <vector>
-#include "../fpdf_page/pageint.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfapi/fpdf_page.h"
#include "core/include/fpdfapi/fpdf_parser.h"
#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
#include "third_party/base/nonstd_unique_ptr.h"
#include "third_party/base/stl_util.h"
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
index 78fb3492dc..a2638fe7e1 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -6,10 +6,10 @@
#include "render_int.h"
-#include "../fpdf_page/pageint.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfapi/fpdf_render.h"
#include "core/include/fxge/fx_ge.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc)
: m_pPDFDoc(pPDFDoc), m_pFontCache(new CFX_FontCache) {}
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp
index e82e45c710..7a28ddc782 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp
@@ -6,10 +6,10 @@
#include "render_int.h"
-#include "../fpdf_page/pageint.h"
#include "core/include/fpdfapi/fpdf_pageobj.h"
#include "core/include/fpdfapi/fpdf_render.h"
#include "core/include/fxge/fx_ge.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
struct CACHEINFO {
FX_DWORD time;
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
index 0a45167632..71e847a160 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -6,13 +6,13 @@
#include "render_int.h"
-#include "../fpdf_page/pageint.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/fxcodec/fx_codec.h"
#include "core/include/fxcrt/fx_safe_types.h"
#include "core/include/fxge/fx_ge.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
FX_BOOL CPDF_RenderStatus::ProcessImage(CPDF_ImageObject* pImageObj,
const CFX_AffineMatrix* pObj2Device) {
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
index a7941b4b2d..2cd1f373f8 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
@@ -8,13 +8,13 @@
#include <vector>
-#include "../fpdf_page/pageint.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/fxcodec/fx_codec.h"
#include "core/include/fxcrt/fx_safe_types.h"
#include "core/include/fxge/fx_ge.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
#include "third_party/base/nonstd_unique_ptr.h"
namespace {
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
index 4043230003..576c18ebbd 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
@@ -6,10 +6,10 @@
#include "render_int.h"
-#include "../fpdf_page/pageint.h"
#include "core/include/fpdfapi/fpdf_pageobj.h"
#include "core/include/fpdfapi/fpdf_render.h"
#include "core/include/fxge/fx_ge.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
#define SHADING_STEPS 256
static void DrawAxialShading(CFX_DIBitmap* pBitmap,
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
index 4eac73fe62..a714d38615 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
@@ -6,10 +6,10 @@
#include "render_int.h"
-#include "../fpdf_page/pageint.h"
#include "core/include/fpdfapi/fpdf_pageobj.h"
#include "core/include/fpdfapi/fpdf_render.h"
#include "core/include/fxge/fx_ge.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
CPDF_Type3Cache::~CPDF_Type3Cache() {
for (const auto& pair : m_SizeMap) {
diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h
index d9383cd5ba..7778eeef0b 100644
--- a/core/src/fxcodec/codec/codec_int.h
+++ b/core/src/fxcodec/codec/codec_int.h
@@ -11,8 +11,8 @@
#include <list>
#include <map>
-#include "../jbig2/JBig2_Context.h"
#include "core/include/fxcodec/fx_codec.h"
+#include "core/src/fxcodec/jbig2/JBig2_Context.h"
#include "third_party/base/nonstd_unique_ptr.h"
#include "third_party/libopenjpeg20/openjpeg.h" // For OPJ_SIZE_T.
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
index 8c4a5b2705..fe552d2ed1 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
@@ -7,8 +7,8 @@
#include <limits>
#include "codec_int.h"
+#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "../../../testing/fx_string_testhelpers.h"
static const OPJ_OFF_T kSkipError = static_cast<OPJ_OFF_T>(-1);
static const OPJ_SIZE_T kReadError = static_cast<OPJ_SIZE_T>(-1);
diff --git a/core/src/fxcrt/fx_basic_bstring_unittest.cpp b/core/src/fxcrt/fx_basic_bstring_unittest.cpp
index f56e89f664..614206bb60 100644
--- a/core/src/fxcrt/fx_basic_bstring_unittest.cpp
+++ b/core/src/fxcrt/fx_basic_bstring_unittest.cpp
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "../../../testing/fx_string_testhelpers.h"
#include "core/include/fxcrt/fx_string.h"
+#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
TEST(fxcrt, ByteStringOperatorSubscript) {
diff --git a/core/src/fxcrt/fx_basic_wstring_unittest.cpp b/core/src/fxcrt/fx_basic_wstring_unittest.cpp
index 511d8f20c7..8ce778920f 100644
--- a/core/src/fxcrt/fx_basic_wstring_unittest.cpp
+++ b/core/src/fxcrt/fx_basic_wstring_unittest.cpp
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "../../../testing/fx_string_testhelpers.h"
#include "core/include/fxcrt/fx_basic.h"
+#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
TEST(fxcrt, WideStringOperatorSubscript) {
diff --git a/core/src/fxcrt/fx_system_unittest.cpp b/core/src/fxcrt/fx_system_unittest.cpp
index aba20e07f0..d9f4cc645e 100644
--- a/core/src/fxcrt/fx_system_unittest.cpp
+++ b/core/src/fxcrt/fx_system_unittest.cpp
@@ -4,8 +4,8 @@
#include <string>
-#include "../../../testing/fx_string_testhelpers.h"
#include "core/include/fxcrt/fx_system.h"
+#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
// Unit test covering cases where PDFium replaces well-known library
diff --git a/core/src/fxge/agg/src/fx_agg_driver.cpp b/core/src/fxge/agg/src/fx_agg_driver.cpp
index 5b5100bcc5..78186a8f96 100644
--- a/core/src/fxge/agg/src/fx_agg_driver.cpp
+++ b/core/src/fxge/agg/src/fx_agg_driver.cpp
@@ -6,10 +6,10 @@
#include "core/src/fxge/agg/include/fx_agg_driver.h"
-#include "../../dib/dib_int.h"
-#include "../../ge/text_int.h"
#include "core/include/fxcodec/fx_codec.h"
#include "core/include/fxge/fx_ge.h"
+#include "core/src/fxge/dib/dib_int.h"
+#include "core/src/fxge/ge/text_int.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/src/fxge/apple/fx_apple_platform.cpp b/core/src/fxge/apple/fx_apple_platform.cpp
index c289b93041..8346873408 100644
--- a/core/src/fxge/apple/fx_apple_platform.cpp
+++ b/core/src/fxge/apple/fx_apple_platform.cpp
@@ -9,12 +9,12 @@
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-#include "../dib/dib_int.h"
-#include "../ge/text_int.h"
#include "apple_int.h"
#include "core/include/fxge/fx_freetype.h"
#include "core/include/fxge/fx_ge_apple.h"
#include "core/src/fxge/agg/include/fx_agg_driver.h"
+#include "core/src/fxge/dib/dib_int.h"
+#include "core/src/fxge/ge/text_int.h"
void CFX_AggDeviceDriver::InitPlatform() {
CQuartz2D& quartz2d =
diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp
index 67b438fc28..e933695a86 100644
--- a/core/src/fxge/apple/fx_quartz_device.cpp
+++ b/core/src/fxge/apple/fx_quartz_device.cpp
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../dib/dib_int.h"
-#include "../ge/text_int.h"
#include "core/include/fxcrt/fx_ext.h"
#include "core/include/fxge/fx_freetype.h"
#include "core/include/fxge/fx_ge.h"
#include "core/src/fxge/agg/include/fx_agg_driver.h"
+#include "core/src/fxge/dib/dib_int.h"
+#include "core/src/fxge/ge/text_int.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
#include "apple_int.h"
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp
index 3f1ce757d6..52605a003c 100644
--- a/core/src/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/src/fxge/ge/fx_ge_fontmap.cpp
@@ -6,9 +6,9 @@
#include <limits>
-#include "../fontdata/chromefontdata/chromefontdata.h"
#include "core/include/fxge/fx_freetype.h"
#include "core/include/fxge/fx_ge.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
#include "text_int.h"
#include "third_party/base/stl_util.h"
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp
index 696e5f0179..b7b625341e 100644
--- a/core/src/fxge/win32/fx_win32_device.cpp
+++ b/core/src/fxge/win32/fx_win32_device.cpp
@@ -9,12 +9,12 @@
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
#include <crtdbg.h>
-#include "../dib/dib_int.h"
-#include "../ge/text_int.h"
#include "core/include/fxcodec/fx_codec.h"
#include "core/include/fxge/fx_freetype.h"
#include "core/include/fxge/fx_ge_win32.h"
#include "core/src/fxge/agg/include/fx_agg_driver.h"
+#include "core/src/fxge/dib/dib_int.h"
+#include "core/src/fxge/ge/text_int.h"
#include "dwrite_int.h"
#include "win32_int.h"
diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp
index d973d893af..126e5d7f47 100644
--- a/core/src/fxge/win32/fx_win32_print.cpp
+++ b/core/src/fxge/win32/fx_win32_print.cpp
@@ -10,10 +10,10 @@
#include <windows.h>
-#include "../dib/dib_int.h"
-#include "../ge/text_int.h"
#include "core/include/fxge/fx_freetype.h"
#include "core/include/fxge/fx_ge_win32.h"
+#include "core/src/fxge/dib/dib_int.h"
+#include "core/src/fxge/ge/text_int.h"
#include "win32_int.h"
#define SIZETHRESHOLD 1000