From a5811f0edbaa3be7807dd84b3d4d7876289cef8a Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 3 Nov 2016 12:27:25 -0700 Subject: Unify CFWL_WidgetProperties and CFWL_WidgetImpProperties. 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 --- xfa/fwl/core/ifwl_listbox.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'xfa/fwl/core/ifwl_listbox.cpp') diff --git a/xfa/fwl/core/ifwl_listbox.cpp b/xfa/fwl/core/ifwl_listbox.cpp index b462c8e34b..f0d2f019d3 100644 --- a/xfa/fwl/core/ifwl_listbox.cpp +++ b/xfa/fwl/core/ifwl_listbox.cpp @@ -22,9 +22,9 @@ const int kItemTextMargin = 2; } // namespace IFWL_ListBox::IFWL_ListBox(const IFWL_App* app, - const CFWL_WidgetImpProperties& properties, + std::unique_ptr properties, IFWL_Widget* pOuter) - : IFWL_Widget(app, properties, pOuter), + : IFWL_Widget(app, std::move(properties), pOuter), m_dwTTOStyles(0), m_iTTOAligns(0), m_hAnchor(nullptr), @@ -873,13 +873,13 @@ void IFWL_ListBox::InitScrollBar(bool bVert) { if ((bVert && m_pVertScrollBar) || (!bVert && m_pHorzScrollBar)) { return; } - CFWL_WidgetImpProperties prop; - prop.m_dwStyleExes = bVert ? FWL_STYLEEXT_SCB_Vert : FWL_STYLEEXT_SCB_Horz; - prop.m_dwStates = FWL_WGTSTATE_Invisible; - prop.m_pParent = this; - prop.m_pThemeProvider = m_pScrollBarTP; + auto prop = pdfium::MakeUnique(); + prop->m_dwStyleExes = bVert ? FWL_STYLEEXT_SCB_Vert : FWL_STYLEEXT_SCB_Horz; + prop->m_dwStates = FWL_WGTSTATE_Invisible; + prop->m_pParent = this; + prop->m_pThemeProvider = m_pScrollBarTP; (bVert ? &m_pVertScrollBar : &m_pHorzScrollBar) - ->reset(new IFWL_ScrollBar(m_pOwnerApp, prop, this)); + ->reset(new IFWL_ScrollBar(m_pOwnerApp, std::move(prop), this)); } bool IFWL_ListBox::IsShowScrollBar(bool bVert) { -- cgit v1.2.3