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

xfa/fwl/core/ifwl_caret.cpp

Index: xfa/fwl/core/ifwl_caret.cpp
diff --git a/xfa/fwl/basewidget/fwl_caretimp.cpp b/xfa/fwl/core/ifwl_caret.cpp
similarity index 61%
rename from xfa/fwl/basewidget/fwl_caretimp.cpp
rename to xfa/fwl/core/ifwl_caret.cpp
index cd51bd7430f8c95e74f292a51eb3df427b094e51..5ece9626eb8526e422a7cad421643d24ce49921c 100644
--- a/xfa/fwl/basewidget/fwl_caretimp.cpp
+++ b/xfa/fwl/core/ifwl_caret.cpp
@@ -4,40 +4,23 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/basewidget/fwl_caretimp.h"
+#include "xfa/fwl/core/ifwl_caret.h"
 
-#include "xfa/fwl/basewidget/ifwl_caret.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
+#include "xfa/fwl/core/cfwl_widgetimpproperties.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
-#include "xfa/fwl/core/fwl_widgetimp.h"
+#include "xfa/fwl/core/ifwl_caret.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
 // static
 IFWL_Caret* IFWL_Caret::Create(const CFWL_WidgetImpProperties& properties,
                                IFWL_Widget* pOuter) {
-  IFWL_Caret* pCaret = new IFWL_Caret;
-  CFWL_CaretImp* pCaretImpl = new CFWL_CaretImp(properties, pOuter);
-  pCaret->SetImpl(pCaretImpl);
-  pCaretImpl->SetInterface(pCaret);
-  return pCaret;
-}
-IFWL_Caret::IFWL_Caret() {}
-void IFWL_Caret::ShowCaret(FX_BOOL bFlag) {
-  static_cast<CFWL_CaretImp*>(GetImpl())->ShowCaret(bFlag);
-}
-FWL_Error IFWL_Caret::GetFrequency(uint32_t& elapse) {
-  return static_cast<CFWL_CaretImp*>(GetImpl())->GetFrequency(elapse);
-}
-FWL_Error IFWL_Caret::SetFrequency(uint32_t elapse) {
-  return static_cast<CFWL_CaretImp*>(GetImpl())->SetFrequency(elapse);
-}
-FWL_Error IFWL_Caret::SetColor(CFX_Color crFill) {
-  return static_cast<CFWL_CaretImp*>(GetImpl())->SetColor(crFill);
+  return new IFWL_Caret(properties, pOuter);
 }
 
-CFWL_CaretImp::CFWL_CaretImp(const CFWL_WidgetImpProperties& properties,
-                             IFWL_Widget* pOuter)
-    : CFWL_WidgetImp(properties, pOuter),
+IFWL_Caret::IFWL_Caret(const CFWL_WidgetImpProperties& properties,
+                       IFWL_Widget* pOuter)
+    : IFWL_Widget(properties, pOuter),
       m_pTimer(new CFWL_CaretTimer(this)),
       m_pTimerInfo(nullptr),
       m_dwElapse(400),
@@ -45,36 +28,37 @@ CFWL_CaretImp::CFWL_CaretImp(const CFWL_WidgetImpProperties& properties,
   SetStates(FWL_STATE_CAT_HightLight);
 }
 
-CFWL_CaretImp::~CFWL_CaretImp() {}
+IFWL_Caret::~IFWL_Caret() {}
 
