Use std::map, std::unique_ptr in fwl_widgetmgrimp.h

xfa/fwl/core/fwl_widgetmgrimp.h

 // 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
 
 #ifndef XFA_FWL_CORE_FWL_WIDGETMGRIMP_H_
 #define XFA_FWL_CORE_FWL_WIDGETMGRIMP_H_
 
+#include <map>
+#include <memory>
+
 #include "core/fxcrt/include/fx_system.h"
 #include "xfa/fwl/core/fwl_error.h"
 #include "xfa/fwl/core/ifwl_widgetmgr.h"
 #include "xfa/fxgraphics/include/cfx_graphics.h"
 
 #define FWL_WGTMGR_DisableThread 0x00000001
 #define FWL_WGTMGR_DisableForm 0x00000002
 
 class CFWL_Message;
 class CFWL_WidgetMgrDelegate;
 class CXFA_FFApp;
 class CXFA_FWLAdapterWidgetMgr;
 class CFX_Graphics;
 class CFX_Matrix;
 class IFWL_Widget;
 
 class CFWL_WidgetMgrItem {
  public:
-  CFWL_WidgetMgrItem()
-      : pParent(NULL),
-        pOwner(NULL),
-        pChild(NULL),
-        pPrevious(NULL),
-        pNext(NULL),
-        pWidget(NULL),
-        pOffscreen(NULL),
+  CFWL_WidgetMgrItem() : CFWL_WidgetMgrItem(nullptr) {}
+  explicit CFWL_WidgetMgrItem(IFWL_Widget* widget)
+      : pParent(nullptr),
+        pOwner(nullptr),
+        pChild(nullptr),
+        pPrevious(nullptr),
+        pNext(nullptr),
+        pWidget(widget),
         iRedrawCounter(0)
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
         ,
         bOutsideChanged(FALSE)
 #endif
   {
   }
-  ~CFWL_WidgetMgrItem() {
-    if (pOffscreen) {
-      delete pOffscreen;
-      pOffscreen = NULL;
-    }
-  }
+  ~CFWL_WidgetMgrItem() {}
+
   CFWL_WidgetMgrItem* pParent;
   CFWL_WidgetMgrItem* pOwner;
   CFWL_WidgetMgrItem* pChild;
   CFWL_WidgetMgrItem* pPrevious;
   CFWL_WidgetMgrItem* pNext;
-  IFWL_Widget* pWidget;
-  CFX_Graphics* pOffscreen;
+  IFWL_Widget* const pWidget;
+  std::unique_ptr<CFX_Graphics> pOffscreen;
   int32_t iRedrawCounter;
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
   FX_BOOL bOutsideChanged;
 #endif
 };
 
 class CFWL_WidgetMgr : public IFWL_WidgetMgr {
  public:
   CFWL_WidgetMgr(CXFA_FFApp* pAdapterNative);
   ~CFWL_WidgetMgr() override;
@@ skipping 23 matching lines @@
   IFWL_Widget* nextTab(IFWL_Widget* parent, IFWL_Widget* focus, FX_BOOL& bFind);
   int32_t CountRadioButtonGroup(IFWL_Widget* pFirst);
   IFWL_Widget* GetSiblingRadioButton(IFWL_Widget* pWidget, FX_BOOL bNext);
   IFWL_Widget* GetRadioButtonGroupHeader(IFWL_Widget* pRadioButton);
   void GetSameGroupRadioButton(IFWL_Widget* pRadioButton,
                                CFX_ArrayTemplate<IFWL_Widget*>& group);
   IFWL_Widget* GetDefaultButton(IFWL_Widget* pParent);
   void AddRedrawCounts(IFWL_Widget* pWidget);
   void ResetRedrawCounts(IFWL_Widget* pWidget);
   CXFA_FWLAdapterWidgetMgr* GetAdapterWidgetMgr() const { return m_pAdapter; }
-  CFWL_WidgetMgrDelegate* GetDelegate() const { return m_pDelegate; }
-  CFWL_WidgetMgrItem* GetWidgetMgrItem(IFWL_Widget* pWidget);
+  CFWL_WidgetMgrDelegate* GetDelegate() const { return m_pDelegate.get(); }
+  CFWL_WidgetMgrItem* GetWidgetMgrItem(IFWL_Widget* pWidget) const;
   bool IsThreadEnabled();
   bool IsFormDisabled();
   FX_BOOL GetAdapterPopupPos(IFWL_Widget* pWidget,
                              FX_FLOAT fMinHeight,
                              FX_FLOAT fMaxHeight,
                              const CFX_RectF& rtAnchor,
                              CFX_RectF& rtPopup);
 
  protected:
   int32_t TravelWidgetMgr(CFWL_WidgetMgrItem* pParent,
                           int32_t* pIndex,
                           CFWL_WidgetMgrItem* pItem,
                           IFWL_Widget** pWidget = NULL);
   FX_BOOL IsAbleNative(IFWL_Widget* pWidget);
-  CFX_MapPtrToPtr m_mapWidgetItem;
-  CXFA_FWLAdapterWidgetMgr* m_pAdapter;
-  CFWL_WidgetMgrDelegate* m_pDelegate;
-  friend class CFWL_WidgetMgrDelegate;
+
   uint32_t m_dwCapability;
+  std::unique_ptr<CFWL_WidgetMgrDelegate> m_pDelegate;
+  std::map<IFWL_Widget*, std::unique_ptr<CFWL_WidgetMgrItem>> m_mapWidgetItem;
+  CXFA_FWLAdapterWidgetMgr* const m_pAdapter;
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
   CFX_RectF m_rtScreen;
 #endif
+  friend class CFWL_WidgetMgrDelegate;
 };
 
 class CFWL_WidgetMgrDelegate {
  public:
   CFWL_WidgetMgrDelegate(CFWL_WidgetMgr* pWidgetMgr);
   ~CFWL_WidgetMgrDelegate() {}
 
   FWL_Error OnSetCapability(uint32_t dwCapability = FWL_WGTMGR_DisableThread);
   void OnProcessMessageToForm(CFWL_Message* pMessage);
   void OnDrawWidget(IFWL_Widget* pWidget,
@@ skipping 14 matching lines @@
                        const CFX_Matrix* pMatrix);
   FX_BOOL IsNeedRepaint(IFWL_Widget* pWidget,
                         CFX_Matrix* pMatrix,
                         const CFX_RectF& rtDirty);
   FX_BOOL bUseOffscreenDirect(IFWL_Widget* pWidget);
 
   CFWL_WidgetMgr* m_pWidgetMgr;
 };
 
 #endif  // XFA_FWL_CORE_FWL_WIDGETMGRIMP_H_