diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-11-03 12:27:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-03 12:27:25 -0700 |
| commit | a5811f0edbaa3be7807dd84b3d4d7876289cef8a (patch) | |
| tree | 1008064c03ae8288f6329f8fc1c3cec4b928a2f1 /xfa/fwl/core/cfwl_widgetproperties.h | |
| parent | 20ef5b93439a0e28cd612b824831f8dfcf234dfd (diff) | |
| download | pdfium-a5811f0edbaa3be7807dd84b3d4d7876289cef8a.tar.xz | |
Unify CFWL_WidgetProperties and CFWL_WidgetImpProperties.chromium/2909
The CFWL_WidgetProperties class was just being used to create default
CFWL_WidgetImpProperties classes. This CL updates the code to make it clear that
we have unique_ptrs to the properties and changes CFWL_WidgetImpProperties
to be named CFWL_WidgetProperties.
Review-Url: https://codereview.chromium.org/2469893004
Diffstat (limited to 'xfa/fwl/core/cfwl_widgetproperties.h')
| -rw-r--r-- | xfa/fwl/core/cfwl_widgetproperties.h | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/xfa/fwl/core/cfwl_widgetproperties.h b/xfa/fwl/core/cfwl_widgetproperties.h index afadfc49f1..21040b9ee9 100644 --- a/xfa/fwl/core/cfwl_widgetproperties.h +++ b/xfa/fwl/core/cfwl_widgetproperties.h @@ -8,30 +8,46 @@ #define XFA_FWL_CORE_CFWL_WIDGETPROPERTIES_H_ #include "core/fxcrt/fx_coordinates.h" -#include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/fwl_widgetdef.h" -class CFWL_Widget; class IFWL_DataProvider; +class IFWL_ThemeProvider; +class IFWL_Widget; class CFWL_WidgetProperties { public: CFWL_WidgetProperties(); + CFWL_WidgetProperties(IFWL_DataProvider* dataProvider); ~CFWL_WidgetProperties(); - CFWL_WidgetProperties(const CFWL_WidgetProperties& other); - CFWL_WidgetImpProperties MakeWidgetImpProperties( - IFWL_DataProvider* pDataProvider) const; - - CFX_WideString m_wsWindowclass; CFX_Matrix m_ctmOnParent; CFX_RectF m_rtWidget; uint32_t m_dwStyles; uint32_t m_dwStyleExes; uint32_t m_dwStates; - CFWL_Widget* m_pParent; - CFWL_Widget* m_pOwner; + IFWL_ThemeProvider* m_pThemeProvider; + IFWL_DataProvider* m_pDataProvider; + IFWL_Widget* m_pParent; + IFWL_Widget* m_pOwner; }; +inline CFWL_WidgetProperties::CFWL_WidgetProperties() + : CFWL_WidgetProperties(nullptr) {} + +inline CFWL_WidgetProperties::CFWL_WidgetProperties( + IFWL_DataProvider* dataProvider) + : m_dwStyles(FWL_WGTSTYLE_Child), + m_dwStyleExes(0), + m_dwStates(0), + m_pThemeProvider(nullptr), + m_pDataProvider(dataProvider), + m_pParent(nullptr), + m_pOwner(nullptr) { + m_ctmOnParent.SetIdentity(); + m_rtWidget.Set(0, 0, 0, 0); +} + +inline CFWL_WidgetProperties::~CFWL_WidgetProperties() {} + #endif // XFA_FWL_CORE_CFWL_WIDGETPROPERTIES_H_ |