-FWL_Error CFWL_CaretImp::GetClassName(CFX_WideString& wsClass) const {
+FWL_Error IFWL_Caret::GetClassName(CFX_WideString& wsClass) const {
   wsClass = FWL_CLASS_Caret;
   return FWL_Error::Succeeded;
 }
 
-FWL_Type CFWL_CaretImp::GetClassID() const {
+FWL_Type IFWL_Caret::GetClassID() const {
   return FWL_Type::Caret;
 }
 
-FWL_Error CFWL_CaretImp::Initialize() {
-  if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded)
+FWL_Error IFWL_Caret::Initialize() {
+  if (IFWL_Widget::Initialize() != FWL_Error::Succeeded)
     return FWL_Error::Indefinite;
 
   m_pDelegate = new CFWL_CaretImpDelegate(this);
   return FWL_Error::Succeeded;
 }
 
-FWL_Error CFWL_CaretImp::Finalize() {
+FWL_Error IFWL_Caret::Finalize() {
   if (m_pTimerInfo) {
     m_pTimerInfo->StopTimer();
     m_pTimerInfo = nullptr;
   }
   delete m_pDelegate;
   m_pDelegate = nullptr;
-  return CFWL_WidgetImp::Finalize();
+  return IFWL_Widget::Finalize();
 }
-FWL_Error CFWL_CaretImp::DrawWidget(CFX_Graphics* pGraphics,
-                                    const CFX_Matrix* pMatrix) {
+
+FWL_Error IFWL_Caret::DrawWidget(CFX_Graphics* pGraphics,
+                                 const CFX_Matrix* pMatrix) {
   if (!pGraphics)
     return FWL_Error::Indefinite;
   if (!m_pProperties->m_pThemeProvider)
@@ -86,7 +70,7 @@ FWL_Error CFWL_CaretImp::DrawWidget(CFX_Graphics* pGraphics,
   return FWL_Error::Succeeded;
 }
 
-void CFWL_CaretImp::ShowCaret(FX_BOOL bFlag) {
+void IFWL_Caret::ShowCaret(FX_BOOL bFlag) {
   if (m_pTimerInfo) {
     m_pTimerInfo->StopTimer();
     m_pTimerInfo = nullptr;
@@ -96,28 +80,31 @@ void CFWL_CaretImp::ShowCaret(FX_BOOL bFlag) {
 
   SetStates(FWL_WGTSTATE_Invisible, !bFlag);
 }
-FWL_Error CFWL_CaretImp::GetFrequency(uint32_t& elapse) {
+
+FWL_Error IFWL_Caret::GetFrequency(uint32_t& elapse) {
   elapse = m_dwElapse;
   return FWL_Error::Succeeded;
 }
-FWL_Error CFWL_CaretImp::SetFrequency(uint32_t elapse) {
+
+FWL_Error IFWL_Caret::SetFrequency(uint32_t elapse) {
   m_dwElapse = elapse;
   return FWL_Error::Succeeded;
 }
-FWL_Error CFWL_CaretImp::SetColor(CFX_Color crFill) {
+
+FWL_Error IFWL_Caret::SetColor(CFX_Color crFill) {
   m_bSetColor = TRUE;
   m_crFill = crFill;
   return FWL_Error::Succeeded;
 }
 
-void CFWL_CaretImp::DrawCaretBK(CFX_Graphics* pGraphics,
-                                IFWL_ThemeProvider* pTheme,
-                                const CFX_Matrix* pMatrix) {
+void IFWL_Caret::DrawCaretBK(CFX_Graphics* pGraphics,
+                             IFWL_ThemeProvider* pTheme,
+                             const CFX_Matrix* pMatrix) {
   CFX_RectF rect;
   GetWidgetRect(rect);
   rect.Set(0, 0, rect.width, rect.height);
   CFWL_ThemeBackground param;
-  param.m_pWidget = m_pInterface;
+  param.m_pWidget = this;
   param.m_pGraphics = pGraphics;
   param.m_rtPart = rect;
   if (m_bSetColor)
@@ -133,10 +120,10 @@ void CFWL_CaretImp::DrawCaretBK(CFX_Graphics* pGraphics,
   pTheme->DrawBackground(&param);
 }
 
-CFWL_CaretImp::CFWL_CaretTimer::CFWL_CaretTimer(CFWL_CaretImp* pCaret)
+IFWL_Caret::CFWL_CaretTimer::CFWL_CaretTimer(IFWL_Caret* pCaret)
     : m_pCaret(pCaret) {}
 
-void CFWL_CaretImp::CFWL_CaretTimer::Run(IFWL_TimerInfo* pTimerInfo) {
+void IFWL_Caret::CFWL_CaretTimer::Run(IFWL_TimerInfo* pTimerInfo) {
   bool toggle = !(m_pCaret->GetStates() & FWL_STATE_CAT_HightLight);
   m_pCaret->SetStates(FWL_STATE_CAT_HightLight, toggle);
 
@@ -146,7 +133,7 @@ void CFWL_CaretImp::CFWL_CaretTimer::Run(IFWL_TimerInfo* pTimerInfo) {
   m_pCaret->Repaint(&rt);
 }
 
-CFWL_CaretImpDelegate::CFWL_CaretImpDelegate(CFWL_CaretImp* pOwner)
+CFWL_CaretImpDelegate::CFWL_CaretImpDelegate(IFWL_Caret* pOwner)
     : m_pOwner(pOwner) {}
 
 void CFWL_CaretImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {}