Convert border style defines to an enum class.

fpdfsdk/pdfwindow/PWL_Utils.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/pdfwindow/PWL_Utils.h"
 
 #include <algorithm>
 
@@ skipping 696 matching lines @@
   }
 
   return sColorStream.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetBorderAppStream(const CFX_FloatRect& rect,
                                               FX_FLOAT fWidth,
                                               const CPWL_Color& color,
                                               const CPWL_Color& crLeftTop,
                                               const CPWL_Color& crRightBottom,
-                                              int32_t nStyle,
+                                              BorderStyle nStyle,
                                               const CPWL_Dash& dash) {
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sColor;
 
   FX_FLOAT fLeft = rect.left;
   FX_FLOAT fRight = rect.right;
   FX_FLOAT fTop = rect.top;
   FX_FLOAT fBottom = rect.bottom;
 
   if (fWidth > 0.0f) {
     FX_FLOAT fHalfWidth = fWidth / 2.0f;
 
     sAppStream << "q\n";
 
     switch (nStyle) {
       default:
-      case PBS_SOLID:
+      case BorderStyle::SOLID:
         sColor = CPWL_Utils::GetColorAppStream(color, TRUE);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fLeft << " " << fBottom << " " << fRight - fLeft << " "
                      << fTop - fBottom << " re\n";
           sAppStream << fLeft + fWidth << " " << fBottom + fWidth << " "
                      << fRight - fLeft - fWidth * 2 << " "
                      << fTop - fBottom - fWidth * 2 << " re\n";
           sAppStream << "f*\n";
         }
         break;
-      case PBS_DASH:
+      case BorderStyle::DASH:
         sColor = CPWL_Utils::GetColorAppStream(color, FALSE);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fWidth << " w"
                      << " [" << dash.nDash << " " << dash.nGap << "] "
                      << dash.nPhase << " d\n";
           sAppStream << fLeft + fWidth / 2 << " " << fBottom + fWidth / 2
                      << " m\n";
           sAppStream << fLeft + fWidth / 2 << " " << fTop - fWidth / 2
                      << " l\n";
           sAppStream << fRight - fWidth / 2 << " " << fTop - fWidth / 2
                      << " l\n";
           sAppStream << fRight - fWidth / 2 << " " << fBottom + fWidth / 2
                      << " l\n";
           sAppStream << fLeft + fWidth / 2 << " " << fBottom + fWidth / 2
                      << " l S\n";
         }
         break;
-      case PBS_BEVELED:
-      case PBS_INSET:
+      case BorderStyle::BEVELED:
+      case BorderStyle::INSET:
         sColor = CPWL_Utils::GetColorAppStream(crLeftTop, TRUE);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth
                      << " m\n";
           sAppStream << fLeft + fHalfWidth << " " << fTop - fHalfWidth
                      << " l\n";
           sAppStream << fRight - fHalfWidth << " " << fTop - fHalfWidth
                      << " l\n";
           sAppStream << fRight - fHalfWidth * 2 << " " << fTop - fHalfWidth * 2
@@ skipping 24 matching lines @@
         sColor = CPWL_Utils::GetColorAppStream(color, TRUE);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fLeft << " " << fBottom << " " << fRight - fLeft << " "
                      << fTop - fBottom << " re\n";
           sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth << " "
                      << fRight - fLeft - fHalfWidth * 2 << " "
                      << fTop - fBottom - fHalfWidth * 2 << " re f*\n";
         }
         break;
