Replace FX_UINT with unsigned int

Remove the FX_UINT typedef and update to use the actual unsigned int type.

Review-Url: https://codereview.chromium.org/2343693002

4 files changed, 11 insertions, 23 deletions

diff --git a/fpdfsdk/include/cpdfsdk_document.h b/fpdfsdk/include/cpdfsdk_document.h
index 9f6ac79202..5a83b74296 100644
--- a/fpdfsdk/include/cpdfsdk_document.h
+++ b/fpdfsdk/include/cpdfsdk_document.h
@@ -68,8 +68,8 @@ class CPDFSDK_Document : public CFX_Observable<CPDFSDK_Document> {
 
   IJS_Runtime* GetJsRuntime();
 
-  FX_BOOL SetFocusAnnot(CPDFSDK_Annot* pAnnot, FX_UINT nFlag = 0);
-  FX_BOOL KillFocusAnnot(FX_UINT nFlag = 0);
+  FX_BOOL SetFocusAnnot(CPDFSDK_Annot* pAnnot, uint32_t nFlag = 0);
+  FX_BOOL KillFocusAnnot(uint32_t nFlag = 0);
 
   FX_BOOL ExtractPages(const std::vector<uint16_t>& arrExtraPages,
                        CPDF_Document* pDstDoc);
diff --git a/fpdfsdk/include/cpdfsdk_environment.h b/fpdfsdk/include/cpdfsdk_environment.h
index fe63ecad13..59b260859a 100644
--- a/fpdfsdk/include/cpdfsdk_environment.h
+++ b/fpdfsdk/include/cpdfsdk_environment.h
@@ -359,8 +359,8 @@ class CPDFSDK_Environment final {
 
   int JS_appAlert(const FX_WCHAR* Msg,
                   const FX_WCHAR* Title,
-                  FX_UINT Type,
-                  FX_UINT Icon);
+                  uint32_t Type,
+                  uint32_t Icon);
   int JS_appResponse(const FX_WCHAR* Question,
                      const FX_WCHAR* Title,
                      const FX_WCHAR* Default,
diff --git a/fpdfsdk/include/cpdfsdk_pageview.h b/fpdfsdk/include/cpdfsdk_pageview.h
index a496334c2d..d22b6b48a0 100644
--- a/fpdfsdk/include/cpdfsdk_pageview.h
+++ b/fpdfsdk/include/cpdfsdk_pageview.h
@@ -39,10 +39,10 @@ class CPDFSDK_PageView final : public CPDF_Page::View {
   const CPDF_Annot* GetPDFWidgetAtPoint(FX_FLOAT pageX, FX_FLOAT pageY);
   CPDFSDK_Annot* GetFXWidgetAtPoint(FX_FLOAT pageX, FX_FLOAT pageY);
   CPDFSDK_Annot* GetFocusAnnot();
-  void SetFocusAnnot(CPDFSDK_Annot* pSDKAnnot, FX_UINT nFlag = 0) {
+  void SetFocusAnnot(CPDFSDK_Annot* pSDKAnnot, uint32_t nFlag = 0) {
     m_pSDKDoc->SetFocusAnnot(pSDKAnnot, nFlag);
   }
-  FX_BOOL KillFocusAnnot(FX_UINT nFlag = 0) {
+  FX_BOOL KillFocusAnnot(uint32_t nFlag = 0) {
     return m_pSDKDoc->KillFocusAnnot(nFlag);
   }
   void KillFocusAnnotIfNeeded();
@@ -65,13 +65,13 @@ class CPDFSDK_PageView final : public CPDF_Page::View {
   CPDF_Page* GetPDFPage() const;
   CPDF_Document* GetPDFDocument();
   CPDFSDK_Document* GetSDKDocument() { return m_pSDKDoc; }
-  FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_UINT nFlag);
-  FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_UINT nFlag);
+  FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag);
+  FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag);
 #ifdef PDF_ENABLE_XFA
-  FX_BOOL OnRButtonDown(const CFX_FloatPoint& point, FX_UINT nFlag);
-  FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, FX_UINT nFlag);
+  FX_BOOL OnRButtonDown(const CFX_FloatPoint& point, uint32_t nFlag);
+  FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag);
 #endif  // PDF_ENABLE_XFA
-  FX_BOOL OnChar(int nChar, FX_UINT nFlag);
+  FX_BOOL OnChar(int nChar, uint32_t nFlag);
   FX_BOOL OnKeyDown(int nKeyCode, int nFlag);
   FX_BOOL OnKeyUp(int nKeyCode, int nFlag);
 
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index 909cbbd9d2..cb4e5c34a6 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -20,18 +20,6 @@
 #include <tchar.h>
 #endif
 
-// Convert a #FX_ARGB to a #FX_COLORREF.
-#define FX_ARGBTOCOLORREF(argb)                                            \
-  ((((uint32_t)argb & 0x00FF0000) >> 16) | ((uint32_t)argb & 0x0000FF00) | \
-   (((uint32_t)argb & 0x000000FF) << 16))
-
-// Convert a #FX_COLORREF to a #FX_ARGB.
-#define FX_COLORREFTOARGB(rgb)                                   \
-  ((uint32_t)0xFF000000 | (((uint32_t)rgb & 0x000000FF) << 16) | \
-   ((uint32_t)rgb & 0x0000FF00) | (((uint32_t)rgb & 0x00FF0000) >> 16))
-
-typedef unsigned int FX_UINT;
-
 class CPDF_Annot;
 class CPDF_Page;
 class CPDF_PageRenderContext;