From 8fec3e42ed57a988ad5e7faae5e6a83847a3267e Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 4 Nov 2015 15:32:02 -0800 Subject: Merge to XFA: Make checkdeps --resolve-dotdot succeed. This is just a straight-forward, partial merge. It does not actually make checkdeps succeed. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1419373005 . (cherry picked from commit 79f5a32175293620abe456554e10efb7c3f4e7c6) Review URL: https://codereview.chromium.org/1409153007 . --- third_party/agg23/agg_rasterizer_scanline_aa.cpp | 1 - third_party/agg23/agg_rasterizer_scanline_aa.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/agg23') diff --git a/third_party/agg23/agg_rasterizer_scanline_aa.cpp b/third_party/agg23/agg_rasterizer_scanline_aa.cpp index 8216e60221..46379f6dfd 100644 --- a/third_party/agg23/agg_rasterizer_scanline_aa.cpp +++ b/third_party/agg23/agg_rasterizer_scanline_aa.cpp @@ -46,7 +46,6 @@ // All other code is very different from the original. // //---------------------------------------------------------------------------- -#include "../../core/include/fxcrt/fx_ext.h" #include #include "agg_rasterizer_scanline_aa.h" namespace agg diff --git a/third_party/agg23/agg_rasterizer_scanline_aa.h b/third_party/agg23/agg_rasterizer_scanline_aa.h index da1900d0dd..af31e0f2af 100644 --- a/third_party/agg23/agg_rasterizer_scanline_aa.h +++ b/third_party/agg23/agg_rasterizer_scanline_aa.h @@ -29,7 +29,8 @@ //---------------------------------------------------------------------------- #ifndef AGG_RASTERIZER_SCANLINE_AA_INCLUDED #define AGG_RASTERIZER_SCANLINE_AA_INCLUDED -#include "../../core/include/fxge/fx_ge.h" +#include "../../core/include/fxcrt/fx_coordinates.h" +#include "../../core/include/fxcrt/fx_memory.h" #include "agg_basics.h" #include "agg_math.h" #include "agg_array.h" -- cgit v1.2.3