-      case PBS_UNDERLINED:
+      case BorderStyle::UNDERLINE:
         sColor = CPWL_Utils::GetColorAppStream(color, FALSE);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fWidth << " w\n";
           sAppStream << fLeft << " " << fBottom + fWidth / 2 << " m\n";
           sAppStream << fRight << " " << fBottom + fWidth / 2 << " l S\n";
         }
         break;
     }
 
     sAppStream << "Q\n";
   }
 
   return sAppStream.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetCircleBorderAppStream(
     const CFX_FloatRect& rect,
     FX_FLOAT fWidth,
     const CPWL_Color& color,
     const CPWL_Color& crLeftTop,
     const CPWL_Color& crRightBottom,
-    int32_t nStyle,
+    BorderStyle nStyle,
     const CPWL_Dash& dash) {
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sColor;
 
   if (fWidth > 0.0f) {
     sAppStream << "q\n";
 
     switch (nStyle) {
       default:
-      case PBS_SOLID:
-      case PBS_UNDERLINED: {
+      case BorderStyle::SOLID:
+      case BorderStyle::UNDERLINE: {
         sColor = CPWL_Utils::GetColorAppStream(color, FALSE);
         if (sColor.GetLength() > 0) {
           sAppStream << "q\n" << fWidth << " w\n" << sColor
                      << CPWL_Utils::GetAP_Circle(
                             CPWL_Utils::DeflateRect(rect, fWidth / 2.0f))
                      << " S\nQ\n";
         }
       } break;
-      case PBS_DASH: {
+      case BorderStyle::DASH: {
         sColor = CPWL_Utils::GetColorAppStream(color, FALSE);
         if (sColor.GetLength() > 0) {
           sAppStream << "q\n" << fWidth << " w\n"
                      << "[" << dash.nDash << " " << dash.nGap << "] "
                      << dash.nPhase << " d\n" << sColor
                      << CPWL_Utils::GetAP_Circle(
                             CPWL_Utils::DeflateRect(rect, fWidth / 2.0f))
                      << " S\nQ\n";
         }
       } break;
-      case PBS_BEVELED: {
+      case BorderStyle::BEVELED: {
         FX_FLOAT fHalfWidth = fWidth / 2.0f;
 
         sColor = CPWL_Utils::GetColorAppStream(color, FALSE);
         if (sColor.GetLength() > 0) {
           sAppStream << "q\n" << fHalfWidth << " w\n" << sColor
                      << CPWL_Utils::GetAP_Circle(rect) << " S\nQ\n";
         }
 
         sColor = CPWL_Utils::GetColorAppStream(crLeftTop, FALSE);
         if (sColor.GetLength() > 0) {
           sAppStream << "q\n" << fHalfWidth << " w\n" << sColor
                      << CPWL_Utils::GetAP_HalfCircle(
                             CPWL_Utils::DeflateRect(rect, fHalfWidth * 0.75f),
                             FX_PI / 4.0f)
                      << " S\nQ\n";
         }
 
         sColor = CPWL_Utils::GetColorAppStream(crRightBottom, FALSE);
         if (sColor.GetLength() > 0) {
           sAppStream << "q\n" << fHalfWidth << " w\n" << sColor
                      << CPWL_Utils::GetAP_HalfCircle(
                             CPWL_Utils::DeflateRect(rect, fHalfWidth * 0.75f),
                             FX_PI * 5 / 4.0f)
                      << " S\nQ\n";
         }
       } break;
-      case PBS_INSET: {
+      case BorderStyle::INSET: {
         FX_FLOAT fHalfWidth = fWidth / 2.0f;
 
         sColor = CPWL_Utils::GetColorAppStream(color, FALSE);
         if (sColor.GetLength() > 0) {
           sAppStream << "q\n" << fHalfWidth << " w\n" << sColor
                      << CPWL_Utils::GetAP_Circle(rect) << " S\nQ\n";
         }
 
         sColor = CPWL_Utils::GetColorAppStream(crLeftTop, FALSE);
         if (sColor.GetLength() > 0) {
@@ skipping 168 matching lines @@
   if (!rcBBox.IsEmpty()) {
     sAppStream << "q\n" << CPWL_Utils::GetColorAppStream(
                                CPWL_Color(COLORTYPE_RGB, 220.0f / 255.0f,
                                           220.0f / 255.0f, 220.0f / 255.0f),
                                TRUE);
     sAppStream << rcBBox.left << " " << rcBBox.bottom << " "
                << rcBBox.right - rcBBox.left << " "
                << rcBBox.top - rcBBox.bottom << " re f\n";
     sAppStream << "Q\n";
 
-    sAppStream << "q\n" << CPWL_Utils::GetBorderAppStream(
-                               rcBBox, 2, CPWL_Color(COLORTYPE_GRAY, 0),
-                               CPWL_Color(COLORTYPE_GRAY, 1),
-                               CPWL_Color(COLORTYPE_GRAY, 0.5), PBS_BEVELED,
-                               CPWL_Dash(3, 0, 0))
+    sAppStream << "q\n"
+               << CPWL_Utils::GetBorderAppStream(
+                      rcBBox, 2, CPWL_Color(COLORTYPE_GRAY, 0),
+                      CPWL_Color(COLORTYPE_GRAY, 1),
+                      CPWL_Color(COLORTYPE_GRAY, 0.5), BorderStyle::BEVELED,
+                      CPWL_Dash(3, 0, 0))
                << "Q\n";
 
     CFX_FloatPoint ptCenter = CFX_FloatPoint((rcBBox.left + rcBBox.right) / 2,
                                              (rcBBox.top + rcBBox.bottom) / 2);
     if (IsFloatBigger(rcBBox.right - rcBBox.left, 6) &&
         IsFloatBigger(rcBBox.top - rcBBox.bottom, 6)) {
       sAppStream << "q\n"
                  << " 0 g\n";
       sAppStream << ptCenter.x - 3 << " " << ptCenter.y + 1.5f << " m\n";
       sAppStream << ptCenter.x + 3 << " " << ptCenter.y + 1.5f << " l\n";
@@ skipping 219 matching lines @@
   }
 }
 
 void CPWL_Utils::DrawBorder(CFX_RenderDevice* pDevice,
                             CFX_Matrix* pUser2Device,
                             const CFX_FloatRect& rect,
                             FX_FLOAT fWidth,
                             const CPWL_Color& color,
                             const CPWL_Color& crLeftTop,
                             const CPWL_Color& crRightBottom,
-                            int32_t nStyle,
+                            BorderStyle nStyle,
                             int32_t nTransparancy) {
   FX_FLOAT fLeft = rect.left;
   FX_FLOAT fRight = rect.right;
   FX_FLOAT fTop = rect.top;
   FX_FLOAT fBottom = rect.bottom;
 
   if (fWidth > 0.0f) {
     FX_FLOAT fHalfWidth = fWidth / 2.0f;
 
     switch (nStyle) {
       default:
-      case PBS_SOLID: {
+      case BorderStyle::SOLID: {
         CFX_PathData path;
         path.AppendRect(fLeft, fBottom, fRight, fTop);
         path.AppendRect(fLeft + fWidth, fBottom + fWidth, fRight - fWidth,
                         fTop - fWidth);
         pDevice->DrawPath(&path, pUser2Device, NULL,
                           PWLColorToFXColor(color, nTransparancy), 0,
                           FXFILL_ALTERNATE);
-      } break;
-      case PBS_DASH: {
+        break;
+      }
+      case BorderStyle::DASH: {
         CFX_PathData path;
 
         path.SetPointCount(5);
         path.SetPoint(0, fLeft + fWidth / 2.0f, fBottom + fWidth / 2.0f,
                       FXPT_MOVETO);
         path.SetPoint(1, fLeft + fWidth / 2.0f, fTop - fWidth / 2.0f,
                       FXPT_LINETO);
         path.SetPoint(2, fRight - fWidth / 2.0f, fTop - fWidth / 2.0f,
                       FXPT_LINETO);
         path.SetPoint(3, fRight - fWidth / 2.0f, fBottom + fWidth / 2.0f,
                       FXPT_LINETO);
         path.SetPoint(4, fLeft + fWidth / 2.0f, fBottom + fWidth / 2.0f,
                       FXPT_LINETO);
 
         CFX_GraphStateData gsd;
         gsd.SetDashCount(2);
         gsd.m_DashArray[0] = 3.0f;
         gsd.m_DashArray[1] = 3.0f;
         gsd.m_DashPhase = 0;
 
         gsd.m_LineWidth = fWidth;
         pDevice->DrawPath(&path, pUser2Device, &gsd, 0,
                           PWLColorToFXColor(color, nTransparancy),
                           FXFILL_WINDING);
-      } break;
-      case PBS_BEVELED:
-      case PBS_INSET: {
+        break;
+      }
+      case BorderStyle::BEVELED:
+      case BorderStyle::INSET: {
         CFX_GraphStateData gsd;
         gsd.m_LineWidth = fHalfWidth;
 
         CFX_PathData pathLT;
 
         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);
@@ skipping 32 matching lines @@
 
         CFX_PathData path;
 
         path.AppendRect(fLeft, fBottom, fRight, fTop);
         path.AppendRect(fLeft + fHalfWidth, fBottom + fHalfWidth,
                         fRight - fHalfWidth, fTop - fHalfWidth);
 
         pDevice->DrawPath(&path, pUser2Device, &gsd,
                           PWLColorToFXColor(color, nTransparancy), 0,
                           FXFILL_ALTERNATE);
-      } break;
-      case PBS_UNDERLINED: {
+        break;
+      }
+      case BorderStyle::UNDERLINE: {
         CFX_PathData path;
 
         path.SetPointCount(2);
         path.SetPoint(0, fLeft, fBottom + fWidth / 2, FXPT_MOVETO);
         path.SetPoint(1, fRight, fBottom + fWidth / 2, FXPT_LINETO);
 
         CFX_GraphStateData gsd;
         gsd.m_LineWidth = fWidth;
 
         pDevice->DrawPath(&path, pUser2Device, &gsd, 0,
                           PWLColorToFXColor(color, nTransparancy),
                           FXFILL_ALTERNATE);
-      } break;
-      case PBS_SHADOW: {

[dsinclair, 2016/05/16 18:04:24]

We never assigned a value of _SHADOW, so removed.

-        CFX_PathData path;
-        path.AppendRect(fLeft, fBottom, fRight, fTop);
-        path.AppendRect(fLeft + fWidth, fBottom + fWidth, fRight - fWidth,
-                        fTop - fWidth);
-        pDevice->DrawPath(&path, pUser2Device, NULL,
-                          PWLColorToFXColor(color, nTransparancy / 2), 0,
-                          FXFILL_ALTERNATE);
-      } break;
+        break;
+      }
     }
   }
 }
 
 FX_BOOL CPWL_Utils::IsBlackOrWhite(const CPWL_Color& color) {
   switch (color.nColorType) {
     case COLORTYPE_TRANSPARENT:
       return FALSE;
     case COLORTYPE_GRAY:
       return color.fColor1 < 0.5f;
@@ skipping 1891 matching lines @@
           break;
         case COLORTYPE_RGB:
           CPWL_Utils::ConvertCMYK2RGB(fColor1, fColor2, fColor3, fColor4,
                                       fColor1, fColor2, fColor3);
           break;
       }
       break;
   }
   nColorType = other_nColorType;
 }