Merge to XFA: Fix all relative includes to core.

Do some IWYU to fix build errors due to files that have no #includes but
just happened to work previously because the #includes were in the right
order.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1407423004 .

(cherry picked from commit 9e7cd8ffb81c564e1102f6c6459ec0942a0b11ea)

Review URL: https://codereview.chromium.org/1425163004 .

10 files changed, 33 insertions, 16 deletions

diff --git a/third_party/agg23/agg_array.h b/third_party/agg23/agg_array.h
index 810eb4ef22..a22a5c242a 100644
--- a/third_party/agg23/agg_array.h
+++ b/third_party/agg23/agg_array.h
@@ -15,11 +15,14 @@
 //----------------------------------------------------------------------------
 #ifndef AGG_ARRAY_INCLUDED
 #define AGG_ARRAY_INCLUDED
+
 #include "agg_basics.h"
+#include "core/include/fxcrt/fx_memory.h"  // For FXSYS_* macros.
+
 namespace agg
 {
-template<class T> class pod_array 
-{
+template <class T>
+class pod_array {
 public:
     typedef T value_type;
     ~pod_array()
diff --git a/third_party/agg23/agg_basics.h b/third_party/agg23/agg_basics.h
index d2fad58feb..752560bede 100644
--- a/third_party/agg23/agg_basics.h
+++ b/third_party/agg23/agg_basics.h
@@ -40,6 +40,9 @@
 #define AGG_INT64U unsigned long long
 #endif
 #define AGG_INLINE inline
+
+#include "core/include/fxcrt/fx_system.h"  // For FX_FLOAT
+
 namespace agg
 {
 typedef AGG_INT8   int8;
diff --git a/third_party/agg23/agg_curves.cpp b/third_party/agg23/agg_curves.cpp
index 5a2d5631d6..e19221d33e 100644
--- a/third_party/agg23/agg_curves.cpp
+++ b/third_party/agg23/agg_curves.cpp
@@ -18,9 +18,11 @@
 //          mcseemagg@yahoo.com
 //          http://www.antigrain.com
 //----------------------------------------------------------------------------
-#include "../../core/include/fxcrt/fx_basic.h"
+
 #include "agg_curves.h"
 #include "agg_math.h"
+#include "core/include/fxcrt/fx_basic.h"
+
 namespace agg
 {
 const FX_FLOAT curve_collinearity_epsilon              = 1e-30f;
diff --git a/third_party/agg23/agg_path_storage.cpp b/third_party/agg23/agg_path_storage.cpp
index f5c9843e58..b803a1c730 100644
--- a/third_party/agg23/agg_path_storage.cpp
+++ b/third_party/agg23/agg_path_storage.cpp
@@ -22,9 +22,11 @@
 // Class path_storage
 //
 //----------------------------------------------------------------------------
-#include "../../core/include/fxcrt/fx_basic.h"
-#include "agg_path_storage.h"
+
 #include "agg_math.h"
+#include "agg_path_storage.h"
+#include "core/include/fxcrt/fx_basic.h"
+
 namespace agg
 {
 path_storage::~path_storage()
diff --git a/third_party/agg23/agg_rasterizer_scanline_aa.h b/third_party/agg23/agg_rasterizer_scanline_aa.h
index af31e0f2af..dceb3e8595 100644
--- a/third_party/agg23/agg_rasterizer_scanline_aa.h
+++ b/third_party/agg23/agg_rasterizer_scanline_aa.h
@@ -29,13 +29,15 @@
 //----------------------------------------------------------------------------
 #ifndef AGG_RASTERIZER_SCANLINE_AA_INCLUDED
 #define AGG_RASTERIZER_SCANLINE_AA_INCLUDED
-#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"
+#include "agg_basics.h"
 #include "agg_clip_liang_barsky.h"
+#include "agg_math.h"
 #include "agg_render_scanlines.h"
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_memory.h"
+
 namespace agg
 {
 enum poly_base_scale_e {
diff --git a/third_party/agg23/agg_vcgen_dash.cpp b/third_party/agg23/agg_vcgen_dash.cpp
index 43f8edf350..5c5bd78486 100644
--- a/third_party/agg23/agg_vcgen_dash.cpp
+++ b/third_party/agg23/agg_vcgen_dash.cpp
@@ -17,9 +17,11 @@
 // Line dash generator
 //
 //----------------------------------------------------------------------------
-#include "../../core/include/fxcrt/fx_basic.h"
-#include "agg_vcgen_dash.h"
+
 #include "agg_shorten_path.h"
+#include "agg_vcgen_dash.h"
+#include "core/include/fxcrt/fx_basic.h"
+
 namespace agg
 {
 vcgen_dash::vcgen_dash() :
diff --git a/third_party/agg23/agg_vcgen_stroke.cpp b/third_party/agg23/agg_vcgen_stroke.cpp
index 9b8cb66fd9..ef8bc27864 100644
--- a/third_party/agg23/agg_vcgen_stroke.cpp
+++ b/third_party/agg23/agg_vcgen_stroke.cpp
@@ -22,8 +22,10 @@
 // Stroke generator
 //
 //----------------------------------------------------------------------------
-#include "../../core/include/fxcrt/fx_basic.h"
+
 #include "agg_vcgen_stroke.h"
+#include "core/include/fxcrt/fx_basic.h"
+
 namespace agg
 {
 
diff --git a/third_party/lcms2-2.6/src/cmserr.c b/third_party/lcms2-2.6/src/cmserr.c
index 743b4f5034..dfad4c98fb 100644
--- a/third_party/lcms2-2.6/src/cmserr.c
+++ b/third_party/lcms2-2.6/src/cmserr.c
@@ -251,8 +251,8 @@ cmsBool  _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase *Data)
     return TRUE;
 }
 #else
-#include "../../../core/include/fxcrt/fx_memory.h"
-#include "../../../core/include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_memory.h"
+#include "core/include/fxcrt/fx_system.h"
 
 cmsBool  _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plugin)
 {
diff --git a/third_party/libjpeg/jinclude.h b/third_party/libjpeg/jinclude.h
index bae2b02a37..157a606e22 100644
--- a/third_party/libjpeg/jinclude.h
+++ b/third_party/libjpeg/jinclude.h
@@ -20,7 +20,8 @@
 #include "jconfig.h"		/* auto configuration options */
 #define JCONFIG_INCLUDED	/* so that jpeglib.h doesn't do it again */
 
-#include "../../core/include/fxcrt/fx_system.h"
+#include "core/include/fxcrt/fx_system.h"
+
 /*
  * We need the NULL macro and size_t typedef.
  * On an ANSI-conforming system it is sufficient to include <stddef.h>.
diff --git a/third_party/zlib_v128/zutil.h b/third_party/zlib_v128/zutil.h
index f271873ba5..053dd60caa 100644
--- a/third_party/zlib_v128/zutil.h
+++ b/third_party/zlib_v128/zutil.h
@@ -13,7 +13,7 @@
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#include "../../core/include/fxcrt/fx_system.h"		/* XYQ 2007-5-22 */
+#include "core/include/fxcrt/fx_system.h"
 
 #ifdef HAVE_HIDDEN
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))