Merge delegates into IFWL_* classes.

This Cl removes ownership of the delgates from IFWL_Widget and puts it in the
hand of the creating classes. In doing so, merge the delegates back into the
IFWL_* classes to simplify logic.

Review-Url: https://codereview.chromium.org/2467993003

1 files changed, 3 insertions, 14 deletions

diff --git a/xfa/fwl/core/ifwl_caret.h b/xfa/fwl/core/ifwl_caret.h
index 022cadad27..888e8ffbed 100644
--- a/xfa/fwl/core/ifwl_caret.h
+++ b/xfa/fwl/core/ifwl_caret.h
@@ -15,7 +15,6 @@
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
-class CFWL_CaretImpDelegate;
 
 #define FWL_STATE_CAT_HightLight 1
 
@@ -30,6 +29,9 @@ class IFWL_Caret : public IFWL_Widget {
   FWL_Type GetClassID() const override;
   FWL_Error DrawWidget(CFX_Graphics* pGraphics,
                        const CFX_Matrix* pMatrix = nullptr) override;
+  void OnProcessMessage(CFWL_Message* pMessage) override;
+  void OnDrawWidget(CFX_Graphics* pGraphics,
+                    const CFX_Matrix* pMatrix) override;
 
   void ShowCaret(FX_BOOL bFlag = TRUE);
   FWL_Error GetFrequency(uint32_t& elapse);
@@ -37,8 +39,6 @@ class IFWL_Caret : public IFWL_Widget {
   FWL_Error SetColor(CFX_Color crFill);
 
  protected:
-  friend class CFWL_CaretImpDelegate;
-
   class Timer : public IFWL_Timer {
    public:
     explicit Timer(IFWL_Caret* pCaret);
@@ -59,15 +59,4 @@ class IFWL_Caret : public IFWL_Widget {
   FX_BOOL m_bSetColor;
 };
 
-class CFWL_CaretImpDelegate : public CFWL_WidgetImpDelegate {
- public:
-  CFWL_CaretImpDelegate(IFWL_Caret* pOwner);
-  void OnProcessMessage(CFWL_Message* pMessage) override;
-  void OnDrawWidget(CFX_Graphics* pGraphics,
-                    const CFX_Matrix* pMatrix = nullptr) override;
-
- protected:
-  IFWL_Caret* m_pOwner;
-};
-
 #endif  // XFA_FWL_CORE_IFWL_CARET_H_