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

xfa/fwl/core/ifwl_barcode.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_barcode.h"
 
+#include "third_party/base/ptr_util.h"
 #include "xfa/fgas/font/fgas_gefont.h"
 #include "xfa/fwl/core/cfwl_themepart.h"
 #include "xfa/fwl/core/cfx_barcode.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
 IFWL_Barcode::IFWL_Barcode(const IFWL_App* app,
                            const CFWL_WidgetImpProperties& properties)
-    : IFWL_Edit(app, properties, nullptr), m_dwStatus(0), m_type(BC_UNKNOWN) {}
+    : IFWL_Edit(app, properties, nullptr), m_dwStatus(0), m_type(BC_UNKNOWN) {
+  SetDelegate(pdfium::MakeUnique<CFWL_BarcodeImpDelegate>(this));
+}
 
-IFWL_Barcode::~IFWL_Barcode() {}
+IFWL_Barcode::~IFWL_Barcode() {
+  m_pBarcodeEngine.reset();

[Tom Sepez, 2016/10/31 20:26:11]

does deletion order matter?  Is there a reason we are explicitly resetting this?

[dsinclair, 2016/11/01 15:39:45]

Nope, as far as I know we can just get it get destroyed normally. Copied from
the Finalize without thinking.

+}
 
 FWL_Type IFWL_Barcode::GetClassID() const {
   return FWL_Type::Barcode;
 }
 
-void IFWL_Barcode::Initialize() {
-  if (!m_pDelegate)
-    m_pDelegate = new CFWL_BarcodeImpDelegate(this);
-
-  IFWL_Edit::Initialize();
-}
-
-void IFWL_Barcode::Finalize() {
-  delete m_pDelegate;
-  m_pDelegate = nullptr;
-  m_pBarcodeEngine.reset();
-  IFWL_Edit::Finalize();
-}
-
 FWL_Error IFWL_Barcode::Update() {
   if (IsLocked()) {
     return FWL_Error::Indefinite;
   }
   FWL_Error ret = IFWL_Edit::Update();
   GenerateBarcodeImageCache();
   return ret;
 }
 
 FWL_Error IFWL_Barcode::DrawWidget(CFX_Graphics* pGraphics,
@@ skipping 141 matching lines @@
     : CFWL_EditImpDelegate(pOwner) {}
 
 void CFWL_BarcodeImpDelegate::OnProcessEvent(CFWL_Event* pEvent) {
   if (pEvent->GetClassID() == CFWL_EventType::TextChanged) {
     IFWL_Barcode* pOwner = static_cast<IFWL_Barcode*>(m_pOwner);
     pOwner->m_pBarcodeEngine.reset();
     pOwner->m_dwStatus = XFA_BCS_NeedUpdate;
   }
   CFWL_EditImpDelegate::OnProcessEvent(pEvent);
 }