Remove FWL_HTIMER in favor of IWFL_TimerInfo

xfa/fwl/basewidget/fwl_spinbuttonimp.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_spinbuttonimp.h"
 
 #include "xfa/fwl/basewidget/ifwl_spinbutton.h"
 #include "xfa/fwl/core/cfwl_message.h"
@@ skipping 34 matching lines @@
 }
 
 CFWL_SpinButtonImp::CFWL_SpinButtonImp(
     const CFWL_WidgetImpProperties& properties,
     IFWL_Widget* pOuter)
     : CFWL_WidgetImp(properties, pOuter),
       m_dwUpState(CFWL_PartState_Normal),
       m_dwDnState(CFWL_PartState_Normal),
       m_iButtonIndex(0),
       m_bLButtonDwn(FALSE),
-      m_hTimer(NULL) {
+      m_pTimerInfo(NULL) {

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

nit: nullptr

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

Done.

   m_rtClient.Reset();
   m_rtUpButton.Reset();
   m_rtDnButton.Reset();
   m_pProperties->m_dwStyleExes |= FWL_STYLEEXE_SPB_Vert;
 }
 
 CFWL_SpinButtonImp::~CFWL_SpinButtonImp() {}
 
 FWL_Error CFWL_SpinButtonImp::GetClassName(CFX_WideString& wsClass) const {
   wsClass = FWL_CLASS_SpinButton;
@@ skipping 74 matching lines @@
   if (HasBorder()) {
     DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix);
   }
   if (HasEdge()) {
     DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix);
   }
   DrawUpButton(pGraphics, pTheme, pMatrix);
   DrawDownButton(pGraphics, pTheme, pMatrix);
   return FWL_Error::Succeeded;
 }
-int32_t CFWL_SpinButtonImp::Run(FWL_HTIMER hTimer) {
-  if (m_hTimer) {
-    CFWL_EvtSpbClick wmPosChanged;
-    wmPosChanged.m_pSrcTarget = m_pInterface;
-    wmPosChanged.m_bUp = m_iButtonIndex == 0;
-    DispatchEvent(&wmPosChanged);
-  }
-  return 1;
+
+void CFWL_SpinButtonImp::Run(IFWL_TimerInfo* pTimerInfo) {
+  if (!m_pTimerInfo)
+    return;
+
+  CFWL_EvtSpbClick wmPosChanged;
+  wmPosChanged.m_pSrcTarget = m_pInterface;
+  wmPosChanged.m_bUp = m_iButtonIndex == 0;
+  DispatchEvent(&wmPosChanged);
 }
+
 FWL_Error CFWL_SpinButtonImp::EnableButton(FX_BOOL bEnable, FX_BOOL bUp) {
   if (bUp) {
     if (bEnable) {
       m_dwUpState = CFWL_PartState_Normal;
     } else {
       m_dwUpState = CFWL_PartState_Disabled;
     }
   } else {
     if (bEnable) {
       m_dwDnState = CFWL_PartState_Normal;
@@ skipping 129 matching lines @@
   if (bDnPress) {
     m_pOwner->m_iButtonIndex = 1;
     m_pOwner->m_dwDnState = CFWL_PartState_Pressed;
   }
   CFWL_EvtSpbClick wmPosChanged;
   wmPosChanged.m_pSrcTarget = m_pOwner->m_pInterface;
   wmPosChanged.m_bUp = bUpPress;
   m_pOwner->DispatchEvent(&wmPosChanged);
   m_pOwner->Repaint(bUpPress ? &m_pOwner->m_rtUpButton
                              : &m_pOwner->m_rtDnButton);
-  m_pOwner->m_hTimer = FWL_StartTimer(m_pOwner, kElapseTime);
+  m_pOwner->m_pTimerInfo = m_pOwner->StartTimer(kElapseTime, true);
 }
+
 void CFWL_SpinButtonImpDelegate::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   if (m_pOwner->m_pProperties->m_dwStates & CFWL_PartState_Disabled) {
     return;
   }
   m_pOwner->m_bLButtonDwn = FALSE;
   m_pOwner->SetGrab(FALSE);
   m_pOwner->SetFocus(FALSE);
-  if (m_pOwner->m_hTimer) {
-    FWL_StopTimer(m_pOwner->m_hTimer);
-    m_pOwner->m_hTimer = NULL;
+  if (m_pOwner->m_pTimerInfo) {
+    m_pOwner->m_pTimerInfo->StopTimer();
+    m_pOwner->m_pTimerInfo = NULL;

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

ditto

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

Done.

   }
   FX_BOOL bRepaint = FALSE;
   CFX_RectF rtInvalidate;
   if (m_pOwner->m_dwUpState == CFWL_PartState_Pressed &&
       m_pOwner->IsButtonEnable(TRUE)) {
     m_pOwner->m_dwUpState = CFWL_PartState_Normal;
     bRepaint = TRUE;
     rtInvalidate = m_pOwner->m_rtUpButton;
   } else if (m_pOwner->m_dwDnState == CFWL_PartState_Pressed &&
              m_pOwner->IsButtonEnable(FALSE)) {
@@ skipping 102 matching lines @@
   if (!bUpEnable && !bDownEnable) {
     return;
   }
   CFWL_EvtSpbClick wmPosChanged;
   wmPosChanged.m_pSrcTarget = m_pOwner->m_pInterface;
   wmPosChanged.m_bUp = bUpEnable;
   m_pOwner->DispatchEvent(&wmPosChanged);
   m_pOwner->Repaint(bUpEnable ? &m_pOwner->m_rtUpButton
                               : &m_pOwner->m_rtDnButton);
 }