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/fwl/theme/formtp.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'xfa/include/fwl/theme/formtp.h') diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h index b7e68e2d5b..8f715e77b6 100644 --- a/xfa/include/fwl/theme/formtp.h +++ b/xfa/include/fwl/theme/formtp.h @@ -48,8 +48,7 @@ protected: CFX_RectF m_rtDisLBorder; CFX_RectF m_rtDisRBorder; CFX_RectF m_rtDisBBorder; - struct SBThemeData : public CFX_Object { - public: + struct SBThemeData { FX_ARGB clrHeadBK[2][4]; FX_ARGB clrHeadEdgeLeft[2][3]; FX_ARGB clrHeadEdgeRight[2][3]; -- cgit v1.2.3