Use enum class for PathPoint types.

This hopefully makes it less confusing what the description of a point is.
Currently we have defines for the types, which is confusing because a point
can only be one of the three. And it is mixed up with whether the point is
closing a figure or not.

Change-Id: Icd71355d69c77b3d52ca78e03bc379081ff87753
Reviewed-on: https://pdfium-review.googlesource.com/2552
Commit-Queue: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

5 files changed, 53 insertions, 48 deletions

diff --git a/fpdfsdk/pdfwindow/PWL_Caret.cpp b/fpdfsdk/pdfwindow/PWL_Caret.cpp
index 8a5f539596..6636170e81 100644
--- a/fpdfsdk/pdfwindow/PWL_Caret.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Caret.cpp
@@ -42,14 +42,14 @@ void CPWL_Caret::DrawThisAppearance(CFX_RenderDevice* pDevice,
       if (!rcRect.IsEmpty()) {
         fCaretTop = rcRect.top;
         fCaretBottom = rcRect.bottom;
-        path.SetPoint(0, fCaretX, fCaretBottom, FXPT_MOVETO);
-        path.SetPoint(1, fCaretX, fCaretTop, FXPT_LINETO);
+        path.SetPoint(0, fCaretX, fCaretBottom, FXPT_TYPE::MoveTo, false);
+        path.SetPoint(1, fCaretX, fCaretTop, FXPT_TYPE::LineTo, false);
       } else {
         return;
       }
     } else {
-      path.SetPoint(0, fCaretX, fCaretBottom, FXPT_MOVETO);
-      path.SetPoint(1, fCaretX, fCaretTop, FXPT_LINETO);
+      path.SetPoint(0, fCaretX, fCaretBottom, FXPT_TYPE::MoveTo, false);
+      path.SetPoint(1, fCaretX, fCaretTop, FXPT_TYPE::LineTo, false);
     }
 
     CFX_GraphStateData gsd;
