From c777f486f84611d2fdd2d03af661b14955f9efb6 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 4 May 2016 17:57:03 -0700 Subject: 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 --- xfa/fxgraphics/cfx_color.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'xfa/fxgraphics/cfx_color.cpp') diff --git a/xfa/fxgraphics/cfx_color.cpp b/xfa/fxgraphics/cfx_color.cpp index 9cc9c14bbd..2044b76054 100644 --- a/xfa/fxgraphics/cfx_color.cpp +++ b/xfa/fxgraphics/cfx_color.cpp @@ -24,26 +24,26 @@ CFX_Color::~CFX_Color() { m_type = FX_COLOR_None; } -FX_ERR CFX_Color::Set(const FX_ARGB argb) { +FWL_Error CFX_Color::Set(const FX_ARGB argb) { m_type = FX_COLOR_Solid; m_info.argb = argb; m_info.pattern = nullptr; - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Color::Set(CFX_Pattern* pattern, const FX_ARGB argb) { +FWL_Error CFX_Color::Set(CFX_Pattern* pattern, const FX_ARGB argb) { if (!pattern) - return FX_ERR_Parameter_Invalid; + return FWL_Error::ParameterInvalid; m_type = FX_COLOR_Pattern; m_info.argb = argb; m_info.pattern = pattern; - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Color::Set(CFX_Shading* shading) { +FWL_Error CFX_Color::Set(CFX_Shading* shading) { if (!shading) - return FX_ERR_Parameter_Invalid; + return FWL_Error::ParameterInvalid; m_type = FX_COLOR_Shading; m_shading = shading; - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -- cgit v1.2.3