Fix relative includes within core/

R=tsepez@chromium.org

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

26 files changed, 33 insertions, 30 deletions

diff --git a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp
index a1aa5bf8a9..3a2f26df77 100644
--- a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp
@@ -6,8 +6,8 @@
 
 #include "JBig2_ArithDecoder.h"
 
-#include "../../../include/fxcrt/fx_basic.h"
 #include "JBig2_BitStream.h"
+#include "core/include/fxcrt/fx_basic.h"
 
 namespace {
 
diff --git a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
index 49be941355..6ee255af1b 100644
--- a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
@@ -6,7 +6,7 @@
 
 #include "JBig2_ArithIntDecoder.h"
 
-#include "../../../include/fxcrt/fx_basic.h"
+#include "core/include/fxcrt/fx_basic.h"
 
 namespace {
 
diff --git a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h
index 391004b561..dc3cb11904 100644
--- a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h
+++ b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h
@@ -9,8 +9,8 @@
 
 #include <vector>
 
-#include "../../../include/fxcrt/fx_system.h"
 #include "JBig2_ArithDecoder.h"
+#include "core/include/fxcrt/fx_system.h"
 
 class CJBig2_ArithIntDecoder {
  public:
diff --git a/core/src/fxcodec/jbig2/JBig2_BitStream.cpp b/core/src/fxcodec/jbig2/JBig2_BitStream.cpp
index f39a396e71..42b1e642dc 100644
--- a/core/src/fxcodec/jbig2/JBig2_BitStream.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_BitStream.cpp
@@ -4,11 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../include/fpdfapi/fpdf_objects.h"
 #include "JBig2_BitStream.h"
 
 #include <algorithm>
 
+#include "core/include/fpdfapi/fpdf_objects.h"
+
 CJBig2_BitStream::CJBig2_BitStream(CPDF_StreamAcc* pSrcStream)
     : m_pBuf(pSrcStream->GetData()),
       m_dwLength(pSrcStream->GetSize()),
diff --git a/core/src/fxcodec/jbig2/JBig2_BitStream.h b/core/src/fxcodec/jbig2/JBig2_BitStream.h
index c7c50b8c81..fc9aa8a5c4 100644
--- a/core/src/fxcodec/jbig2/JBig2_BitStream.h
+++ b/core/src/fxcodec/jbig2/JBig2_BitStream.h
@@ -7,7 +7,7 @@
 #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
 
-#include "../../../include/fxcrt/fx_basic.h"
+#include "core/include/fxcrt/fx_basic.h"
 
 class CPDF_StreamAcc;
 
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.h b/core/src/fxcodec/jbig2/JBig2_Context.h
index a98d7a98ca..1b8b391f9d 100644
--- a/core/src/fxcodec/jbig2/JBig2_Context.h
+++ b/core/src/fxcodec/jbig2/JBig2_Context.h
@@ -10,11 +10,11 @@
 #include <list>
 #include <utility>
 
-#include "../../../include/fpdfapi/fpdf_objects.h"
-#include "../../../include/fxcodec/fx_codec_def.h"
 #include "JBig2_List.h"
 #include "JBig2_Page.h"
 #include "JBig2_Segment.h"
+#include "core/include/fpdfapi/fpdf_objects.h"
+#include "core/include/fxcodec/fx_codec_def.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
 class CJBig2_ArithDecoder;
diff --git a/core/src/fxcodec/jbig2/JBig2_Define.h b/core/src/fxcodec/jbig2/JBig2_Define.h
index d1a19c5d61..ccc30998c9 100644
--- a/core/src/fxcodec/jbig2/JBig2_Define.h
+++ b/core/src/fxcodec/jbig2/JBig2_Define.h
@@ -7,7 +7,8 @@
 #ifndef _JBIG2_DEFINE_H_
 #define _JBIG2_DEFINE_H_
 
-#include "../../../include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
+
 #define JBIG2_memset FXSYS_memset
 #define JBIG2_memcmp FXSYS_memcmp
 #define JBIG2_memcpy FXSYS_memcpy
diff --git a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp
index 083ac5e186..fc654c0da8 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp
@@ -6,10 +6,10 @@
 
 #include "JBig2_GrdProc.h"
 
-#include "../../../include/fxcodec/fx_codec.h"
 #include "JBig2_ArithDecoder.h"
 #include "JBig2_BitStream.h"
 #include "JBig2_Image.h"
+#include "core/include/fxcodec/fx_codec.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
 CJBig2_GRDProc::CJBig2_GRDProc()
diff --git a/core/src/fxcodec/jbig2/JBig2_GrdProc.h b/core/src/fxcodec/jbig2/JBig2_GrdProc.h
index fc3cb5cee8..07f28cca6d 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrdProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_GrdProc.h
@@ -7,9 +7,9 @@
 #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
 
-#include "../../../include/fxcrt/fx_system.h"
-#include "../../../include/fxcodec/fx_codec_def.h"
-#include "../../../include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcodec/fx_codec_def.h"
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_system.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_BitStream;
diff --git a/core/src/fxcodec/jbig2/JBig2_GrrdProc.h b/core/src/fxcodec/jbig2/JBig2_GrrdProc.h
index 1a7935bf95..42b4eb66d9 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrrdProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_GrrdProc.h
@@ -7,7 +7,7 @@
 #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_GRRDPROC_H_
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_GRRDPROC_H_
 
-#include "../../../include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_Image;
diff --git a/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp b/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp
index ee43cdba5e..53af1fd16e 100644
--- a/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp
@@ -6,11 +6,11 @@
 
 #include "JBig2_GsidProc.h"
 
-#include "../../../include/fxcrt/fx_basic.h"
 #include "JBig2_BitStream.h"
 #include "JBig2_GrdProc.h"
 #include "JBig2_Image.h"
 #include "JBig2_List.h"
+#include "core/include/fxcrt/fx_basic.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
 FX_DWORD* CJBig2_GSIDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder,
diff --git a/core/src/fxcodec/jbig2/JBig2_GsidProc.h b/core/src/fxcodec/jbig2/JBig2_GsidProc.h
index 93a231f145..dfd16b8f0c 100644
--- a/core/src/fxcodec/jbig2/JBig2_GsidProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_GsidProc.h
@@ -7,7 +7,7 @@
 #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_GSIDPROC_H_
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_GSIDPROC_H_
 
-#include "../../../include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_BitStream;
diff --git a/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp
index d9768345a0..127ef0333c 100644
--- a/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp
@@ -6,8 +6,8 @@
 
 #include "JBig2_HtrdProc.h"
 
-#include "../../../include/fxcrt/fx_basic.h"
 #include "JBig2_GsidProc.h"
+#include "core/include/fxcrt/fx_basic.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
 CJBig2_Image* CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder,
diff --git a/core/src/fxcodec/jbig2/JBig2_HtrdProc.h b/core/src/fxcodec/jbig2/JBig2_HtrdProc.h
index f7a507067b..30e038058c 100644
--- a/core/src/fxcodec/jbig2/JBig2_HtrdProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_HtrdProc.h
@@ -7,7 +7,7 @@
 #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_HTRDPROC_H_
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_HTRDPROC_H_
 
-#include "../../../include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
 
 #include "JBig2_Image.h"
 
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp b/core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp
index 9d7cd2aee1..6b6f16109b 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp
@@ -10,9 +10,9 @@
 
 #include <vector>
 
-#include "../../../include/fxcrt/fx_memory.h"
 #include "JBig2_BitStream.h"
 #include "JBig2_Define.h"
+#include "core/include/fxcrt/fx_memory.h"
 
 CJBig2_HuffmanTable::CJBig2_HuffmanTable(const JBig2TableLine* pTable,
                                          int nLines,
diff --git a/core/src/fxcodec/jbig2/JBig2_Image.cpp b/core/src/fxcodec/jbig2/JBig2_Image.cpp
index 4cb467427c..a2a0acfe95 100644
--- a/core/src/fxcodec/jbig2/JBig2_Image.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_Image.cpp
@@ -6,9 +6,9 @@
 
 #include <limits.h>
 
-#include "../../../include/fxcrt/fx_coordinates.h"
-#include "../../../include/fxcrt/fx_safe_types.h"
 #include "JBig2_Image.h"
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_safe_types.h"
 
 CJBig2_Image::CJBig2_Image(int32_t w, int32_t h) {
   m_nWidth = w;
diff --git a/core/src/fxcodec/jbig2/JBig2_List.h b/core/src/fxcodec/jbig2/JBig2_List.h
index 6097294e17..6f6169064d 100644
--- a/core/src/fxcodec/jbig2/JBig2_List.h
+++ b/core/src/fxcodec/jbig2/JBig2_List.h
@@ -7,6 +7,8 @@
 #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_LIST_H_
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_LIST_H_
 
+#include <stdlib.h>
+
 #include <vector>
 
 // A poor man's ScopedVector for pointers of TYPE.
diff --git a/core/src/fxcodec/jbig2/JBig2_Page.h b/core/src/fxcodec/jbig2/JBig2_Page.h
index ba4b288453..6d5e55a39c 100644
--- a/core/src/fxcodec/jbig2/JBig2_Page.h
+++ b/core/src/fxcodec/jbig2/JBig2_Page.h
@@ -7,7 +7,7 @@
 #ifndef _JBIG2_PAGE_H_
 #define _JBIG2_PAGE_H_
 
-#include "../../../include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
 
 struct JBig2PageInfo {
   FX_DWORD m_dwWidth;
diff --git a/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp b/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp
index 21f6d64182..b32daa0de7 100644
--- a/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp
@@ -6,7 +6,7 @@
 
 #include "JBig2_PatternDict.h"
 
-#include "../../../include/fxcrt/fx_memory.h"
+#include "core/include/fxcrt/fx_memory.h"
 
 CJBig2_PatternDict::CJBig2_PatternDict() {
   NUMPATS = 0;
diff --git a/core/src/fxcodec/jbig2/JBig2_PddProc.h b/core/src/fxcodec/jbig2/JBig2_PddProc.h
index 5b4e609a7a..2f875f5d92 100644
--- a/core/src/fxcodec/jbig2/JBig2_PddProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_PddProc.h
@@ -7,7 +7,7 @@
 #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_PDDPROC_H_
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_PDDPROC_H_
 
-#include "../../../include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_BitStream;
diff --git a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp b/core/src/fxcodec/jbig2/JBig2_SddProc.cpp
index fe39e71af9..52aef2b37f 100644
--- a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_SddProc.cpp
@@ -6,7 +6,6 @@
 
 #include "JBig2_SddProc.h"
 
-#include "../../../include/fxcrt/fx_basic.h"
 #include "JBig2_ArithIntDecoder.h"
 #include "JBig2_GrdProc.h"
 #include "JBig2_GrrdProc.h"
@@ -14,6 +13,7 @@
 #include "JBig2_HuffmanTable.h"
 #include "JBig2_SymbolDict.h"
 #include "JBig2_TrdProc.h"
+#include "core/include/fxcrt/fx_basic.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/core/src/fxcodec/jbig2/JBig2_SddProc.h b/core/src/fxcodec/jbig2/JBig2_SddProc.h
index 01f8014ccc..77ac049baf 100644
--- a/core/src/fxcodec/jbig2/JBig2_SddProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_SddProc.h
@@ -9,8 +9,8 @@
 
 #include <vector>
 
-#include "../../../include/fxcrt/fx_system.h"
 #include "JBig2_ArithDecoder.h"
+#include "core/include/fxcrt/fx_system.h"
 
 class CJBig2_BitStream;
 class CJBig2_HuffmanTable;
diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.cpp b/core/src/fxcodec/jbig2/JBig2_Segment.cpp
index 1b0d4e9303..41eeafee9e 100644
--- a/core/src/fxcodec/jbig2/JBig2_Segment.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_Segment.cpp
@@ -6,7 +6,7 @@
 
 #include "JBig2_Segment.h"
 
-#include "../../../include/fxcrt/fx_memory.h"
+#include "core/include/fxcrt/fx_memory.h"
 
 CJBig2_Segment::CJBig2_Segment() {
   m_dwNumber = 0;
diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
index 351a8389c8..b1e56c0061 100644
--- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
@@ -6,8 +6,8 @@
 
 #include "JBig2_SymbolDict.h"
 
-#include "../../../include/fxcrt/fx_memory.h"
 #include "JBig2_Image.h"
+#include "core/include/fxcrt/fx_memory.h"
 
 CJBig2_SymbolDict::CJBig2_SymbolDict() {
 }
diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h
index 107b282c9e..5c7fe3c479 100644
--- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h
+++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h
@@ -9,9 +9,9 @@
 
 #include <vector>
 
-#include "../../../include/fxcrt/fx_basic.h"
 #include "JBig2_ArithDecoder.h"
 #include "JBig2_List.h"
+#include "core/include/fxcrt/fx_basic.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
 class CJBig2_Image;
diff --git a/core/src/fxcodec/jbig2/JBig2_TrdProc.h b/core/src/fxcodec/jbig2/JBig2_TrdProc.h
index a2358059ac..9e0802cde8 100644
--- a/core/src/fxcodec/jbig2/JBig2_TrdProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_TrdProc.h
@@ -7,9 +7,8 @@
 #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_TRDPROC_H_
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_TRDPROC_H_
 
-#include "../../../include/fxcrt/fx_system.h"
-
 #include "JBig2_Image.h"
+#include "core/include/fxcrt/fx_system.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_ArithIaidDecoder;