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/include/fxcrt/fx_coordinates.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/include/fxcrt/fx_coordinates.h') diff --git a/core/include/fxcrt/fx_coordinates.h b/core/include/fxcrt/fx_coordinates.h index 0b4b920195..758d33762e 100644 --- a/core/include/fxcrt/fx_coordinates.h +++ b/core/include/fxcrt/fx_coordinates.h @@ -18,7 +18,7 @@ template class CFX_ATemplate; template class CFX_RRTemplate; class CFX_Matrix; template -class CFX_PSVTemplate : public CFX_Object +class CFX_PSVTemplate { public: typedef CFX_PSVTemplate FXT_PSV; @@ -230,7 +230,7 @@ public: typedef CFX_VTemplate CFX_Vector; typedef CFX_VTemplate CFX_VectorF; template -class CFX_RTemplate: public CFX_Object +class CFX_RTemplate { public: typedef CFX_PSVTemplate FXT_POINT; @@ -610,7 +610,7 @@ struct FX_SMALL_RECT { FX_SHORT Bottom; }; -class CFX_FloatRect : public CFX_Object +class CFX_FloatRect { public: @@ -749,7 +749,7 @@ public: FX_FLOAT top; }; -class CFX_Matrix : public CFX_Object +class CFX_Matrix { public: -- cgit v1.2.3