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 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'core/include/fpdfapi') 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; -- cgit v1.2.3