From 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 5 Nov 2015 18:39:40 -0800 Subject: Fix all relative includes to third_party. - In non-standalone builds, use the provided jpeg library. - Run gn format over all the GN files. - Also roll DEPS for buildtools to c2f2598. BUG=541704 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1425153006 . --- core/include/fpdfapi/fpdf_module.h | 2 +- core/include/fpdfapi/fpdf_parser.h | 2 +- core/include/fpdfapi/fpdf_render.h | 2 +- core/include/fpdfdoc/fpdf_doc.h | 2 +- core/include/fxcodec/fx_codec.h | 2 +- core/include/fxcodec/fx_codec_flate.h | 2 +- core/include/fxcrt/fx_safe_types.h | 2 +- core/include/fxcrt/fx_system.h | 2 +- core/include/fxge/fx_font.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'core/include') diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h index 2f88644041..e9c38306b7 100644 --- a/core/include/fpdfapi/fpdf_module.h +++ b/core/include/fpdfapi/fpdf_module.h @@ -7,9 +7,9 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_ -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxcrt/fx_coordinates.h" #include "../fxcrt/fx_system.h" +#include "third_party/base/nonstd_unique_ptr.h" class CCodec_ModuleMgr; class CFX_AffineMatrix; diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index d1f50038a7..2937d05938 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -7,9 +7,9 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxcrt/fx_system.h" #include "fpdf_objects.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFDF_Document; class CFDF_Parser; diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h index 7a5251e86e..1726988dd8 100644 --- a/core/include/fpdfapi/fpdf_render.h +++ b/core/include/fpdfapi/fpdf_render.h @@ -7,9 +7,9 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_ -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxge/fx_ge.h" #include "fpdf_page.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFX_GraphStateData; class CFX_PathData; diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index a86ae62610..cffb32bc20 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -10,9 +10,9 @@ #include #include -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fpdfapi/fpdf_parser.h" #include "../fpdfapi/fpdf_render.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFieldTree; class CPDF_AAction; diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h index 1d5bd78ac4..d8c66d9d65 100644 --- a/core/include/fxcodec/fx_codec.h +++ b/core/include/fxcodec/fx_codec.h @@ -9,9 +9,9 @@ #include -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxcrt/fx_basic.h" #include "fx_codec_def.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFX_DIBSource; class CJPX_Decoder; diff --git a/core/include/fxcodec/fx_codec_flate.h b/core/include/fxcodec/fx_codec_flate.h index 7d0106139e..eaecef49ca 100644 --- a/core/include/fxcodec/fx_codec_flate.h +++ b/core/include/fxcodec/fx_codec_flate.h @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../third_party/zlib_v128/zlib.h" +#include "third_party/zlib_v128/zlib.h" #ifdef __cplusplus extern "C" { diff --git a/core/include/fxcrt/fx_safe_types.h b/core/include/fxcrt/fx_safe_types.h index ee50a53e34..d10bdbeb1a 100644 --- a/core/include/fxcrt/fx_safe_types.h +++ b/core/include/fxcrt/fx_safe_types.h @@ -7,9 +7,9 @@ #include // For size_t. -#include "../../../third_party/base/numerics/safe_math.h" #include "fx_stream.h" // for FX_FILESIZE. #include "fx_system.h" +#include "third_party/base/numerics/safe_math.h" typedef pdfium::base::CheckedNumeric FX_SAFE_DWORD; typedef pdfium::base::CheckedNumeric FX_SAFE_INT32; diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index 53789581d7..5fe3453626 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -160,7 +160,7 @@ FXSYS_FILE* FXSYS_wfopen(const FX_WCHAR* filename, const FX_WCHAR* mode); #ifdef __cplusplus } // extern "C" -#include "../../../third_party/base/numerics/safe_conversions.h" +#include "third_party/base/numerics/safe_conversions.h" #define FXSYS_strlen(ptr) pdfium::base::checked_cast(strlen(ptr)) #define FXSYS_wcslen(ptr) pdfium::base::checked_cast(wcslen(ptr)) extern "C" { diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 8c2416e6e0..3e4ca95299 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -9,9 +9,9 @@ #include -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxcrt/fx_system.h" #include "fx_dib.h" +#include "third_party/base/nonstd_unique_ptr.h" typedef struct FT_FaceRec_* FXFT_Face; typedef void* FXFT_Library; -- cgit v1.2.3