Merge to XFA: Kill CFX_Object.

Not just a simple merge, but changes to remove CFX_Object from XFA.

Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org

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

16 files changed, 32 insertions, 32 deletions

diff --git a/core/src/fxge/agg/agg23/agg_array.h b/core/src/fxge/agg/agg23/agg_array.h
index f5680d90fe..b3b5f2b877 100644
--- a/core/src/fxge/agg/agg23/agg_array.h
+++ b/core/src/fxge/agg/agg23/agg_array.h
@@ -18,7 +18,7 @@
 #include "agg_basics.h"
 namespace agg
 {
-template<class T> class pod_array : public CFX_Object
+template<class T> class pod_array 
 {
 public:
     typedef T value_type;
@@ -157,7 +157,7 @@ pod_array<T>::operator = (const pod_array<T>&v)
     }
     return *this;
 }
-template<class T, unsigned S = 6> class pod_deque : public CFX_Object
+template<class T, unsigned S = 6> class pod_deque 
 {
 public:
     enum block_scale_e {
@@ -409,7 +409,7 @@ unsigned pod_deque<T, S>::byte_size() const
 {
     return m_size * sizeof(T);
 }
-class pod_allocator : public CFX_Object
+class pod_allocator 
 {
 public:
     void remove_all()
diff --git a/core/src/fxge/agg/agg23/agg_basics.h b/core/src/fxge/agg/agg23/agg_basics.h
index a78fed8c23..d2fad58feb 100644
--- a/core/src/fxge/agg/agg23/agg_basics.h
+++ b/core/src/fxge/agg/agg23/agg_basics.h
@@ -58,7 +58,7 @@ enum cover_scale_e {
     cover_none  = 0,
     cover_full  = cover_mask
 };
-template<class T> struct rect_base : public CFX_Object {
+template<class T> struct rect_base  {
     typedef rect_base<T> self_type;
     T x1;
     T y1;
@@ -257,7 +257,7 @@ inline unsigned set_orientation(unsigned c, unsigned o)
     c &= ~path_flags_jr;
     return clear_orientation(c) | o;
 }
-struct point_type : public CFX_Object {
+struct point_type  {
     FX_FLOAT x, y;
     unsigned flag;
     point_type() {}
@@ -271,7 +271,7 @@ struct point_type_flag : public point_type {
     }
     point_type_flag(FX_FLOAT x_, FX_FLOAT y_, unsigned flag_ = 0) : point_type(x_, y_), flag(flag_) {}
 };
-struct vertex_type : public CFX_Object {
+struct vertex_type  {
     FX_FLOAT   x, y;
     unsigned cmd;
     vertex_type() {}
diff --git a/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h b/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h
index 1cf817a1c7..0d8d6ff99e 100644
--- a/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h
+++ b/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h
@@ -18,7 +18,7 @@
 #include "agg_basics.h"
 namespace agg
 {
-struct null_markers : public CFX_Object {
+struct null_markers  {
     void remove_all() {}
     void add_vertex(FX_FLOAT, FX_FLOAT, unsigned) {}
     void prepare_src() {}
@@ -30,7 +30,7 @@ struct null_markers : public CFX_Object {
 };
 template<class VertexSource,
          class Generator,
-         class Markers = null_markers> class conv_adaptor_vcgen : public CFX_Object
+         class Markers = null_markers> class conv_adaptor_vcgen 
 {
     enum status {
         initial,
diff --git a/core/src/fxge/agg/agg23/agg_curves.h b/core/src/fxge/agg/agg23/agg_curves.h
index 61270e64a5..495f7a6a8f 100644
--- a/core/src/fxge/agg/agg23/agg_curves.h
+++ b/core/src/fxge/agg/agg23/agg_curves.h
@@ -19,7 +19,7 @@
 #include "agg_array.h"
 namespace agg
 {
-struct curve4_points : public CFX_Object {
+struct curve4_points  {
     FX_FLOAT cp[8];
     curve4_points() {}
     curve4_points(FX_FLOAT x1, FX_FLOAT y1,
@@ -59,7 +59,7 @@ struct curve4_points : public CFX_Object {
         return cp[i];
     }
 };
-class curve4_div : public CFX_Object
+class curve4_div 
 {
 public:
     curve4_div() :
@@ -135,7 +135,7 @@ private:
     unsigned              m_count;
     pod_deque<point_type> m_points;
 };
-class curve4 : public CFX_Object
+class curve4 
 {
 public:
     curve4() {}
diff --git a/core/src/fxge/agg/agg23/agg_path_storage.h b/core/src/fxge/agg/agg23/agg_path_storage.h
index 64ea0b4753..dc13851d09 100644
--- a/core/src/fxge/agg/agg23/agg_path_storage.h
+++ b/core/src/fxge/agg/agg23/agg_path_storage.h
@@ -18,7 +18,7 @@
 #include "agg_basics.h"
 namespace agg
 {
-class path_storage : public CFX_Object
+class path_storage 
 {
     enum block_scale_e {
         block_shift = 8,
@@ -27,7 +27,7 @@ class path_storage : public CFX_Object
         block_pool  = 256
     };
 public:
-    class vertex_source : public CFX_Object
+    class vertex_source 
     {
     public:
         vertex_source() {}
diff --git a/core/src/fxge/agg/agg23/agg_pixfmt_gray.h b/core/src/fxge/agg/agg23/agg_pixfmt_gray.h
index 052a2e35d8..5a80935479 100644
--- a/core/src/fxge/agg/agg23/agg_pixfmt_gray.h
+++ b/core/src/fxge/agg/agg23/agg_pixfmt_gray.h
@@ -28,7 +28,7 @@
 #include "agg_rendering_buffer.h"
 namespace agg
 {
-template<class ColorT> struct blender_gray : public CFX_Object {
+template<class ColorT> struct blender_gray  {
     typedef ColorT color_type;
     typedef typename color_type::value_type value_type;
     typedef typename color_type::calc_type calc_type;
@@ -40,7 +40,7 @@ template<class ColorT> struct blender_gray : public CFX_Object {
     }
 };
 template<class Blender, unsigned Step = 1, unsigned Offset = 0>
-class pixel_formats_gray : public CFX_Object
+class pixel_formats_gray 
 {
 public:
     typedef rendering_buffer::row_data row_data;
diff --git a/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h b/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h
index e9f0defbe8..e06322c24d 100644
--- a/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h
+++ b/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h
@@ -46,7 +46,7 @@ inline int poly_coord(FX_FLOAT c)
 {
     return int(c * poly_base_size);
 }
-struct cell_aa : public CFX_Object {
+struct cell_aa  {
     int x;
     int y;
     int cover;
@@ -56,7 +56,7 @@ struct cell_aa : public CFX_Object {
     void set_cover(int c, int a);
     void add_cover(int c, int a);
 };
-class outline_aa : public CFX_Object
+class outline_aa 
 {
     enum cell_block_scale_e {
         cell_block_shift = 12,
@@ -65,7 +65,7 @@ class outline_aa : public CFX_Object
         cell_block_pool  = 256,
         cell_block_limit = 1024
     };
-    struct sorted_y : public CFX_Object {
+    struct sorted_y  {
         unsigned start;
         unsigned num;
     };
@@ -134,7 +134,7 @@ private:
     int       m_max_y;
     bool      m_sorted;
 };
-class scanline_hit_test : public CFX_Object
+class scanline_hit_test 
 {
 public:
     scanline_hit_test(int x) : m_x(x), m_hit(false) {}
@@ -168,7 +168,7 @@ enum filling_rule_e {
     fill_non_zero,
     fill_even_odd
 };
-class rasterizer_scanline_aa : public CFX_Object
+class rasterizer_scanline_aa 
 {
     enum status {
         status_initial,
diff --git a/core/src/fxge/agg/agg23/agg_renderer_base.h b/core/src/fxge/agg/agg23/agg_renderer_base.h
index 3e20a6d408..bd1b203b9a 100644
--- a/core/src/fxge/agg/agg23/agg_renderer_base.h
+++ b/core/src/fxge/agg/agg23/agg_renderer_base.h
@@ -23,7 +23,7 @@
 #include "agg_rendering_buffer.h"
 namespace agg
 {
-template<class PixelFormat> class renderer_base : public CFX_Object
+template<class PixelFormat> class renderer_base 
 {
 public:
     typedef PixelFormat pixfmt_type;
diff --git a/core/src/fxge/agg/agg23/agg_renderer_scanline.h b/core/src/fxge/agg/agg23/agg_renderer_scanline.h
index b02b6b5f66..62d104f7f2 100644
--- a/core/src/fxge/agg/agg23/agg_renderer_scanline.h
+++ b/core/src/fxge/agg/agg23/agg_renderer_scanline.h
@@ -20,7 +20,7 @@
 #include "agg_render_scanlines.h"
 namespace agg
 {
-template<class BaseRenderer, class SpanGenerator> class renderer_scanline_aa : public CFX_Object
+template<class BaseRenderer, class SpanGenerator> class renderer_scanline_aa 
 {
 public:
     typedef BaseRenderer  base_ren_type;
diff --git a/core/src/fxge/agg/agg23/agg_rendering_buffer.h b/core/src/fxge/agg/agg23/agg_rendering_buffer.h
index 5a8681b537..9c1c0c6899 100644
--- a/core/src/fxge/agg/agg23/agg_rendering_buffer.h
+++ b/core/src/fxge/agg/agg23/agg_rendering_buffer.h
@@ -22,17 +22,17 @@
 #include "agg_basics.h"
 namespace agg
 {
-class rendering_buffer : public CFX_Object
+class rendering_buffer 
 {
 public:
-    struct row_data : public CFX_Object {
+    struct row_data  {
         int x1, x2;
         const int8u* ptr;
         row_data() {}
         row_data(int x1_, int x2_, const int8u* ptr_) :
             x1(x1_), x2(x2_), ptr(ptr_) {}
     };
-    struct span_data : public CFX_Object {
+    struct span_data  {
         int x;
         unsigned len;
         int8u* ptr;
diff --git a/core/src/fxge/agg/agg23/agg_scanline_u.h b/core/src/fxge/agg/agg23/agg_scanline_u.h
index f99feef91c..5b132907fd 100644
--- a/core/src/fxge/agg/agg23/agg_scanline_u.h
+++ b/core/src/fxge/agg/agg23/agg_scanline_u.h
@@ -26,13 +26,13 @@
 #include "agg_array.h"
 namespace agg
 {
-template<class CoverT> class scanline_u : public CFX_Object
+template<class CoverT> class scanline_u 
 {
 public:
     typedef scanline_u<CoverT> self_type;
     typedef CoverT cover_type;
     typedef int16  coord_type;
-    struct span : public CFX_Object {
+    struct span  {
         coord_type  x;
         coord_type  len;
         cover_type* covers;
diff --git a/core/src/fxge/agg/agg23/agg_vcgen_dash.h b/core/src/fxge/agg/agg23/agg_vcgen_dash.h
index 961da2d718..9c3aa630c2 100644
--- a/core/src/fxge/agg/agg23/agg_vcgen_dash.h
+++ b/core/src/fxge/agg/agg23/agg_vcgen_dash.h
@@ -23,7 +23,7 @@
 #include "agg_vertex_sequence.h"
 namespace agg
 {
-class vcgen_dash : public CFX_Object
+class vcgen_dash 
 {
     enum max_dashes_e {
         max_dashes = 32
diff --git a/core/src/fxge/agg/agg23/agg_vcgen_stroke.h b/core/src/fxge/agg/agg23/agg_vcgen_stroke.h
index 38fe1fc25d..84fadd6ed8 100644
--- a/core/src/fxge/agg/agg23/agg_vcgen_stroke.h
+++ b/core/src/fxge/agg/agg23/agg_vcgen_stroke.h
@@ -18,7 +18,7 @@
 #include "agg_math_stroke.h"
 namespace agg
 {
-class vcgen_stroke : public CFX_Object
+class vcgen_stroke 
 {
     enum status_e {
         initial,
diff --git a/core/src/fxge/agg/agg23/agg_vertex_sequence.h b/core/src/fxge/agg/agg23/agg_vertex_sequence.h
index 29486d4787..6600bf2085 100644
--- a/core/src/fxge/agg/agg23/agg_vertex_sequence.h
+++ b/core/src/fxge/agg/agg23/agg_vertex_sequence.h
@@ -70,7 +70,7 @@ void vertex_sequence<T, S>::close(bool closed)
     }
 }
 const FX_FLOAT vertex_dist_epsilon = 1e-14f;
-struct vertex_dist : public CFX_Object {
+struct vertex_dist  {
     FX_FLOAT   x;
     FX_FLOAT   y;
     FX_FLOAT   dist;
diff --git a/core/src/fxge/agg/agg23/fx_agg_driver.cpp b/core/src/fxge/agg/agg23/fx_agg_driver.cpp
index 8cea42d661..5944332fd8 100644
--- a/core/src/fxge/agg/agg23/fx_agg_driver.cpp
+++ b/core/src/fxge/agg/agg23/fx_agg_driver.cpp
@@ -369,7 +369,7 @@ FX_BOOL CFX_AggDeviceDriver::SetClip_PathStroke(const CFX_PathData* pPathData,
     SetClipMask(rasterizer);
     return TRUE;
 }
-class CFX_Renderer : public CFX_Object
+class CFX_Renderer 
 {
 private:
     int			m_Alpha,
diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h
index c3411905b9..c87fc246be 100644
--- a/core/src/fxge/agg/include/fx_agg_driver.h
+++ b/core/src/fxge/agg/include/fx_agg_driver.h
@@ -8,7 +8,7 @@
 #define _FX_AGG_DEVICE_DRIVER_
 #include "fxfx_agg_path_storage.h"
 #include "fxfx_agg_rasterizer_scanline_aa.h"
-class CAgg_PathData : public CFX_Object
+class CAgg_PathData 
 {
 public:
     CAgg_PathData() {}