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

2 files changed, 14 insertions, 14 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
diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h
index 3f17662976..dce9a74229 100644
--- a/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h
+++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h
@@ -22,11 +22,11 @@ struct CFWL_TimerInfo;
 class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr {
  public:
   CXFA_FWLAdapterTimerMgr(CPDFDoc_Environment* pEnv) : m_pEnv(pEnv) {}
-  virtual FWL_ERR Start(IFWL_Timer* pTimer,
-                        uint32_t dwElapse,
-                        FWL_HTIMER& hTimer,
-                        FX_BOOL bImmediately = TRUE);
-  virtual FWL_ERR Stop(FWL_HTIMER hTimer);
+  virtual FWL_Error Start(IFWL_Timer* pTimer,
+                          uint32_t dwElapse,
+                          FWL_HTIMER& hTimer,
+                          FX_BOOL bImmediately = TRUE);
+  virtual FWL_Error Stop(FWL_HTIMER hTimer);
 
  protected:
   static void TimerProc(int32_t idEvent);