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/fxge/agg/include/fx_agg_driver.h | 10 +++++++--- core/src/fxge/agg/src/fx_agg_driver.cpp | 7 ++++--- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'core/src/fxge/agg') diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h index c0b23dddb4..77d2f2af6e 100644 --- a/core/src/fxge/agg/include/fx_agg_driver.h +++ b/core/src/fxge/agg/include/fx_agg_driver.h @@ -4,13 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FX_AGG_DRIVER_H_ -#define FX_AGG_DRIVER_H_ +#ifndef CORE_SRC_FXGE_AGG_INCLUDE_FX_AGG_DRIVER_H_ +#define CORE_SRC_FXGE_AGG_INCLUDE_FX_AGG_DRIVER_H_ +#include "core/include/fxge/fx_ge.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 CFX_AffineMatrix; +class CFX_PathData; + class CAgg_PathData { public: CAgg_PathData() {} @@ -144,4 +148,4 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver { FX_BOOL m_bGroupKnockout; }; -#endif // FX_AGG_DRIVER_H_ +#endif // CORE_SRC_FXGE_AGG_INCLUDE_FX_AGG_DRIVER_H_ diff --git a/core/src/fxge/agg/src/fx_agg_driver.cpp b/core/src/fxge/agg/src/fx_agg_driver.cpp index 57ece1e6a1..5b5100bcc5 100644 --- a/core/src/fxge/agg/src/fx_agg_driver.cpp +++ b/core/src/fxge/agg/src/fx_agg_driver.cpp @@ -4,11 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../include/fxcodec/fx_codec.h" -#include "../../../../include/fxge/fx_ge.h" +#include "core/src/fxge/agg/include/fx_agg_driver.h" + #include "../../dib/dib_int.h" #include "../../ge/text_int.h" -#include "../include/fx_agg_driver.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_ge.h" #include "third_party/agg23/agg_conv_dash.h" #include "third_party/agg23/agg_conv_stroke.h" #include "third_party/agg23/agg_curves.h" -- cgit v1.2.3