Fold IFWL*::{Initialize|Finalize} into constructor/destructor

xfa/fwl/core/ifwl_widget.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/core/ifwl_widget.h"
 
 #include <algorithm>
 
@@ skipping 12 matching lines @@
 #include "xfa/fxfa/xfa_ffapp.h"
 
 #define FWL_STYLEEXT_MNU_Vert (1L << 0)
 
 IFWL_Widget::IFWL_Widget(const IFWL_App* app,
                          const CFWL_WidgetImpProperties& properties,
                          IFWL_Widget* pOuter)
     : m_pOwnerApp(app),
       m_pWidgetMgr(app->GetWidgetMgr()),
       m_pProperties(new CFWL_WidgetImpProperties(properties)),
-      m_pDelegate(nullptr),
       m_pCurDelegate(nullptr),
       m_pOuter(pOuter),
       m_pLayoutItem(nullptr),
       m_pAssociate(nullptr),
       m_iLock(0),
       m_nEventKey(0) {
   ASSERT(m_pWidgetMgr);
+
+  IFWL_Widget* pParent = m_pProperties->m_pParent;
+  m_pWidgetMgr->InsertWidget(pParent, this);
+  if (IsChild())
+    return;
+
+  IFWL_Widget* pOwner = m_pProperties->m_pOwner;
+  if (pOwner)
+    m_pWidgetMgr->SetOwner(pOwner, this);
 }
 
-IFWL_Widget::~IFWL_Widget() {}
-
-void IFWL_Widget::Initialize() {
-  IFWL_Widget* pParent = m_pProperties->m_pParent;
-  m_pWidgetMgr->InsertWidget(pParent, this);
-  if (!IsChild()) {
-    IFWL_Widget* pOwner = m_pProperties->m_pOwner;
-    if (pOwner)
-      m_pWidgetMgr->SetOwner(pOwner, this);
-  }
-}
-
-void IFWL_Widget::Finalize() {
+IFWL_Widget::~IFWL_Widget() {
   NotifyDriver();
   m_pWidgetMgr->RemoveWidget(this);
 }
 
 FX_BOOL IFWL_Widget::IsInstance(const CFX_WideStringC& wsClass) const {
   return FALSE;
 }
 
 FWL_Error IFWL_Widget::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
   if (bAutoSize) {
@@ skipping 281 matching lines @@
 IFWL_ThemeProvider* IFWL_Widget::GetThemeProvider() {
   return m_pProperties->m_pThemeProvider;
 }
 FWL_Error IFWL_Widget::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) {
   m_pProperties->m_pThemeProvider = pThemeProvider;
   return FWL_Error::Succeeded;
 }
 
 IFWL_WidgetDelegate* IFWL_Widget::GetCurrentDelegate() {
   if (!m_pCurDelegate)
-    m_pCurDelegate = m_pDelegate;
+    m_pCurDelegate = m_pDelegate.get();
   return m_pCurDelegate;
 }
 
 void IFWL_Widget::SetCurrentDelegate(IFWL_WidgetDelegate* pDelegate) {
   m_pCurDelegate = pDelegate;
 }
 
 const IFWL_App* IFWL_Widget::GetOwnerApp() const {
   return m_pOwnerApp;
 }
@@ skipping 544 matching lines @@
   }
 }
 
 void CFWL_WidgetImpDelegate::OnProcessEvent(CFWL_Event* pEvent) {}
 
 void CFWL_WidgetImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
                                           const CFX_Matrix* pMatrix) {
   CFWL_EvtDraw evt;
   evt.m_pGraphics = pGraphics;
 }