From 92cb5e580cecf0412b74d51e8863ed557e2bd47a Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 16 May 2016 11:38:28 -0700 Subject: Convert border style defines to an enum class. There were two defines, BBS_ and PBS_ for the various border styles in the system. They were the same, except PBS_ had an extra SHADOW define which was never used. This CL combines both of those into a single BorderStyle enum class and updates the code as needed. Also, removes ADDBIT, GETBIT unused defines. Updates barcode code to use the util.h defines instead of redefinition. fsdk_baseannot names starting with _ were cleaned up and some #defines moved to constants. Review-Url: https://codereview.chromium.org/1980973002 --- fpdfsdk/pdfwindow/PWL_Utils.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/pdfwindow/PWL_Utils.h') diff --git a/fpdfsdk/pdfwindow/PWL_Utils.h b/fpdfsdk/pdfwindow/PWL_Utils.h index cdef768cfa..8ab08a857e 100644 --- a/fpdfsdk/pdfwindow/PWL_Utils.h +++ b/fpdfsdk/pdfwindow/PWL_Utils.h @@ -136,7 +136,7 @@ class CPWL_Utils { const CPWL_Color& color, const CPWL_Color& crLeftTop, const CPWL_Color& crRightBottom, - int32_t nStyle, + BorderStyle nStyle, const CPWL_Dash& dash); static CFX_ByteString GetCircleBorderAppStream( const CFX_FloatRect& rect, @@ -144,7 +144,7 @@ class CPWL_Utils { const CPWL_Color& color, const CPWL_Color& crLeftTop, const CPWL_Color& crRightBottom, - int32_t nStyle, + BorderStyle nStyle, const CPWL_Dash& dash); static CFX_ByteString GetRectFillAppStream(const CFX_FloatRect& rect, const CPWL_Color& color); @@ -213,7 +213,7 @@ class CPWL_Utils { const CPWL_Color& color, const CPWL_Color& crLeftTop, const CPWL_Color& crRightBottom, - int32_t nStyle, + BorderStyle nStyle, int32_t nTransparancy); static void DrawFillArea(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, -- cgit v1.2.3