From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: 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 --- core/src/fxge/agg/agg23/agg_basics.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/src/fxge/agg/agg23/agg_basics.h') 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 struct rect_base : public CFX_Object { +template struct rect_base { typedef rect_base 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() {} -- cgit v1.2.3