Merge the CFWL_*Imp classes into the IFWL_* classes.

xfa/fwl/core/ifwl_caret.h

Index: xfa/fwl/core/ifwl_caret.h
diff --git a/xfa/fwl/basewidget/fwl_caretimp.h b/xfa/fwl/core/ifwl_caret.h
similarity index 73%
rename from xfa/fwl/basewidget/fwl_caretimp.h
rename to xfa/fwl/core/ifwl_caret.h
index d8b621b43c28fb35b9c1cdf35bb7a1468faa68dc..e261fe95c34fa727050b64b5164026da804b88b6 100644
--- a/xfa/fwl/basewidget/fwl_caretimp.h
+++ b/xfa/fwl/core/ifwl_caret.h
@@ -4,12 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_BASEWIDGET_FWL_CARETIMP_H_
-#define XFA_FWL_BASEWIDGET_FWL_CARETIMP_H_
+#ifndef XFA_FWL_CORE_IFWL_CARET_H_
+#define XFA_FWL_CORE_IFWL_CARET_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/fwl_widgetimp.h"
 #include "xfa/fwl/core/ifwl_timer.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxgraphics/cfx_color.h"
@@ -18,13 +17,18 @@ class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class CFWL_CaretImpDelegate;
 
-class CFWL_CaretImp : public CFWL_WidgetImp {
+#define FWL_CLASS_Caret L"FWL_CARET"
+#define FWL_STATE_CAT_HightLight 1
+
+class IFWL_Caret : public IFWL_Widget {
  public:
-  CFWL_CaretImp(const CFWL_WidgetImpProperties& properties,
-                IFWL_Widget* pOuter);
-  ~CFWL_CaretImp() override;
+  static IFWL_Caret* Create(const CFWL_WidgetImpProperties& properties,
+                            IFWL_Widget* pOuter);
+
+  IFWL_Caret(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter);
+  ~IFWL_Caret() override;
 
-  // CFWL_WidgetImp
+  // IFWL_Widget
   FWL_Error GetClassName(CFX_WideString& wsClass) const override;
   FWL_Type GetClassID() const override;
   FWL_Error Initialize() override;
@@ -43,10 +47,10 @@ class CFWL_CaretImp : public CFWL_WidgetImp {
 
   class CFWL_CaretTimer : public IFWL_Timer {
    public:
-    explicit CFWL_CaretTimer(CFWL_CaretImp* pCaret);
+    explicit CFWL_CaretTimer(IFWL_Caret* pCaret);
     ~CFWL_CaretTimer() override {}
     void Run(IFWL_TimerInfo* hTimer) override;
-    CFWL_CaretImp* const m_pCaret;
+    IFWL_Caret* const m_pCaret;
   };
 
   void DrawCaretBK(CFX_Graphics* pGraphics,
@@ -62,13 +66,13 @@ class CFWL_CaretImp : public CFWL_WidgetImp {
 
 class CFWL_CaretImpDelegate : public CFWL_WidgetImpDelegate {
  public:
-  CFWL_CaretImpDelegate(CFWL_CaretImp* pOwner);
+  CFWL_CaretImpDelegate(IFWL_Caret* pOwner);
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnDrawWidget(CFX_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
  protected:
-  CFWL_CaretImp* m_pOwner;
+  IFWL_Caret* m_pOwner;
 };
 
-#endif  // XFA_FWL_BASEWIDGET_FWL_CARETIMP_H_
+#endif  // XFA_FWL_CORE_IFWL_CARET_H_