diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-05-04 17:57:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-04 17:57:03 -0700 |
| commit | c777f486f84611d2fdd2d03af661b14955f9efb6 (patch) | |
| tree | 679012454d82e885f749d17f75fd12735efec29a /fpdfsdk/fpdfxfa/fpdfxfa_util.cpp | |
| parent | 41aad19ba366540bd4efa20a9009ac1c70a81403 (diff) | |
| download | pdfium-c777f486f84611d2fdd2d03af661b14955f9efb6.tar.xz | |
Convert FWL_ERR into an enum class.
This Cl updates FWL_ERR to be an FWL_Error enum class. It removes FX_ERR and
replaces it with FWL_Error as well as the values were the same.
There were many places where we either returned other values for FWL_ERR
results.
This Cl is the same as: https://codereview.chromium.org/1943413002/ but I seem
to have messed up the base URL in that one.
TBR=tsepez@chromium.org
Review-Url: https://codereview.chromium.org/1952693003
Diffstat (limited to 'fpdfsdk/fpdfxfa/fpdfxfa_util.cpp')
| -rw-r--r-- | fpdfsdk/fpdfxfa/fpdfxfa_util.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp index 4fb92e76ae..b6deaef17b 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp @@ -13,24 +13,24 @@ std::vector<CFWL_TimerInfo*>* CXFA_FWLAdapterTimerMgr::s_TimerArray = nullptr; -FWL_ERR CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer, - uint32_t dwElapse, - FWL_HTIMER& hTimer, - FX_BOOL bImmediately) { +FWL_Error CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer, + uint32_t dwElapse, + FWL_HTIMER& hTimer, + FX_BOOL bImmediately) { if (!m_pEnv) - return FWL_ERR_Indefinite; + return FWL_Error::Indefinite; int32_t id_event = m_pEnv->FFI_SetTimer(dwElapse, TimerProc); if (!s_TimerArray) s_TimerArray = new std::vector<CFWL_TimerInfo*>; s_TimerArray->push_back(new CFWL_TimerInfo(id_event, pTimer)); hTimer = reinterpret_cast<FWL_HTIMER>(s_TimerArray->back()); - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } -FWL_ERR CXFA_FWLAdapterTimerMgr::Stop(FWL_HTIMER hTimer) { +FWL_Error CXFA_FWLAdapterTimerMgr::Stop(FWL_HTIMER hTimer) { if (!hTimer || !m_pEnv) - return FWL_ERR_Indefinite; + return FWL_Error::Indefinite; CFWL_TimerInfo* pInfo = reinterpret_cast<CFWL_TimerInfo*>(hTimer); m_pEnv->FFI_KillTimer(pInfo->idEvent); @@ -41,7 +41,7 @@ FWL_ERR CXFA_FWLAdapterTimerMgr::Stop(FWL_HTIMER hTimer) { delete pInfo; } } - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } // static |