Rename IFWL_Timer and IFWL_TimerInfo

These twho files are not interfaces. Renamed to be CFWL to signify they are
concrete implementations.

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

14 files changed, 88 insertions, 77 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 81b2c61733..9e58f5a8ac 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1260,6 +1260,10 @@ if (pdf_enable_xfa) {
       "xfa/fwl/core/cfwl_themepart.cpp",
       "xfa/fwl/core/cfwl_themepart.h",
       "xfa/fwl/core/cfwl_themetext.h",
+      "xfa/fwl/core/cfwl_timer.cpp",
+      "xfa/fwl/core/cfwl_timer.h",
+      "xfa/fwl/core/cfwl_timerinfo.cpp",
+      "xfa/fwl/core/cfwl_timerinfo.h",
       "xfa/fwl/core/cfwl_widget.cpp",
       "xfa/fwl/core/cfwl_widget.h",
       "xfa/fwl/core/cfwl_widgetmgr.cpp",
@@ -1311,10 +1315,6 @@ if (pdf_enable_xfa) {
       "xfa/fwl/core/ifwl_spinbutton.cpp",
       "xfa/fwl/core/ifwl_spinbutton.h",
       "xfa/fwl/core/ifwl_themeprovider.h",
-      "xfa/fwl/core/ifwl_timer.cpp",
-      "xfa/fwl/core/ifwl_timer.h",
-      "xfa/fwl/core/ifwl_timerinfo.cpp",
-      "xfa/fwl/core/ifwl_timerinfo.h",
       "xfa/fwl/core/ifwl_widget.cpp",
       "xfa/fwl/core/ifwl_widget.h",
       "xfa/fwl/core/ifwl_widgetdelegate.h",
diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp
index 5a9ae95be7..39aa72be87 100644
--- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp
+++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp
@@ -6,17 +6,33 @@
 
 #include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
 
+#include <utility>
 #include <vector>
 
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/fsdk_define.h"
 
+namespace {
+
+class CFWL_FWLAdapterTimerInfo : public CFWL_TimerInfo {
+ public:
+  CFWL_FWLAdapterTimerInfo(IFWL_AdapterTimerMgr* mgr,
+                           int32_t event,
+                           CFWL_Timer* timer)
+      : CFWL_TimerInfo(mgr), idEvent(event), pTimer(timer) {}
+
+  int32_t idEvent;
+  CFWL_Timer* pTimer;
+};
+
+}  // namespace
+
 std::vector<CFWL_TimerInfo*>* CXFA_FWLAdapterTimerMgr::s_TimerArray = nullptr;
 
-void CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer,
+void CXFA_FWLAdapterTimerMgr::Start(CFWL_Timer* pTimer,
                                     uint32_t dwElapse,
                                     bool bImmediately,
-                                    IFWL_TimerInfo** pTimerInfo) {
+                                    CFWL_TimerInfo** pTimerInfo) {
   if (!m_pFormFillEnv)
     return;
 
@@ -24,22 +40,24 @@ void CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer,
   if (!s_TimerArray)
     s_TimerArray = new std::vector<CFWL_TimerInfo*>;
 
-  s_TimerArray->push_back(new CFWL_TimerInfo(this, id_event, pTimer));
-  *pTimerInfo = s_TimerArray->back();
+  *pTimerInfo = new CFWL_FWLAdapterTimerInfo(this, id_event, pTimer);
+  s_TimerArray->push_back(*pTimerInfo);
 }
 
-void CXFA_FWLAdapterTimerMgr::Stop(IFWL_TimerInfo* pTimerInfo) {
+void CXFA_FWLAdapterTimerMgr::Stop(CFWL_TimerInfo* pTimerInfo) {
   if (!pTimerInfo || !m_pFormFillEnv)
     return;
 
-  CFWL_TimerInfo* pInfo = static_cast<CFWL_TimerInfo*>(pTimerInfo);
+  CFWL_FWLAdapterTimerInfo* pInfo =
+      static_cast<CFWL_FWLAdapterTimerInfo*>(pTimerInfo);
   m_pFormFillEnv->KillTimer(pInfo->idEvent);
-  if (s_TimerArray) {
-    auto it = std::find(s_TimerArray->begin(), s_TimerArray->end(), pInfo);
-    if (it != s_TimerArray->end()) {
-      s_TimerArray->erase(it);
-      delete pInfo;
-    }
+  if (!s_TimerArray)
+    return;
+
+  auto it = std::find(s_TimerArray->begin(), s_TimerArray->end(), pInfo);
+  if (it != s_TimerArray->end()) {
+    s_TimerArray->erase(it);
+    delete pInfo;
   }
 }
 
@@ -48,7 +66,9 @@ void CXFA_FWLAdapterTimerMgr::TimerProc(int32_t idEvent) {
   if (!s_TimerArray)
     return;
 
-  for (CFWL_TimerInfo* pInfo : *s_TimerArray) {
+  for (const auto info : *s_TimerArray) {
+    CFWL_FWLAdapterTimerInfo* pInfo =
+        static_cast<CFWL_FWLAdapterTimerInfo*>(info);
     if (pInfo->idEvent == idEvent) {
       pInfo->pTimer->Run(pInfo);
       break;
diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
index 9f529fcbc8..3904ba5300 100644
--- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
+++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
@@ -7,24 +7,23 @@
 #ifndef FPDFSDK_FPDFXFA_CXFA_FWLADAPTERTIMERMGR_H_
 #define FPDFSDK_FPDFXFA_CXFA_FWLADAPTERTIMERMGR_H_
 
+#include <memory>
 #include <vector>
 
 #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
+#include "xfa/fwl/core/cfwl_timerinfo.h"
 #include "xfa/fwl/core/ifwl_adaptertimermgr.h"
-#include "xfa/fwl/core/ifwl_timerinfo.h"
-
-struct CFWL_TimerInfo;
 
 class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr {
  public:
   explicit CXFA_FWLAdapterTimerMgr(CPDFSDK_FormFillEnvironment* pFormFillEnv)
       : m_pFormFillEnv(pFormFillEnv) {}
 
-  void Start(IFWL_Timer* pTimer,
+  void Start(CFWL_Timer* pTimer,
              uint32_t dwElapse,
              bool bImmediately,
-             IFWL_TimerInfo** pTimerInfo) override;
-  void Stop(IFWL_TimerInfo* pTimerInfo) override;
+             CFWL_TimerInfo** pTimerInfo) override;
+  void Stop(CFWL_TimerInfo* pTimerInfo) override;
 
  protected:
   static void TimerProc(int32_t idEvent);
@@ -33,12 +32,4 @@ class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr {
   CPDFSDK_FormFillEnvironment* const m_pFormFillEnv;
 };
 
-struct CFWL_TimerInfo : public IFWL_TimerInfo {
-  CFWL_TimerInfo(IFWL_AdapterTimerMgr* mgr, int32_t event, IFWL_Timer* timer)
-      : IFWL_TimerInfo(mgr), idEvent(event), pTimer(timer) {}
-
-  int32_t idEvent;
-  IFWL_Timer* pTimer;
-};
-
 #endif  // FPDFSDK_FPDFXFA_CXFA_FWLADAPTERTIMERMGR_H_
diff --git a/xfa/fwl/core/ifwl_timer.cpp b/xfa/fwl/core/cfwl_timer.cpp
index e2436dcc34..289996e672 100644
--- a/xfa/fwl/core/ifwl_timer.cpp
+++ b/xfa/fwl/core/cfwl_timer.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_timer.h"
+#include "xfa/fwl/core/cfwl_timer.h"
 
+#include "xfa/fwl/core/cfwl_timerinfo.h"
 #include "xfa/fwl/core/ifwl_adaptertimermgr.h"
 #include "xfa/fwl/core/ifwl_app.h"
-#include "xfa/fwl/core/ifwl_timerinfo.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxfa/xfa_ffapp.h"
 
-IFWL_TimerInfo* IFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) {
+CFWL_TimerInfo* CFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) {
   const IFWL_App* pApp = m_pWidget->GetOwnerApp();
   if (!pApp)
     return nullptr;
@@ -25,7 +25,7 @@ IFWL_TimerInfo* IFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) {
   if (!pAdapterTimerMgr)
     return nullptr;
 
-  IFWL_TimerInfo* pTimerInfo = nullptr;
+  CFWL_TimerInfo* pTimerInfo = nullptr;
   pAdapterTimerMgr->Start(this, dwElapse, bImmediately, &pTimerInfo);
   return pTimerInfo;
 }
diff --git a/xfa/fwl/core/ifwl_timer.h b/xfa/fwl/core/cfwl_timer.h
index 848c16a717..2f91e783c8 100644
--- a/xfa/fwl/core/ifwl_timer.h
+++ b/xfa/fwl/core/cfwl_timer.h
@@ -4,24 +4,24 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_TIMER_H_
-#define XFA_FWL_CORE_IFWL_TIMER_H_
+#ifndef XFA_FWL_CORE_CFWL_TIMER_H_
+#define XFA_FWL_CORE_CFWL_TIMER_H_
 
 #include "core/fxcrt/fx_system.h"
 
-class IFWL_TimerInfo;
+class CFWL_TimerInfo;
 class IFWL_Widget;
 
-class IFWL_Timer {
+class CFWL_Timer {
  public:
-  explicit IFWL_Timer(IFWL_Widget* parent) : m_pWidget(parent) {}
-  virtual ~IFWL_Timer() {}
+  explicit CFWL_Timer(IFWL_Widget* parent) : m_pWidget(parent) {}
+  virtual ~CFWL_Timer() {}
 
-  virtual void Run(IFWL_TimerInfo* hTimer) = 0;
-  IFWL_TimerInfo* StartTimer(uint32_t dwElapse, bool bImmediately);
+  virtual void Run(CFWL_TimerInfo* hTimer) = 0;
+  CFWL_TimerInfo* StartTimer(uint32_t dwElapse, bool bImmediately);
 
  protected:
   IFWL_Widget* m_pWidget;  // Not owned.
 };
 
-#endif  // XFA_FWL_CORE_IFWL_TIMER_H_
+#endif  // XFA_FWL_CORE_CFWL_TIMER_H_
diff --git a/xfa/fwl/core/ifwl_timerinfo.cpp b/xfa/fwl/core/cfwl_timerinfo.cpp
index a130eea453..8322a1d6aa 100644
--- a/xfa/fwl/core/ifwl_timerinfo.cpp
+++ b/xfa/fwl/core/cfwl_timerinfo.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/ifwl_timerinfo.h"
+#include "xfa/fwl/core/cfwl_timerinfo.h"
 
 #include "xfa/fwl/core/ifwl_adaptertimermgr.h"
 
-void IFWL_TimerInfo::StopTimer() {
+void CFWL_TimerInfo::StopTimer() {
   m_pMgr->Stop(this);
 }
diff --git a/xfa/fwl/core/ifwl_timerinfo.h b/xfa/fwl/core/cfwl_timerinfo.h
index 9a18ddd567..5365d38305 100644
--- a/xfa/fwl/core/ifwl_timerinfo.h
+++ b/xfa/fwl/core/cfwl_timerinfo.h
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_TIMERINFO_H_
-#define XFA_FWL_CORE_IFWL_TIMERINFO_H_
+#ifndef XFA_FWL_CORE_CFWL_TIMERINFO_H_
+#define XFA_FWL_CORE_CFWL_TIMERINFO_H_
 
 #include "core/fxcrt/fx_system.h"
 
 class IFWL_AdapterTimerMgr;
 
-class IFWL_TimerInfo {
+class CFWL_TimerInfo {
  public:
-  explicit IFWL_TimerInfo(IFWL_AdapterTimerMgr* mgr) : m_pMgr(mgr) {
+  explicit CFWL_TimerInfo(IFWL_AdapterTimerMgr* mgr) : m_pMgr(mgr) {
     ASSERT(mgr);
   }
-  virtual ~IFWL_TimerInfo() {}
+  virtual ~CFWL_TimerInfo() {}
 
   void StopTimer();
 
@@ -24,4 +24,4 @@ class IFWL_TimerInfo {
   IFWL_AdapterTimerMgr* m_pMgr;  // Not owned.
 };
 
-#endif  // XFA_FWL_CORE_IFWL_TIMERINFO_H_
+#endif  // XFA_FWL_CORE_CFWL_TIMERINFO_H_
diff --git a/xfa/fwl/core/ifwl_adaptertimermgr.h b/xfa/fwl/core/ifwl_adaptertimermgr.h
index ad54f46312..0e07052e65 100644
--- a/xfa/fwl/core/ifwl_adaptertimermgr.h
+++ b/xfa/fwl/core/ifwl_adaptertimermgr.h
@@ -7,15 +7,15 @@
 #ifndef XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_
 #define XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_
 
-#include "xfa/fwl/core/ifwl_timer.h"
+#include "xfa/fwl/core/cfwl_timer.h"
 
 class IFWL_AdapterTimerMgr {
  public:
-  virtual void Start(IFWL_Timer* pTimer,
+  virtual void Start(CFWL_Timer* pTimer,
                      uint32_t dwElapse,
                      bool bImmediately,
-                     IFWL_TimerInfo** pTimerInfo) = 0;
-  virtual void Stop(IFWL_TimerInfo* pTimerInfo) = 0;
+                     CFWL_TimerInfo** pTimerInfo) = 0;
+  virtual void Stop(CFWL_TimerInfo* pTimerInfo) = 0;
 };
 
 #endif  // XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_
diff --git a/xfa/fwl/core/ifwl_caret.cpp b/xfa/fwl/core/ifwl_caret.cpp
index 5dcebc1cbb..fb5d5e54a1 100644
--- a/xfa/fwl/core/ifwl_caret.cpp
+++ b/xfa/fwl/core/ifwl_caret.cpp
@@ -11,9 +11,9 @@
 #include "third_party/base/ptr_util.h"
 #include "xfa/fwl/core/cfwl_notedriver.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
+#include "xfa/fwl/core/cfwl_timerinfo.h"
 #include "xfa/fwl/core/cfwl_widgetproperties.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
-#include "xfa/fwl/core/ifwl_timerinfo.h"
 
 namespace {
 
@@ -92,9 +92,9 @@ void IFWL_Caret::OnDrawWidget(CFX_Graphics* pGraphics,
   DrawWidget(pGraphics, pMatrix);
 }
 
-IFWL_Caret::Timer::Timer(IFWL_Caret* pCaret) : IFWL_Timer(pCaret) {}
+IFWL_Caret::Timer::Timer(IFWL_Caret* pCaret) : CFWL_Timer(pCaret) {}
 
-void IFWL_Caret::Timer::Run(IFWL_TimerInfo* pTimerInfo) {
+void IFWL_Caret::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
   IFWL_Caret* pCaret = static_cast<IFWL_Caret*>(m_pWidget);
   pCaret->SetStates(FWL_STATE_CAT_HightLight,
                     !(pCaret->GetStates() & FWL_STATE_CAT_HightLight));
diff --git a/xfa/fwl/core/ifwl_caret.h b/xfa/fwl/core/ifwl_caret.h
index d75a662175..57d0025a6b 100644
--- a/xfa/fwl/core/ifwl_caret.h
+++ b/xfa/fwl/core/ifwl_caret.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "xfa/fwl/core/ifwl_timer.h"
+#include "xfa/fwl/core/cfwl_timer.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxgraphics/cfx_color.h"
 
@@ -36,12 +36,12 @@ class IFWL_Caret : public IFWL_Widget {
   void ShowCaret(bool bFlag = true);
 
  private:
-  class Timer : public IFWL_Timer {
+  class Timer : public CFWL_Timer {
    public:
     explicit Timer(IFWL_Caret* pCaret);
     ~Timer() override {}
 
-    void Run(IFWL_TimerInfo* hTimer) override;
+    void Run(CFWL_TimerInfo* hTimer) override;
   };
   friend class IFWL_Caret::Timer;
 
@@ -50,7 +50,7 @@ class IFWL_Caret : public IFWL_Widget {
                    const CFX_Matrix* pMatrix);
 
   std::unique_ptr<IFWL_Caret::Timer> m_pTimer;
-  IFWL_TimerInfo* m_pTimerInfo;  // not owned.
+  CFWL_TimerInfo* m_pTimerInfo;  // not owned.
 };
 
 #endif  // XFA_FWL_CORE_IFWL_CARET_H_
diff --git a/xfa/fwl/core/ifwl_scrollbar.cpp b/xfa/fwl/core/ifwl_scrollbar.cpp
index b4d6b5076a..6732e94a9a 100644
--- a/xfa/fwl/core/ifwl_scrollbar.cpp
+++ b/xfa/fwl/core/ifwl_scrollbar.cpp
@@ -16,8 +16,8 @@
 #include "xfa/fwl/core/cfwl_notedriver.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_themepart.h"
+#include "xfa/fwl/core/cfwl_timerinfo.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
-#include "xfa/fwl/core/ifwl_timerinfo.h"
 
 #define FWL_SCROLLBAR_Elapse 500
 #define FWL_SCROLLBAR_MinThumb 5
@@ -550,9 +550,9 @@ void IFWL_ScrollBar::DoMouseHover(int32_t iItem,
   Repaint(&rtItem);
 }
 
-IFWL_ScrollBar::Timer::Timer(IFWL_ScrollBar* pToolTip) : IFWL_Timer(pToolTip) {}
+IFWL_ScrollBar::Timer::Timer(IFWL_ScrollBar* pToolTip) : CFWL_Timer(pToolTip) {}
 
-void IFWL_ScrollBar::Timer::Run(IFWL_TimerInfo* pTimerInfo) {
+void IFWL_ScrollBar::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
   IFWL_ScrollBar* pButton = static_cast<IFWL_ScrollBar*>(m_pWidget);
 
   if (pButton->m_pTimerInfo)
diff --git a/xfa/fwl/core/ifwl_scrollbar.h b/xfa/fwl/core/ifwl_scrollbar.h
index 06306c3c74..b6f2b02732 100644
--- a/xfa/fwl/core/ifwl_scrollbar.h
+++ b/xfa/fwl/core/ifwl_scrollbar.h
@@ -11,8 +11,8 @@
 
 #include "core/fxcrt/fx_system.h"
 #include "xfa/fwl/core/cfwl_evtscroll.h"
+#include "xfa/fwl/core/cfwl_timer.h"
 #include "xfa/fwl/core/cfwl_widgetproperties.h"
-#include "xfa/fwl/core/ifwl_timer.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 
 class IFWL_Widget;
@@ -56,12 +56,12 @@ class IFWL_ScrollBar : public IFWL_Widget {
   void SetTrackPos(FX_FLOAT fTrackPos);
 
  private:
-  class Timer : public IFWL_Timer {
+  class Timer : public CFWL_Timer {
    public:
     explicit Timer(IFWL_ScrollBar* pToolTip);
     ~Timer() override {}
 
-    void Run(IFWL_TimerInfo* pTimerInfo) override;
+    void Run(CFWL_TimerInfo* pTimerInfo) override;
   };
   friend class IFWL_ScrollBar::Timer;
 
@@ -118,7 +118,7 @@ class IFWL_ScrollBar : public IFWL_Widget {
   void DoMouseLeave(int32_t iItem, const CFX_RectF& rtItem, int32_t& iState);
   void DoMouseHover(int32_t iItem, const CFX_RectF& rtItem, int32_t& iState);
 
-  IFWL_TimerInfo* m_pTimerInfo;
+  CFWL_TimerInfo* m_pTimerInfo;
   FX_FLOAT m_fRangeMin;
   FX_FLOAT m_fRangeMax;
   FX_FLOAT m_fPageSize;
diff --git a/xfa/fwl/core/ifwl_spinbutton.cpp b/xfa/fwl/core/ifwl_spinbutton.cpp
index b77c259de9..9706a41461 100644
--- a/xfa/fwl/core/ifwl_spinbutton.cpp
+++ b/xfa/fwl/core/ifwl_spinbutton.cpp
@@ -15,9 +15,9 @@
 #include "xfa/fwl/core/cfwl_msgmouse.h"
 #include "xfa/fwl/core/cfwl_notedriver.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
+#include "xfa/fwl/core/cfwl_timerinfo.h"
 #include "xfa/fwl/core/cfwl_widgetproperties.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
-#include "xfa/fwl/core/ifwl_timerinfo.h"
 
 namespace {
 
@@ -374,9 +374,9 @@ void IFWL_SpinButton::OnKeyDown(CFWL_MsgKey* pMsg) {
 }
 
 IFWL_SpinButton::Timer::Timer(IFWL_SpinButton* pToolTip)
-    : IFWL_Timer(pToolTip) {}
+    : CFWL_Timer(pToolTip) {}
 
-void IFWL_SpinButton::Timer::Run(IFWL_TimerInfo* pTimerInfo) {
+void IFWL_SpinButton::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
   IFWL_SpinButton* pButton = static_cast<IFWL_SpinButton*>(m_pWidget);
 
   if (!pButton->m_pTimerInfo)
diff --git a/xfa/fwl/core/ifwl_spinbutton.h b/xfa/fwl/core/ifwl_spinbutton.h
index bc4f3ab1a8..157c1411db 100644
--- a/xfa/fwl/core/ifwl_spinbutton.h
+++ b/xfa/fwl/core/ifwl_spinbutton.h
@@ -10,7 +10,7 @@
 #include <memory>
 
 #include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/ifwl_timer.h"
+#include "xfa/fwl/core/cfwl_timer.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 
@@ -38,12 +38,12 @@ class IFWL_SpinButton : public IFWL_Widget {
                     const CFX_Matrix* pMatrix) override;
 
  private:
-  class Timer : public IFWL_Timer {
+  class Timer : public CFWL_Timer {
    public:
     explicit Timer(IFWL_SpinButton* pToolTip);
     ~Timer() override {}
 
-    void Run(IFWL_TimerInfo* pTimerInfo) override;
+    void Run(CFWL_TimerInfo* pTimerInfo) override;
   };
   friend class IFWL_SpinButton::Timer;
 
@@ -69,7 +69,7 @@ class IFWL_SpinButton : public IFWL_Widget {
   uint32_t m_dwDnState;
   int32_t m_iButtonIndex;
   bool m_bLButtonDwn;
-  IFWL_TimerInfo* m_pTimerInfo;
+  CFWL_TimerInfo* m_pTimerInfo;
   IFWL_SpinButton::Timer m_Timer;
 };