diff --git a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
index 8e9a04b97d..acee850024 100644
--- a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
@@ -149,10 +149,10 @@ void CPWL_CBButton::DrawThisAppearance(CFX_RenderDevice* pDevice,
       CFX_PathData path;
 
       path.SetPointCount(4);
-      path.SetPoint(0, pt1.x, pt1.y, FXPT_MOVETO);
-      path.SetPoint(1, pt2.x, pt2.y, FXPT_LINETO);
-      path.SetPoint(2, pt3.x, pt3.y, FXPT_LINETO);
-      path.SetPoint(3, pt1.x, pt1.y, FXPT_LINETO);
+      path.SetPoint(0, pt1.x, pt1.y, FXPT_TYPE::MoveTo, false);
+      path.SetPoint(1, pt2.x, pt2.y, FXPT_TYPE::LineTo, false);
+      path.SetPoint(2, pt3.x, pt3.y, FXPT_TYPE::LineTo, false);
+      path.SetPoint(3, pt1.x, pt1.y, FXPT_TYPE::LineTo, false);
 
       pDevice->DrawPath(&path, pUser2Device, nullptr,
                         CPWL_Utils::PWLColorToFXColor(PWL_DEFAULT_BLACKCOLOR,
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp
index bb8ec9115d..b9958a3128 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
@@ -330,12 +330,12 @@ void CPWL_Edit::DrawThisAppearance(CFX_RenderDevice* pDevice,
               i * 2,
               rcClient.left +
                   ((rcClient.right - rcClient.left) / nCharArray) * (i + 1),
-              rcClient.bottom, FXPT_MOVETO);
+              rcClient.bottom, FXPT_TYPE::MoveTo, false);
           path.SetPoint(
               i * 2 + 1,
               rcClient.left +
                   ((rcClient.right - rcClient.left) / nCharArray) * (i + 1),
-              rcClient.top, FXPT_LINETO);
+              rcClient.top, FXPT_TYPE::LineTo, false);
         }
         if (path.GetPointCount() > 0) {
           pDevice->DrawPath(
@@ -362,12 +362,12 @@ void CPWL_Edit::DrawThisAppearance(CFX_RenderDevice* pDevice,
               i * 2,
               rcClient.left +
                   ((rcClient.right - rcClient.left) / nCharArray) * (i + 1),
-              rcClient.bottom, FXPT_MOVETO);
+              rcClient.bottom, FXPT_TYPE::MoveTo, false);
           path.SetPoint(
               i * 2 + 1,
               rcClient.left +
                   ((rcClient.right - rcClient.left) / nCharArray) * (i + 1),
-              rcClient.top, FXPT_LINETO);
+              rcClient.top, FXPT_TYPE::LineTo, false);
         }
         if (path.GetPointCount() > 0) {
           pDevice->DrawPath(
diff --git a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
index 8a09ac6636..c7e6bbfa99 100644
--- a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
@@ -264,10 +264,10 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice,
             CFX_PathData path;
 
             path.SetPointCount(4);
-            path.SetPoint(0, pt1.x, pt1.y, FXPT_MOVETO);
-            path.SetPoint(1, pt2.x, pt2.y, FXPT_LINETO);
-            path.SetPoint(2, pt3.x, pt3.y, FXPT_LINETO);
-            path.SetPoint(3, pt1.x, pt1.y, FXPT_LINETO);
+            path.SetPoint(0, pt1.x, pt1.y, FXPT_TYPE::MoveTo, false);
+            path.SetPoint(1, pt2.x, pt2.y, FXPT_TYPE::LineTo, false);
+            path.SetPoint(2, pt3.x, pt3.y, FXPT_TYPE::LineTo, false);
+            path.SetPoint(3, pt1.x, pt1.y, FXPT_TYPE::LineTo, false);
 
             pDevice->DrawPath(&path, pUser2Device, nullptr,
                               CPWL_Utils::PWLColorToFXColor(
@@ -288,10 +288,10 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice,
             CFX_PathData path;
 
             path.SetPointCount(4);
-            path.SetPoint(0, pt1.x, pt1.y, FXPT_MOVETO);
-            path.SetPoint(1, pt2.x, pt2.y, FXPT_LINETO);
-            path.SetPoint(2, pt3.x, pt3.y, FXPT_LINETO);
-            path.SetPoint(3, pt1.x, pt1.y, FXPT_LINETO);
+            path.SetPoint(0, pt1.x, pt1.y, FXPT_TYPE::MoveTo, false);
+            path.SetPoint(1, pt2.x, pt2.y, FXPT_TYPE::LineTo, false);
+            path.SetPoint(2, pt3.x, pt3.y, FXPT_TYPE::LineTo, false);
+            path.SetPoint(3, pt1.x, pt1.y, FXPT_TYPE::LineTo, false);
 
             pDevice->DrawPath(&path, pUser2Device, nullptr,
                               CPWL_Utils::PWLColorToFXColor(
diff --git a/fpdfsdk/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp
index 713a193fb3..f3caf12af9 100644
--- a/fpdfsdk/pdfwindow/PWL_Utils.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp
@@ -54,15 +54,15 @@ void CPWL_Utils::GetPathDataFromArray(CFX_PathData& path,
     switch (pPathData[i].type) {
       case PWLPT_MOVETO:
         path.SetPoint(i, pPathData[i].point.x, pPathData[i].point.y,
-                      FXPT_MOVETO);
+                      FXPT_TYPE::MoveTo, false);
         break;
       case PWLPT_LINETO:
         path.SetPoint(i, pPathData[i].point.x, pPathData[i].point.y,
-                      FXPT_LINETO);
+                      FXPT_TYPE::LineTo, false);
         break;
       case PWLPT_BEZIERTO:
         path.SetPoint(i, pPathData[i].point.x, pPathData[i].point.y,
-                      FXPT_BEZIERTO);
+                      FXPT_TYPE::BezierTo, false);
         break;
       default:
         break;
@@ -1236,9 +1236,9 @@ void CPWL_Utils::DrawFillArea(CFX_RenderDevice* pDevice,
   CFX_PathData path;
   path.SetPointCount(nCount);
 
-  path.SetPoint(0, pPts[0].x, pPts[0].y, FXPT_MOVETO);
+  path.SetPoint(0, pPts[0].x, pPts[0].y, FXPT_TYPE::MoveTo, false);
   for (int32_t i = 1; i < nCount; i++)
-    path.SetPoint(i, pPts[i].x, pPts[i].y, FXPT_LINETO);
+    path.SetPoint(i, pPts[i].x, pPts[i].y, FXPT_TYPE::LineTo, false);
 
   pDevice->DrawPath(&path, pUser2Device, nullptr, color, 0, FXFILL_ALTERNATE);
 }
@@ -1266,8 +1266,8 @@ void CPWL_Utils::DrawStrokeLine(CFX_RenderDevice* pDevice,
                                 FX_FLOAT fWidth) {
   CFX_PathData path;
   path.SetPointCount(2);
-  path.SetPoint(0, ptMoveTo.x, ptMoveTo.y, FXPT_MOVETO);
-  path.SetPoint(1, ptLineTo.x, ptLineTo.y, FXPT_LINETO);
+  path.SetPoint(0, ptMoveTo.x, ptMoveTo.y, FXPT_TYPE::MoveTo, false);
+  path.SetPoint(1, ptLineTo.x, ptLineTo.y, FXPT_TYPE::LineTo, false);
 
   CFX_GraphStateData gsd;
   gsd.m_LineWidth = fWidth;
@@ -1353,15 +1353,15 @@ void CPWL_Utils::DrawBorder(CFX_RenderDevice* pDevice,
 
         path.SetPointCount(5);
         path.SetPoint(0, fLeft + fWidth / 2.0f, fBottom + fWidth / 2.0f,
-                      FXPT_MOVETO);
+                      FXPT_TYPE::MoveTo, false);
         path.SetPoint(1, fLeft + fWidth / 2.0f, fTop - fWidth / 2.0f,
-                      FXPT_LINETO);
+                      FXPT_TYPE::LineTo, false);
         path.SetPoint(2, fRight - fWidth / 2.0f, fTop - fWidth / 2.0f,
-                      FXPT_LINETO);
+                      FXPT_TYPE::LineTo, false);
         path.SetPoint(3, fRight - fWidth / 2.0f, fBottom + fWidth / 2.0f,
-                      FXPT_LINETO);
+                      FXPT_TYPE::LineTo, false);
         path.SetPoint(4, fLeft + fWidth / 2.0f, fBottom + fWidth / 2.0f,
-                      FXPT_LINETO);
+                      FXPT_TYPE::LineTo, false);
 
         CFX_GraphStateData gsd;
         gsd.SetDashCount(2);
@@ -1384,17 +1384,19 @@ void CPWL_Utils::DrawBorder(CFX_RenderDevice* pDevice,
 
         pathLT.SetPointCount(7);
         pathLT.SetPoint(0, fLeft + fHalfWidth, fBottom + fHalfWidth,
-                        FXPT_MOVETO);
-        pathLT.SetPoint(1, fLeft + fHalfWidth, fTop - fHalfWidth, FXPT_LINETO);
-        pathLT.SetPoint(2, fRight - fHalfWidth, fTop - fHalfWidth, FXPT_LINETO);
+                        FXPT_TYPE::MoveTo, false);
+        pathLT.SetPoint(1, fLeft + fHalfWidth, fTop - fHalfWidth,
+                        FXPT_TYPE::LineTo, false);
+        pathLT.SetPoint(2, fRight - fHalfWidth, fTop - fHalfWidth,
+                        FXPT_TYPE::LineTo, false);
         pathLT.SetPoint(3, fRight - fHalfWidth * 2, fTop - fHalfWidth * 2,
-                        FXPT_LINETO);
+                        FXPT_TYPE::LineTo, false);
         pathLT.SetPoint(4, fLeft + fHalfWidth * 2, fTop - fHalfWidth * 2,
-                        FXPT_LINETO);
+                        FXPT_TYPE::LineTo, false);
         pathLT.SetPoint(5, fLeft + fHalfWidth * 2, fBottom + fHalfWidth * 2,
-                        FXPT_LINETO);
+                        FXPT_TYPE::LineTo, false);
         pathLT.SetPoint(6, fLeft + fHalfWidth, fBottom + fHalfWidth,
-                        FXPT_LINETO);
+                        FXPT_TYPE::LineTo, false);
 
         pDevice->DrawPath(&pathLT, pUser2Device, &gsd,
                           PWLColorToFXColor(crLeftTop, nTransparancy), 0,
@@ -1403,18 +1405,20 @@ void CPWL_Utils::DrawBorder(CFX_RenderDevice* pDevice,
         CFX_PathData pathRB;
 
         pathRB.SetPointCount(7);
-        pathRB.SetPoint(0, fRight - fHalfWidth, fTop - fHalfWidth, FXPT_MOVETO);
+        pathRB.SetPoint(0, fRight - fHalfWidth, fTop - fHalfWidth,
+                        FXPT_TYPE::MoveTo, false);
         pathRB.SetPoint(1, fRight - fHalfWidth, fBottom + fHalfWidth,
-                        FXPT_LINETO);
+                        FXPT_TYPE::LineTo, false);
         pathRB.SetPoint(2, fLeft + fHalfWidth, fBottom + fHalfWidth,
-                        FXPT_LINETO);
+                        FXPT_TYPE::LineTo, false);
         pathRB.SetPoint(3, fLeft + fHalfWidth * 2, fBottom + fHalfWidth * 2,
-                        FXPT_LINETO);
+                        FXPT_TYPE::LineTo, false);
         pathRB.SetPoint(4, fRight - fHalfWidth * 2, fBottom + fHalfWidth * 2,
-                        FXPT_LINETO);
+                        FXPT_TYPE::LineTo, false);
         pathRB.SetPoint(5, fRight - fHalfWidth * 2, fTop - fHalfWidth * 2,
-                        FXPT_LINETO);
-        pathRB.SetPoint(6, fRight - fHalfWidth, fTop - fHalfWidth, FXPT_LINETO);
+                        FXPT_TYPE::LineTo, false);
+        pathRB.SetPoint(6, fRight - fHalfWidth, fTop - fHalfWidth,
+                        FXPT_TYPE::LineTo, false);
 
         pDevice->DrawPath(&pathRB, pUser2Device, &gsd,
                           PWLColorToFXColor(crRightBottom, nTransparancy), 0,
@@ -1435,8 +1439,9 @@ void CPWL_Utils::DrawBorder(CFX_RenderDevice* pDevice,
         CFX_PathData path;
 
         path.SetPointCount(2);
-        path.SetPoint(0, fLeft, fBottom + fWidth / 2, FXPT_MOVETO);
-        path.SetPoint(1, fRight, fBottom + fWidth / 2, FXPT_LINETO);
+        path.SetPoint(0, fLeft, fBottom + fWidth / 2, FXPT_TYPE::MoveTo, false);
+        path.SetPoint(1, fRight, fBottom + fWidth / 2, FXPT_TYPE::LineTo,
+                      false);
 
         CFX_GraphStateData gsd;
         gsd.m_LineWidth = fWidth;