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 --- xfa/include/fxgraphics/fx_graphics.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'xfa/include/fxgraphics') diff --git a/xfa/include/fxgraphics/fx_graphics.h b/xfa/include/fxgraphics/fx_graphics.h index ddec9605b7..0eb3cf4e9f 100644 --- a/xfa/include/fxgraphics/fx_graphics.h +++ b/xfa/include/fxgraphics/fx_graphics.h @@ -94,7 +94,6 @@ enum { }; typedef FX_INT32 FX_DeviceCap; typedef FX_INT32 FX_FillMode; -class CFX_Object; class CFX_RenderDevice; class CFX_GraphStateData; class CFX_Matrix; @@ -110,7 +109,7 @@ class CFX_Color; class CFX_Path; class CFX_Pattern; class CFX_Shading; -class CFX_Graphics : public CFX_Object +class CFX_Graphics { public: @@ -295,7 +294,7 @@ private: protected: FX_INT32 _type; private: - struct TInfo : public CFX_Object { + struct TInfo { CFX_GraphStateData _graphState; FX_BOOL _isAntialiasing; FX_StrokeAlignment _strokeAlignment; @@ -314,7 +313,7 @@ private: friend class CAGG_Graphics; }; -class CFX_Path : public CFX_Object +class CFX_Path { public: @@ -388,7 +387,7 @@ public: private: CFX_PathGenerator * _generator; }; -class CFX_Color : public CFX_Object +class CFX_Color { public: @@ -426,7 +425,7 @@ private: friend class CFX_Graphics; }; -class CFX_Pattern : public CFX_Object +class CFX_Pattern { public: @@ -468,7 +467,7 @@ private: }; friend class CFX_Graphics; }; -class CFX_Shading : public CFX_Object +class CFX_Shading { public: -- cgit v1.2.3