From c777f486f84611d2fdd2d03af661b14955f9efb6 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
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.h | 96 +++++++++++++++++++++++------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

(limited to 'xfa/fxgraphics/cfx_path.h')

diff --git a/xfa/fxgraphics/cfx_path.h b/xfa/fxgraphics/cfx_path.h
index 5b5840fa0b..f42586f0de 100644
--- a/xfa/fxgraphics/cfx_path.h
+++ b/xfa/fxgraphics/cfx_path.h
@@ -18,55 +18,55 @@ class CFX_Path {
   CFX_Path();
   virtual ~CFX_Path();
 
-  FX_ERR Create();
-  FX_ERR MoveTo(FX_FLOAT x, FX_FLOAT y);
-  FX_ERR LineTo(FX_FLOAT x, FX_FLOAT y);
-  FX_ERR BezierTo(FX_FLOAT ctrlX1,
-                  FX_FLOAT ctrlY1,
-                  FX_FLOAT ctrlX2,
-                  FX_FLOAT ctrlY2,
-                  FX_FLOAT toX,
-                  FX_FLOAT toY);
-  FX_ERR ArcTo(FX_FLOAT left,
-               FX_FLOAT top,
-               FX_FLOAT width,
-               FX_FLOAT height,
-               FX_FLOAT startAngle,
-               FX_FLOAT sweepAngle);
-  FX_ERR Close();
+  FWL_Error Create();
+  FWL_Error MoveTo(FX_FLOAT x, FX_FLOAT y);
+  FWL_Error LineTo(FX_FLOAT x, FX_FLOAT y);
+  FWL_Error BezierTo(FX_FLOAT ctrlX1,
+                     FX_FLOAT ctrlY1,
+                     FX_FLOAT ctrlX2,
+                     FX_FLOAT ctrlY2,
+                     FX_FLOAT toX,
+                     FX_FLOAT toY);
+  FWL_Error ArcTo(FX_FLOAT left,
+                  FX_FLOAT top,
+                  FX_FLOAT width,
+                  FX_FLOAT height,
+                  FX_FLOAT startAngle,
+                  FX_FLOAT sweepAngle);
+  FWL_Error Close();
 
-  FX_ERR AddLine(FX_FLOAT x1, FX_FLOAT y1, FX_FLOAT x2, FX_FLOAT y2);
-  FX_ERR 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);
-  FX_ERR AddRectangle(FX_FLOAT left,
-                      FX_FLOAT top,
-                      FX_FLOAT width,
-                      FX_FLOAT height);
-  FX_ERR AddEllipse(FX_FLOAT left,
-                    FX_FLOAT top,
-                    FX_FLOAT width,
-                    FX_FLOAT height);
-  FX_ERR AddEllipse(const CFX_RectF& rect);
-  FX_ERR AddArc(FX_FLOAT left,
-                FX_FLOAT top,
-                FX_FLOAT width,
-                FX_FLOAT height,
-                FX_FLOAT startAngle,
-                FX_FLOAT sweepAngle);
-  FX_ERR AddPie(FX_FLOAT left,
-                FX_FLOAT top,
-                FX_FLOAT width,
-                FX_FLOAT height,
-                FX_FLOAT startAngle,
-                FX_FLOAT sweepAngle);
-  FX_ERR AddSubpath(CFX_Path* path);
-  FX_ERR Clear();
+  FWL_Error AddLine(FX_FLOAT x1, FX_FLOAT y1, FX_FLOAT x2, FX_FLOAT y2);
+  FWL_Error 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 AddRectangle(FX_FLOAT left,
+                         FX_FLOAT top,
+                         FX_FLOAT width,
+                         FX_FLOAT height);
+  FWL_Error AddEllipse(FX_FLOAT left,
+                       FX_FLOAT top,
+                       FX_FLOAT width,
+                       FX_FLOAT height);
+  FWL_Error AddEllipse(const CFX_RectF& rect);
+  FWL_Error AddArc(FX_FLOAT left,
+                   FX_FLOAT top,
+                   FX_FLOAT width,
+                   FX_FLOAT height,
+                   FX_FLOAT startAngle,
+                   FX_FLOAT sweepAngle);
+  FWL_Error AddPie(FX_FLOAT left,
+                   FX_FLOAT top,
+                   FX_FLOAT width,
+                   FX_FLOAT height,
+                   FX_FLOAT startAngle,
+                   FX_FLOAT sweepAngle);
+  FWL_Error AddSubpath(CFX_Path* path);
+  FWL_Error Clear();
 
   FX_BOOL IsEmpty();
   CFX_PathData* GetPathData();
-- 
cgit v1.2.3