summaryrefslogtreecommitdiff
path: root/xfa/fwl/core/ifwl_edit.cpp
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-11-03 12:27:25 -0700
committerCommit bot <commit-bot@chromium.org>2016-11-03 12:27:25 -0700
commita5811f0edbaa3be7807dd84b3d4d7876289cef8a (patch)
tree1008064c03ae8288f6329f8fc1c3cec4b928a2f1 /xfa/fwl/core/ifwl_edit.cpp
parent20ef5b93439a0e28cd612b824831f8dfcf234dfd (diff)
downloadpdfium-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/ifwl_edit.cpp')
-rw-r--r--xfa/fwl/core/ifwl_edit.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/xfa/fwl/core/ifwl_edit.cpp b/xfa/fwl/core/ifwl_edit.cpp
index 111df72733..7b3d083c3e 100644
--- a/xfa/fwl/core/ifwl_edit.cpp
+++ b/xfa/fwl/core/ifwl_edit.cpp
@@ -53,9 +53,9 @@ void AddSquigglyPath(CFX_Path* pPathData,
} // namespace
IFWL_Edit::IFWL_Edit(const IFWL_App* app,
- const CFWL_WidgetImpProperties& properties,
+ std::unique_ptr<CFWL_WidgetProperties> properties,
IFWL_Widget* pOuter)
- : IFWL_Widget(app, properties, pOuter),
+ : IFWL_Widget(app, std::move(properties), pOuter),
m_fVAlignOffset(0.0f),
m_fScrollOffsetX(0.0f),
m_fScrollOffsetY(0.0f),
@@ -1449,13 +1449,14 @@ void IFWL_Edit::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_Disabled | FWL_WGTSTATE_Invisible;
- prop.m_pParent = this;
- prop.m_pThemeProvider = m_pProperties->m_pThemeProvider;
- IFWL_ScrollBar* sb = new IFWL_ScrollBar(m_pOwnerApp, prop, this);
+ auto prop = pdfium::MakeUnique<CFWL_WidgetProperties>();
+ prop->m_dwStyleExes = bVert ? FWL_STYLEEXT_SCB_Vert : FWL_STYLEEXT_SCB_Horz;
+ prop->m_dwStates = FWL_WGTSTATE_Disabled | FWL_WGTSTATE_Invisible;
+ prop->m_pParent = this;
+ prop->m_pThemeProvider = m_pProperties->m_pThemeProvider;
+
+ IFWL_ScrollBar* sb = new IFWL_ScrollBar(m_pOwnerApp, std::move(prop), this);
if (bVert)
m_pVertScrollBar.reset(sb);
else
@@ -1554,8 +1555,8 @@ bool IFWL_Edit::ValidateNumberChar(FX_WCHAR cNum) {
void IFWL_Edit::InitCaret() {
if (!m_pCaret) {
if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_InnerCaret)) {
- CFWL_WidgetImpProperties prop;
- m_pCaret.reset(new IFWL_Caret(m_pOwnerApp, prop, this));
+ m_pCaret.reset(new IFWL_Caret(
+ m_pOwnerApp, pdfium::MakeUnique<CFWL_WidgetProperties>(), this));
m_pCaret->SetParent(this);
m_pCaret->SetStates(m_pProperties->m_dwStates);
}