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_path.cpp | 164 ++++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 81 deletions(-) (limited to 'xfa/fxgraphics/cfx_path.cpp') diff --git a/xfa/fxgraphics/cfx_path.cpp b/xfa/fxgraphics/cfx_path.cpp index 2acdc3eac2..fe956d3fcc 100644 --- a/xfa/fxgraphics/cfx_path.cpp +++ b/xfa/fxgraphics/cfx_path.cpp @@ -12,163 +12,165 @@ CFX_Path::CFX_Path() { m_generator = nullptr; } -FX_ERR CFX_Path::Create() { +FWL_Error CFX_Path::Create() { if (m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator = new CFX_PathGenerator; m_generator->Create(); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } CFX_Path::~CFX_Path() { delete m_generator; } -FX_ERR CFX_Path::MoveTo(FX_FLOAT x, FX_FLOAT y) { +FWL_Error CFX_Path::MoveTo(FX_FLOAT x, FX_FLOAT y) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->MoveTo(x, y); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::LineTo(FX_FLOAT x, FX_FLOAT y) { +FWL_Error CFX_Path::LineTo(FX_FLOAT x, FX_FLOAT y) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->LineTo(x, y); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::BezierTo(FX_FLOAT ctrlX1, - FX_FLOAT ctrlY1, - FX_FLOAT ctrlX2, - FX_FLOAT ctrlY2, - FX_FLOAT toX, - FX_FLOAT toY) { +FWL_Error CFX_Path::BezierTo(FX_FLOAT ctrlX1, + FX_FLOAT ctrlY1, + FX_FLOAT ctrlX2, + FX_FLOAT ctrlY2, + FX_FLOAT toX, + FX_FLOAT toY) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->BezierTo(ctrlX1, ctrlY1, ctrlX2, ctrlY2, toX, toY); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::ArcTo(FX_FLOAT left, - FX_FLOAT top, - FX_FLOAT width, - FX_FLOAT height, - FX_FLOAT startAngle, - FX_FLOAT sweepAngle) { +FWL_Error CFX_Path::ArcTo(FX_FLOAT left, + FX_FLOAT top, + FX_FLOAT width, + FX_FLOAT height, + FX_FLOAT startAngle, + FX_FLOAT sweepAngle) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->ArcTo(left + width / 2, top + height / 2, width / 2, height / 2, startAngle, sweepAngle); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::Close() { +FWL_Error CFX_Path::Close() { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->Close(); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::AddLine(FX_FLOAT x1, FX_FLOAT y1, FX_FLOAT x2, FX_FLOAT y2) { +FWL_Error CFX_Path::AddLine(FX_FLOAT x1, + FX_FLOAT y1, + FX_FLOAT x2, + FX_FLOAT y2) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->AddLine(x1, y1, x2, y2); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::AddBezier(FX_FLOAT startX, - FX_FLOAT startY, - FX_FLOAT ctrlX1, - FX_FLOAT ctrlY1, - FX_FLOAT ctrlX2, - FX_FLOAT ctrlY2, - FX_FLOAT endX, - FX_FLOAT endY) { +FWL_Error CFX_Path::AddBezier(FX_FLOAT startX, + FX_FLOAT startY, + FX_FLOAT ctrlX1, + FX_FLOAT ctrlY1, + FX_FLOAT ctrlX2, + FX_FLOAT ctrlY2, + FX_FLOAT endX, + FX_FLOAT endY) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->AddBezier(startX, startY, ctrlX1, ctrlY1, ctrlX2, ctrlY2, endX, endY); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::AddRectangle(FX_FLOAT left, - FX_FLOAT top, - FX_FLOAT width, - FX_FLOAT height) { +FWL_Error CFX_Path::AddRectangle(FX_FLOAT left, + FX_FLOAT top, + FX_FLOAT width, + FX_FLOAT height) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->AddRectangle(left, top, left + width, top + height); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::AddEllipse(FX_FLOAT left, - FX_FLOAT top, - FX_FLOAT width, - FX_FLOAT height) { +FWL_Error CFX_Path::AddEllipse(FX_FLOAT left, + FX_FLOAT top, + FX_FLOAT width, + FX_FLOAT height) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->AddEllipse(left + width / 2, top + height / 2, width / 2, height / 2); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::AddEllipse(const CFX_RectF& rect) { +FWL_Error CFX_Path::AddEllipse(const CFX_RectF& rect) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->AddEllipse(rect.left + rect.Width() / 2, rect.top + rect.Height() / 2, rect.Width() / 2, rect.Height() / 2); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::AddArc(FX_FLOAT left, - FX_FLOAT top, - FX_FLOAT width, - FX_FLOAT height, - FX_FLOAT startAngle, - FX_FLOAT sweepAngle) { +FWL_Error CFX_Path::AddArc(FX_FLOAT left, + FX_FLOAT top, + FX_FLOAT width, + FX_FLOAT height, + FX_FLOAT startAngle, + FX_FLOAT sweepAngle) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->AddArc(left + width / 2, top + height / 2, width / 2, height / 2, startAngle, sweepAngle); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::AddPie(FX_FLOAT left, - FX_FLOAT top, - FX_FLOAT width, - FX_FLOAT height, - FX_FLOAT startAngle, - FX_FLOAT sweepAngle) { +FWL_Error CFX_Path::AddPie(FX_FLOAT left, + FX_FLOAT top, + FX_FLOAT width, + FX_FLOAT height, + FX_FLOAT startAngle, + FX_FLOAT sweepAngle) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->AddPie(left + width / 2, top + height / 2, width / 2, height / 2, startAngle, sweepAngle); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::AddSubpath(CFX_Path* path) { +FWL_Error CFX_Path::AddSubpath(CFX_Path* path) { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->AddPathData(path->GetPathData()); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFX_Path::Clear() { +FWL_Error CFX_Path::Clear() { if (!m_generator) - return FX_ERR_Property_Invalid; + return FWL_Error::PropertyInvalid; m_generator->GetPathData()->SetPointCount(0); - return FX_ERR_Succeeded; + return FWL_Error::Succeeded; } FX_BOOL CFX_Path::IsEmpty() { if (!m_generator) - return FX_ERR_Property_Invalid; - if (m_generator->GetPathData()->GetPointCount() == 0) { + return FALSE; + if (m_generator->GetPathData()->GetPointCount() == 0) return TRUE; - } return FALSE; } -- cgit v1.2.3