diff options
author | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
commit | 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c (patch) | |
tree | 422e979cbfdeab9781c07a4040aee94a9dd0a7f6 /core/src/fxge | |
parent | ba2d95fb6d7b6eb3b27ca8e6eb41d9aae1a8b691 (diff) | |
download | pdfium-34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c.tar.xz |
Fix all relative includes to third_party.chromium/2560chromium/2559chromium/2558chromium/2557
- 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 .
Diffstat (limited to 'core/src/fxge')
-rw-r--r-- | core/src/fxge/agg/include/fx_agg_driver.h | 6 | ||||
-rw-r--r-- | core/src/fxge/agg/src/fx_agg_driver.cpp | 19 | ||||
-rw-r--r-- | core/src/fxge/freetype/fx_freetype.c | 2 | ||||
-rw-r--r-- | core/src/fxge/ge/fx_ge_path.cpp | 2 |
4 files changed, 15 insertions, 14 deletions
diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h index c3de76d369..c0b23dddb4 100644 --- a/core/src/fxge/agg/include/fx_agg_driver.h +++ b/core/src/fxge/agg/include/fx_agg_driver.h @@ -7,9 +7,9 @@ #ifndef FX_AGG_DRIVER_H_ #define FX_AGG_DRIVER_H_ -#include "../../../../../third_party/agg23/agg_clip_liang_barsky.h" -#include "../../../../../third_party/agg23/agg_path_storage.h" -#include "../../../../../third_party/agg23/agg_rasterizer_scanline_aa.h" +#include "third_party/agg23/agg_clip_liang_barsky.h" +#include "third_party/agg23/agg_path_storage.h" +#include "third_party/agg23/agg_rasterizer_scanline_aa.h" class CAgg_PathData { public: diff --git a/core/src/fxge/agg/src/fx_agg_driver.cpp b/core/src/fxge/agg/src/fx_agg_driver.cpp index d9783d174b..57ece1e6a1 100644 --- a/core/src/fxge/agg/src/fx_agg_driver.cpp +++ b/core/src/fxge/agg/src/fx_agg_driver.cpp @@ -4,19 +4,20 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../../include/fxcodec/fx_codec.h" #include "../../../../include/fxge/fx_ge.h" #include "../../dib/dib_int.h" #include "../../ge/text_int.h" -#include "../../../../include/fxcodec/fx_codec.h" -#include "../../../../../third_party/agg23/agg_pixfmt_gray.h" -#include "../../../../../third_party/agg23/agg_path_storage.h" -#include "../../../../../third_party/agg23/agg_scanline_u.h" -#include "../../../../../third_party/agg23/agg_rasterizer_scanline_aa.h" -#include "../../../../../third_party/agg23/agg_renderer_scanline.h" -#include "../../../../../third_party/agg23/agg_curves.h" -#include "../../../../../third_party/agg23/agg_conv_stroke.h" -#include "../../../../../third_party/agg23/agg_conv_dash.h" #include "../include/fx_agg_driver.h" +#include "third_party/agg23/agg_conv_dash.h" +#include "third_party/agg23/agg_conv_stroke.h" +#include "third_party/agg23/agg_curves.h" +#include "third_party/agg23/agg_path_storage.h" +#include "third_party/agg23/agg_pixfmt_gray.h" +#include "third_party/agg23/agg_rasterizer_scanline_aa.h" +#include "third_party/agg23/agg_renderer_scanline.h" +#include "third_party/agg23/agg_scanline_u.h" + void _HardClip(FX_FLOAT& x, FX_FLOAT& y) { if (x > 50000) { x = 50000; diff --git a/core/src/fxge/freetype/fx_freetype.c b/core/src/fxge/freetype/fx_freetype.c index 78dec9ad99..4804bc1d1b 100644 --- a/core/src/fxge/freetype/fx_freetype.c +++ b/core/src/fxge/freetype/fx_freetype.c @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../include/fxge/fx_freetype.h" -#include "../../../../third_party/freetype/src/psnames/pstables.h" +#include "third_party/freetype/src/psnames/pstables.h" static int xyq_search_node(char* glyph_name, int name_offset, int table_offset, wchar_t unicode) { diff --git a/core/src/fxge/ge/fx_ge_path.cpp b/core/src/fxge/ge/fx_ge_path.cpp index 9acbcabfbf..c8e4f61ad8 100644 --- a/core/src/fxge/ge/fx_ge_path.cpp +++ b/core/src/fxge/ge/fx_ge_path.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../third_party/base/numerics/safe_math.h" #include "../../../include/fxcrt/fx_system.h" #include "../../../include/fxge/fx_ge.h" +#include "third_party/base/numerics/safe_math.h" CFX_ClipRgn::CFX_ClipRgn(int width, int height) { m_Type = RectI; |