From 9fb27cb9797937499c9678bc74cf7846cbf5d2b8 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 10 Nov 2015 09:41:05 -0800 Subject: Fix relative includes within core/ R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1427633010 . --- core/src/fpdfapi/fpdf_page/fpdf_page.cpp | 6 ++++-- core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | 8 +++++--- core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp | 9 +++++---- core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp | 10 ++++++---- core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp | 11 ++++++----- core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp | 6 ++++-- core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp | 7 ++++--- core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp | 8 +++++--- core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp | 8 +++++--- core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp | 3 ++- core/src/fpdfapi/fpdf_page/pageint.h | 4 ++-- 11 files changed, 48 insertions(+), 32 deletions(-) (limited to 'core/src/fpdfapi/fpdf_page') diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp index 162acfa898..eaa8ef1127 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" #include "pageint.h" + +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" + CPDF_PageObject* CPDF_PageObject::Create(int type) { switch (type) { case PDFPAGE_TEXT: diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp index e4bb1a3d10..934d102564 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -4,12 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fxcodec/fx_codec.h" #include "pageint.h" + #include +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fxcodec/fx_codec.h" + namespace { void sRGB_to_AdobeCMYK(FX_FLOAT R, diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp index 8656b72023..1e82642c12 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fdrm/fx_crypt.h" -#include "../fpdf_font/font_int.h" #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" + class CPDF_PageModule : public IPDF_PageModule { public: CPDF_PageModule() diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp index 0b9f043eb2..81d31a7eae 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp @@ -4,13 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "pageint.h" + #include + #include -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fxcrt/fx_safe_types.h" -#include "pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fxcrt/fx_safe_types.h" #include "third_party/base/nonstd_unique_ptr.h" #include "third_party/base/numerics/safe_conversions_impl.h" 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 78d3d26188..3094e48c0c 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp @@ -4,13 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../fpdf_render/render_int.h" #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" + void CPDF_GraphicStates::DefaultStates() { m_ColorState.New()->Default(); } diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp index 06e2d2c187..9c16173a6f 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" #include "pageint.h" + +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" + CPDF_ImageObject::CPDF_ImageObject() { m_pImage = NULL; m_Type = PDFPAGE_IMAGE; diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp index e095414ffe..163b6e9d53 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp @@ -4,11 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_serial.h" #include "pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_serial.h" + #define REQUIRE_PARAMS(count) \ if (m_ParamCount != count) { \ return; \ diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp index 9adfdb21a4..0c48b5a137 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp @@ -4,12 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fxcodec/fx_codec.h" #include "pageint.h" + #include +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fxcodec/fx_codec.h" + namespace { const char kPathOperatorSubpath = 'm'; diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp index 81b69bcb24..0880388541 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fpdfapi/fpdf_module.h" #include "pageint.h" + +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" + void CPDF_PathObject::CopyData(const CPDF_PageObject* pSrc) { const CPDF_PathObject* pSrcObj = (const CPDF_PathObject*)pSrc; m_Path = pSrcObj->m_Path; diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp index b669b3b5d2..0c6b476db2 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" #include "pageint.h" +#include "core/include/fpdfapi/fpdf_page.h" + namespace { const int kSingleCoordinatePair = 1; diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 3b2aef55af..96c70c2245 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -9,8 +9,8 @@ #include -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" #include "third_party/base/nonstd_unique_ptr.h" class CPDF_AllStates; -- cgit v1.2.3