Merge delegates into IFWL_* classes.

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 44 matching lines @@
 class CFWL_MsgKey;
 class CFWL_Widget;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetMgr;
 class IFWL_App;
 class IFWL_DataProvider;
 class IFWL_ThemeProvider;
 class IFWL_Widget;
 enum class FWL_Type;
 
-class IFWL_Widget {
+class IFWL_Widget : public IFWL_WidgetDelegate {
  public:
-  virtual ~IFWL_Widget();
+  ~IFWL_Widget() override;
 
   virtual FWL_Type GetClassID() const = 0;
   virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const;
 
   virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
   virtual FWL_Error GetGlobalRect(CFX_RectF& rect);
   virtual FWL_Error SetWidgetRect(const CFX_RectF& rect);
   virtual FWL_Error GetClientRect(CFX_RectF& rect);
 
   virtual IFWL_Widget* GetParent();
@@ skipping 27 matching lines @@
 
   virtual FWL_Error GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE);
   virtual FWL_Error SetMatrix(const CFX_Matrix& matrix);
 
   virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics,
                                const CFX_Matrix* pMatrix = nullptr);
 
   virtual IFWL_ThemeProvider* GetThemeProvider();
   virtual FWL_Error SetThemeProvider(IFWL_ThemeProvider* pThemeProvider);
 
-  IFWL_WidgetDelegate* GetCurrentDelegate();
-  void SetCurrentDelegate(IFWL_WidgetDelegate* pDelegate);
+  void SetDelegate(IFWL_WidgetDelegate* delegate) { m_pDelegate = delegate; }
+  IFWL_WidgetDelegate* GetDelegate() {

[dsinclair, 2016/11/02 17:51:05]

This isn't const because I return |this|. I can make this const by doing a
const_cast but thought this was clearer.

[Tom Sepez, 2016/11/02 21:03:29]

Actually, you may want to have an overload: e.g.
IFWL_WidgetDelegate* GetDelegate();
const IFWL_WidgetDelegate* GetDelegate() const;

[dsinclair, 2016/11/02 21:11:14]

Done.

+    return m_pDelegate ? m_pDelegate : this;
+  }
+
+  // IFWL_WidgetDelegate.
+  void OnProcessMessage(CFWL_Message* pMessage) override;
+  void OnProcessEvent(CFWL_Event* pEvent) override;
+  void OnDrawWidget(CFX_Graphics* pGraphics,
+                    const CFX_Matrix* pMatrix = nullptr) override;
 
   const IFWL_App* GetOwnerApp() const;
 
   CFX_SizeF GetOffsetFromParent(IFWL_Widget* pParent);
 
   uint32_t GetEventKey() const;
   void SetEventKey(uint32_t key);
 
   void* GetLayoutItem() const;
   void SetLayoutItem(void* pItem);
 
   void SetAssociateWidget(CFWL_Widget* pAssociate);
 
+  void SetFocus(FX_BOOL bFocus);
+  void Repaint(const CFX_RectF* pRect = nullptr);
+
  protected:
   friend class CFWL_WidgetImpDelegate;
 
   IFWL_Widget(const IFWL_App* app,
               const CFWL_WidgetImpProperties& properties,
               IFWL_Widget* pOuter);
 
   FX_BOOL IsEnabled() const;
   FX_BOOL IsVisible() const;
   FX_BOOL IsActive() const;
@@ skipping 13 matching lines @@
   IFWL_Widget* GetRootOuter();
   CFX_SizeF CalcTextSize(const CFX_WideString& wsText,
                          IFWL_ThemeProvider* pTheme,
                          FX_BOOL bMultiLine = FALSE,
                          int32_t iLineWidth = -1);
   void CalcTextRect(const CFX_WideString& wsText,
                     IFWL_ThemeProvider* pTheme,
                     uint32_t dwTTOStyles,
                     int32_t iTTOAlign,
                     CFX_RectF& rect);
-  void SetFocus(FX_BOOL bFocus);
   void SetGrab(FX_BOOL bSet);
   FX_BOOL GetPopupPos(FX_FLOAT fMinHeight,
                       FX_FLOAT fMaxHeight,
                       const CFX_RectF& rtAnchor,
                       CFX_RectF& rtPopup);
   FX_BOOL GetPopupPosMenu(FX_FLOAT fMinHeight,
                           FX_FLOAT fMaxHeight,
                           const CFX_RectF& rtAnchor,
                           CFX_RectF& rtPopup);
   FX_BOOL GetPopupPosComboBox(FX_FLOAT fMinHeight,
                               FX_FLOAT fMaxHeight,
                               const CFX_RectF& rtAnchor,
                               CFX_RectF& rtPopup);
   FX_BOOL GetPopupPosGeneral(FX_FLOAT fMinHeight,
                              FX_FLOAT fMaxHeight,
                              const CFX_RectF& rtAnchor,
                              CFX_RectF& rtPopup);
   FX_BOOL GetScreenSize(FX_FLOAT& fx, FX_FLOAT& fy);
   void RegisterEventTarget(IFWL_Widget* pEventSource = nullptr,
                            uint32_t dwFilter = FWL_EVENT_ALL_MASK);
   void UnregisterEventTarget();
   void DispatchKeyEvent(CFWL_MsgKey* pNote);
   void DispatchEvent(CFWL_Event* pEvent);
-  void Repaint(const CFX_RectF* pRect = nullptr);
   void DrawBackground(CFX_Graphics* pGraphics,
                       CFWL_Part iPartBk,
                       IFWL_ThemeProvider* pTheme,
                       const CFX_Matrix* pMatrix = nullptr);
   void DrawBorder(CFX_Graphics* pGraphics,
                   CFWL_Part iPartBorder,
                   IFWL_ThemeProvider* pTheme,
                   const CFX_Matrix* pMatrix = nullptr);
   void DrawEdge(CFX_Graphics* pGraphics,
                 CFWL_Part iPartEdge,
                 IFWL_ThemeProvider* pTheme,
                 const CFX_Matrix* pMatrix = nullptr);
   void NotifyDriver();
 
   FX_BOOL IsParent(IFWL_Widget* pParent);
 
-  void SetDelegate(std::unique_ptr<IFWL_WidgetDelegate> delegate) {
-    m_pDelegate = std::move(delegate);
-  }
-  IFWL_WidgetDelegate* GetDelegate() const { return m_pDelegate.get(); }
-
   const IFWL_App* const m_pOwnerApp;
   CFWL_WidgetMgr* const m_pWidgetMgr;
   std::unique_ptr<CFWL_WidgetImpProperties> m_pProperties;
-  IFWL_WidgetDelegate* m_pCurDelegate;  // Not owned.
   IFWL_Widget* m_pOuter;
   void* m_pLayoutItem;
   CFWL_Widget* m_pAssociate;
   int32_t m_iLock;
   uint32_t m_nEventKey;
 
  private:
-  std::unique_ptr<IFWL_WidgetDelegate> m_pDelegate;
-};
-
-class CFWL_WidgetImpDelegate : public IFWL_WidgetDelegate {
- public:
-  CFWL_WidgetImpDelegate();
-  ~CFWL_WidgetImpDelegate() override {}
-  void OnProcessMessage(CFWL_Message* pMessage) override;
-  void OnProcessEvent(CFWL_Event* pEvent) override;
-  void OnDrawWidget(CFX_Graphics* pGraphics,
-                    const CFX_Matrix* pMatrix = nullptr) override;
+  IFWL_WidgetDelegate* m_pDelegate;  // Not owned.
 };
 
 #endif  // XFA_FWL_CORE_IFWL_WIDGET_H_