Use virtual function to retrieve interface pointer

xfa/fwl/lightwidget/cfwl_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/lightwidget/cfwl_widget.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/fwl_widgetimp.h"
 #include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
 #define FWL_WGT_CalcHeight 2048
 #define FWL_WGT_CalcWidth 2048
 #define FWL_WGT_CalcMultiLineDefWidth 120.0f
 
 IFWL_Widget* CFWL_Widget::GetWidget() {
-  return m_pIface;
+  return m_pIface.get();
+}
+
+const IFWL_Widget* CFWL_Widget::GetWidget() const {
+  return m_pIface.get();
 }
 
 FWL_Error CFWL_Widget::GetClassName(CFX_WideString& wsClass) const {
   if (!m_pIface)
     return FWL_Error::Indefinite;
   return m_pIface->GetClassName(wsClass);
 }
 
 FWL_Type CFWL_Widget::GetClassID() const {
   if (!m_pIface)
@@ skipping 167 matching lines @@
 
 IFWL_WidgetDelegate* CFWL_Widget::SetDelegate(IFWL_WidgetDelegate* pDelegate) {
   if (!m_pIface)
     return nullptr;
 
   m_pDelegate = m_pIface->SetDelegate(pDelegate);
   return m_pDelegate;
 }
 
 CFWL_Widget::CFWL_Widget()
-    : m_pIface(nullptr), m_pDelegate(nullptr), m_pProperties(nullptr) {
-  m_pProperties = new CFWL_WidgetProperties;
+    : m_pDelegate(nullptr), m_pProperties(new CFWL_WidgetProperties) {
   m_pWidgetMgr = CFWL_WidgetMgr::GetInstance();

[Lei Zhang, 2016/08/05 17:34:18]

Put this in the initializer list and make it a const ptr?

[Wei Li, 2016/08/08 23:55:37]

Done.

   ASSERT(m_pWidgetMgr);
 }
 
 CFWL_Widget::~CFWL_Widget() {
-  delete m_pProperties;
-  if (m_pIface) {
+  if (m_pIface)
     m_pIface->Finalize();
-    delete m_pIface;
-  }
 }
 
 FWL_Error CFWL_Widget::Repaint(const CFX_RectF* pRect) {
   if (!m_pIface)
     return FWL_Error::Indefinite;
 
   CFX_RectF rect;
   if (pRect) {
     rect = *pRect;
   } else {
     m_pIface->GetWidgetRect(rect);
     rect.left = rect.top = 0;
   }
-  return m_pWidgetMgr->RepaintWidget(m_pIface, &rect);
+  return m_pWidgetMgr->RepaintWidget(m_pIface.get(), &rect);
 }
 
 FWL_Error CFWL_Widget::SetFocus(FX_BOOL bFocus) {
   if (!m_pIface)
     return FWL_Error::Indefinite;
 
   IFWL_App* pApp = m_pIface->GetOwnerApp();
   if (!pApp)
     return FWL_Error::Indefinite;
 
   CFWL_NoteDriver* pDriver = pApp->GetNoteDriver();
   if (!pDriver)
     return FWL_Error::Indefinite;
 
   if (bFocus) {
-    pDriver->SetFocus(m_pIface);
+    pDriver->SetFocus(m_pIface.get());
   } else {
-    if (pDriver->GetFocus() == m_pIface) {
+    if (pDriver->GetFocus() == m_pIface.get()) {
       pDriver->SetFocus(nullptr);
     }
   }
   return FWL_Error::Succeeded;
 }
 
 FWL_Error CFWL_Widget::SetGrab(FX_BOOL bSet) {
   if (!m_pIface)
     return FWL_Error::Indefinite;
 
   IFWL_App* pApp = m_pIface->GetOwnerApp();
   if (!pApp)
     return FWL_Error::Indefinite;
 
   CFWL_NoteDriver* pDriver = pApp->GetNoteDriver();
   if (!pDriver)
     return FWL_Error::Indefinite;
 
-  pDriver->SetGrab(m_pIface, bSet);
+  pDriver->SetGrab(m_pIface.get(), bSet);
   return FWL_Error::Succeeded;
 }
 
 void CFWL_Widget::RegisterEventTarget(CFWL_Widget* pEventSource,
                                       uint32_t dwFilter) {
   if (!m_pIface)
     return;
 
   IFWL_App* pApp = m_pIface->GetOwnerApp();
   if (!pApp)
@@ skipping 29 matching lines @@
                                     FX_BOOL bMultiLine,
                                     int32_t iLineWidth) {
   if (!m_pIface)
     return CFX_SizeF();
 
   IFWL_ThemeProvider* pTheme = m_pIface->GetThemeProvider();
   if (!pTheme)
     return CFX_SizeF();
 
   CFWL_ThemeText calPart;
-  calPart.m_pWidget = m_pIface;
+  calPart.m_pWidget = m_pIface.get();
   calPart.m_wsText = wsText;
   calPart.m_dwTTOStyles =
       bMultiLine ? FDE_TTOSTYLE_LineWrap : FDE_TTOSTYLE_SingleLine;
   calPart.m_iTTOAlign = FDE_TTOALIGNMENT_TopLeft;
   CFX_RectF rect;
   FX_FLOAT fWidth = bMultiLine
                         ? (iLineWidth > 0 ? (FX_FLOAT)iLineWidth
                                           : FWL_WGT_CalcMultiLineDefWidth)
                         : FWL_WGT_CalcWidth;
   rect.Set(0, 0, fWidth, FWL_WGT_CalcHeight);
   pTheme->CalcTextRect(&calPart, rect);
   return CFX_SizeF(rect.width, rect.height);
 }