Remove FWL_HTIMER in favor of IWFL_TimerInfo

xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp

 // 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
 
 #include "xfa/fwl/basewidget/fwl_tooltipctrlimp.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/basewidget/ifwl_tooltip.h"
@@ skipping 30 matching lines @@
 }
 
 IFWL_ToolTip::IFWL_ToolTip() {}
 
 CFWL_ToolTipImp::CFWL_ToolTipImp(const CFWL_WidgetImpProperties& properties,
                                  IFWL_Widget* pOuter)
     : CFWL_FormImp(properties, pOuter),
       m_bBtnDown(FALSE),
       m_dwTTOStyles(FDE_TTOSTYLE_SingleLine),
       m_iTTOAlign(FDE_TTOALIGNMENT_Center),
-      m_hTimerShow(NULL),
-      m_hTimerHide(NULL),
+      m_pTimerInfoShow(NULL),
+      m_pTimerInfoHide(NULL),

[dsinclair, 2016/06/06 19:52:23]

nit: nullptr

[Tom Sepez, 2016/06/06 20:08:33]

Done.

       m_pTimer(NULL) {
   m_rtClient.Set(0, 0, 0, 0);
   m_rtCaption.Set(0, 0, 0, 0);
   m_rtAnchor.Set(0, 0, 0, 0);
   m_TimerShow.m_pToolTip = this;
   m_TimerHide.m_pToolTip = this;
 }
 
 CFWL_ToolTipImp::~CFWL_ToolTipImp() {
   if (m_pTimer) {
@@ skipping 151 matching lines @@
 
 void CFWL_ToolTipImp::SetAnchor(const CFX_RectF& rtAnchor) {
   m_rtAnchor = rtAnchor;
 }
 
 void CFWL_ToolTipImp::Show() {
   IFWL_ToolTipDP* pData =
       static_cast<IFWL_ToolTipDP*>(m_pProperties->m_pDataProvider);
   int32_t nInitDelay = pData->GetInitialDelay(m_pInterface);
   if ((m_pProperties->m_dwStates & FWL_WGTSTATE_Invisible))
-    m_hTimerShow = FWL_StartTimer(&m_TimerShow, nInitDelay, FALSE);
+    m_pTimerInfoShow = m_TimerShow.StartTimer(nInitDelay, false);
 }
 
 void CFWL_ToolTipImp::Hide() {
   SetStates(FWL_WGTSTATE_Invisible, TRUE);
-  if (m_hTimerHide) {
-    FWL_StopTimer(m_hTimerHide);
-    m_hTimerHide = nullptr;
+  if (m_pTimerInfoHide) {
+    m_pTimerInfoHide->StopTimer();
+    m_pTimerInfoHide = nullptr;
   }
-  if (m_hTimerShow) {
-    FWL_StopTimer(m_hTimerShow);
-    m_hTimerShow = nullptr;
+  if (m_pTimerInfoShow) {
+    m_pTimerInfoShow->StopTimer();
+    m_pTimerInfoShow = nullptr;
   }
 }
 
 void CFWL_ToolTipImp::SetStates(uint32_t dwStates, FX_BOOL bSet) {
   if ((dwStates & FWL_WGTSTATE_Invisible) && !bSet) {
     IFWL_ToolTipDP* pData =
         static_cast<IFWL_ToolTipDP*>(m_pProperties->m_pDataProvider);
     int32_t nAutoPopDelay = pData->GetAutoPopDelay(m_pInterface);
-    m_hTimerHide = FWL_StartTimer(&m_TimerHide, nAutoPopDelay, FALSE);
+    m_pTimerInfoHide = m_TimerHide.StartTimer(nAutoPopDelay, false);
   }
   CFWL_WidgetImp::SetStates(dwStates, bSet);
 }
 
 void CFWL_ToolTipImp::RefreshToolTipPos() {
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_TTP_NoAnchor) == 0) {
     CFX_RectF rtPopup;
     CFX_RectF rtWidget(m_pProperties->m_rtWidget);
     CFX_RectF rtAnchor(m_rtAnchor);
     rtPopup.Set(0, 0, 0, 0);
@@ skipping 14 matching lines @@
     }
     if (rtPopup.top < 0) {
       rtPopup.Offset(0, 0 - rtPopup.top);
     }
     SetWidgetRect(rtPopup);
     Update();
   }
 }
 CFWL_ToolTipImp::CFWL_ToolTipTimer::CFWL_ToolTipTimer(CFWL_ToolTipImp* pToolTip)
     : m_pToolTip(pToolTip) {}
-int32_t CFWL_ToolTipImp::CFWL_ToolTipTimer::Run(FWL_HTIMER hTimer) {
-  if (m_pToolTip->m_hTimerShow == hTimer && m_pToolTip->m_hTimerShow) {
+
+void CFWL_ToolTipImp::CFWL_ToolTipTimer::Run(IFWL_TimerInfo* pTimerInfo) {
+  if (m_pToolTip->m_pTimerInfoShow == pTimerInfo &&
+      m_pToolTip->m_pTimerInfoShow) {
     if (m_pToolTip->GetStates() & FWL_WGTSTATE_Invisible) {
       m_pToolTip->SetStates(FWL_WGTSTATE_Invisible, FALSE);
       m_pToolTip->RefreshToolTipPos();
-      FWL_StopTimer(m_pToolTip->m_hTimerShow);
-      m_pToolTip->m_hTimerShow = NULL;
-      return TRUE;
+      m_pToolTip->m_pTimerInfoShow->StopTimer();
+      m_pToolTip->m_pTimerInfoShow = nullptr;
+      return;
     }
   }
-  if (m_pToolTip->m_hTimerHide == hTimer && m_pToolTip->m_hTimerHide) {
+  if (m_pToolTip->m_pTimerInfoHide == pTimerInfo &&
+      m_pToolTip->m_pTimerInfoHide) {
     m_pToolTip->SetStates(FWL_WGTSTATE_Invisible, TRUE);
-    FWL_StopTimer(m_pToolTip->m_hTimerHide);
-    m_pToolTip->m_hTimerHide = NULL;
-    return TRUE;
+    m_pToolTip->m_pTimerInfoHide->StopTimer();
+    m_pToolTip->m_pTimerInfoHide = nullptr;
   }
-  return TRUE;
 }
 
 CFWL_ToolTipImpDelegate::CFWL_ToolTipImpDelegate(CFWL_ToolTipImp* pOwner)
     : m_pOwner(pOwner) {}
 
 void CFWL_ToolTipImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   CFWL_WidgetImpDelegate::OnProcessMessage(pMessage);
 }
 
 void CFWL_ToolTipImpDelegate::OnProcessEvent(CFWL_Event* pEvent) {}
 
 void CFWL_ToolTipImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
                                            const CFX_Matrix* pMatrix) {
   m_pOwner->DrawWidget(pGraphics, pMatrix);
 }