Unify CFWL_WidgetProperties and CFWL_WidgetImpProperties.

xfa/fwl/core/ifwl_widget.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_IFWL_WIDGET_H_
 #define XFA_FWL_CORE_IFWL_WIDGET_H_
 
 #include <memory>
@@ skipping 36 matching lines @@
   PictureBox,
   PushButton,
   ScrollBar,
   SpinButton,
   ToolTip
 };
 
 class CFWL_AppImp;
 class CFWL_MsgKey;
 class CFWL_Widget;
-class CFWL_WidgetImpProperties;
+class CFWL_WidgetProperties;
 class CFWL_WidgetMgr;
 class IFWL_App;
 class IFWL_DataProvider;
 class IFWL_ThemeProvider;
 class IFWL_Widget;
 enum class FWL_Type;
 
 class IFWL_Widget : public IFWL_WidgetDelegate {
  public:
   ~IFWL_Widget() override;
@@ skipping 70 matching lines @@
 
   void SetAssociateWidget(CFWL_Widget* pAssociate);
 
   void SetFocus(bool bFocus);
   void Repaint(const CFX_RectF* pRect = nullptr);
 
  protected:
   friend class CFWL_WidgetImpDelegate;
 
   IFWL_Widget(const IFWL_App* app,
-              const CFWL_WidgetImpProperties& properties,
+              std::unique_ptr<CFWL_WidgetProperties> properties,
               IFWL_Widget* pOuter);
 
   bool IsEnabled() const;
   bool IsVisible() const;
   bool IsActive() const;
   bool IsOverLapper() const;
   bool IsPopup() const;
   bool IsChild() const;
   bool IsLocked() const;
   bool IsOffscreen() const;
@@ skipping 49 matching lines @@
   void DrawEdge(CFX_Graphics* pGraphics,
                 CFWL_Part iPartEdge,
                 IFWL_ThemeProvider* pTheme,
                 const CFX_Matrix* pMatrix = nullptr);
   void NotifyDriver();
 
   bool IsParent(IFWL_Widget* pParent);
 
   const IFWL_App* const m_pOwnerApp;
   CFWL_WidgetMgr* const m_pWidgetMgr;
-  std::unique_ptr<CFWL_WidgetImpProperties> m_pProperties;
+  std::unique_ptr<CFWL_WidgetProperties> m_pProperties;
   IFWL_Widget* m_pOuter;
   void* m_pLayoutItem;
   CFWL_Widget* m_pAssociate;
   int32_t m_iLock;
   uint32_t m_nEventKey;
 
  private:
   IFWL_WidgetDelegate* m_pDelegate;  // Not owned.
 };
 
 #endif  // XFA_FWL_CORE_IFWL_WIDGET_H_