From c64b76c97c7f469ebd4126f314badceeb8a78b8b Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 14 Nov 2016 09:01:37 -0800 Subject: Cleanup remaining IFWL files for visiblity and usage. This CL cleans up the remaining ifwl_* files to fixup visibility, remove unused methods and remove unused FWL_Error return codes. Review-Url: https://codereview.chromium.org/2502653002 --- fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp | 16 +++++++--------- fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h | 10 +++++----- 2 files changed, 12 insertions(+), 14 deletions(-) (limited to 'fpdfsdk/fpdfxfa') diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp index f5e36d4a67..5a9ae95be7 100644 --- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp +++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp @@ -13,12 +13,12 @@ std::vector* CXFA_FWLAdapterTimerMgr::s_TimerArray = nullptr; -FWL_Error CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer, - uint32_t dwElapse, - bool bImmediately, - IFWL_TimerInfo** pTimerInfo) { +void CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer, + uint32_t dwElapse, + bool bImmediately, + IFWL_TimerInfo** pTimerInfo) { if (!m_pFormFillEnv) - return FWL_Error::Indefinite; + return; int32_t id_event = m_pFormFillEnv->SetTimer(dwElapse, TimerProc); if (!s_TimerArray) @@ -26,12 +26,11 @@ FWL_Error CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer, s_TimerArray->push_back(new CFWL_TimerInfo(this, id_event, pTimer)); *pTimerInfo = s_TimerArray->back(); - return FWL_Error::Succeeded; } -FWL_Error CXFA_FWLAdapterTimerMgr::Stop(IFWL_TimerInfo* pTimerInfo) { +void CXFA_FWLAdapterTimerMgr::Stop(IFWL_TimerInfo* pTimerInfo) { if (!pTimerInfo || !m_pFormFillEnv) - return FWL_Error::Indefinite; + return; CFWL_TimerInfo* pInfo = static_cast(pTimerInfo); m_pFormFillEnv->KillTimer(pInfo->idEvent); @@ -42,7 +41,6 @@ FWL_Error CXFA_FWLAdapterTimerMgr::Stop(IFWL_TimerInfo* pTimerInfo) { delete pInfo; } } - return FWL_Error::Succeeded; } // static diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h index ee4b404a5c..2a1c509aa3 100644 --- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h +++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h @@ -19,11 +19,11 @@ class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr { CXFA_FWLAdapterTimerMgr(CPDFSDK_FormFillEnvironment* pFormFillEnv) : m_pFormFillEnv(pFormFillEnv) {} - FWL_Error Start(IFWL_Timer* pTimer, - uint32_t dwElapse, - bool bImmediately, - IFWL_TimerInfo** pTimerInfo) override; - FWL_Error Stop(IFWL_TimerInfo* pTimerInfo) override; + void Start(IFWL_Timer* pTimer, + uint32_t dwElapse, + bool bImmediately, + IFWL_TimerInfo** pTimerInfo) override; + void Stop(IFWL_TimerInfo* pTimerInfo) override; protected: static void TimerProc(int32_t idEvent); -- cgit v1.2.3