Remove FX_DWORD from XFA, part 2

Some headers were missed in the previous CL.

Review URL: https://codereview.chromium.org/1835703002

10 files changed, 55 insertions, 55 deletions

diff --git a/xfa/include/fwl/theme/carettp.h b/xfa/include/fwl/theme/carettp.h
index d99f92a5f3..bd432dc401 100644
--- a/xfa/include/fwl/theme/carettp.h
+++ b/xfa/include/fwl/theme/carettp.h
@@ -18,7 +18,7 @@ class CFWL_CaretTP : public CFWL_WidgetTP {
 
  protected:
   void DrawCaretBK(CFX_Graphics* pGraphics,
-                   FX_DWORD dwStates,
+                   uint32_t dwStates,
                    const CFX_RectF* pRect,
                    CFX_Color* crFill,
                    CFX_Matrix* pMatrix = NULL);
diff --git a/xfa/include/fwl/theme/checkboxtp.h b/xfa/include/fwl/theme/checkboxtp.h
index 4208897db6..fc666d74b5 100644
--- a/xfa/include/fwl/theme/checkboxtp.h
+++ b/xfa/include/fwl/theme/checkboxtp.h
@@ -15,8 +15,8 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP {
   CFWL_CheckBoxTP();
   virtual ~CFWL_CheckBoxTP();
   virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
-  virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget,
-                              FX_DWORD dwThemeID,
+  virtual uint32_t SetThemeID(IFWL_Widget* pWidget,
+                              uint32_t dwThemeID,
                               FX_BOOL bChildren = TRUE);
   virtual FX_BOOL DrawText(CFWL_ThemeText* pParams);
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
@@ -27,12 +27,12 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP {
   void DrawBoxBk(IFWL_Widget* pWidget,
                  CFX_Graphics* pGraphics,
                  const CFX_RectF* pRect,
-                 FX_DWORD dwStates,
+                 uint32_t dwStates,
                  CFX_Matrix* pMatrix = NULL);
   void DrawSign(IFWL_Widget* pWidget,
                 CFX_Graphics* pGraphics,
                 const CFX_RectF* pRtBox,
-                FX_DWORD dwStates,
+                uint32_t dwStates,
                 CFX_Matrix* pMatrix = NULL);
   void DrawSignNeutral(CFX_Graphics* pGraphics,
                        const CFX_RectF* pRtSign,
@@ -66,7 +66,7 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP {
                       const CFX_RectF* pRtBox,
                       FX_BOOL bDisable = FALSE,
                       CFX_Matrix* pMatrix = NULL);
-  void SetThemeData(FX_DWORD dwID);
+  void SetThemeData(uint32_t dwID);
   void initCheckPath(FX_FLOAT fCheckLen);
   struct CKBThemeData {
     FX_ARGB clrBoxBk[13][2];
diff --git a/xfa/include/fwl/theme/comboboxtp.h b/xfa/include/fwl/theme/comboboxtp.h
index 0cf13a4c1d..74d49b45e7 100644
--- a/xfa/include/fwl/theme/comboboxtp.h
+++ b/xfa/include/fwl/theme/comboboxtp.h
@@ -15,14 +15,14 @@ class CFWL_ComboBoxTP : public CFWL_WidgetTP {
   virtual ~CFWL_ComboBoxTP();
   virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
-  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity);
+  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity);
 
  protected:
   void DrawDropDownButton(CFWL_ThemeBackground* pParams,
-                          FX_DWORD dwStates,
+                          uint32_t dwStates,
                           CFX_Matrix* pMatrix);
   void DrawStrethHandler(CFWL_ThemeBackground* pParams,
-                         FX_DWORD dwStates,
+                         uint32_t dwStates,
                          CFX_Matrix* pMatrix);
 };
 
diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h
index d0c885bf66..90ec67387e 100644
--- a/xfa/include/fwl/theme/formtp.h
+++ b/xfa/include/fwl/theme/formtp.h
@@ -18,12 +18,12 @@ class CFWL_FormTP : public CFWL_WidgetTP {
   virtual FWL_ERR Initialize();
   virtual FWL_ERR Finalize();
   virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
-  virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget,
-                              FX_DWORD dwThemeID,
+  virtual uint32_t SetThemeID(IFWL_Widget* pWidget,
+                              uint32_t dwThemeID,
                               FX_BOOL bChildren = TRUE);
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
   virtual FX_BOOL DrawText(CFWL_ThemeText* pParams);
-  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity);
+  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity);
   virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart);
 
  protected:
@@ -75,7 +75,7 @@ class CFWL_FormTP : public CFWL_WidgetTP {
                      FWLTHEME_STATE eState,
                      CFX_Matrix* pMatrix,
                      int32_t iActive = 0);
-  void SetThemeData(FX_DWORD dwID);
+  void SetThemeData(uint32_t dwID);
   void TransModeColor(FX_ARGB clrFore, FX_ARGB& clrBack);
   void DeactiveForm();
   void InitCaption(FX_BOOL bActive);
diff --git a/xfa/include/fwl/theme/listboxtp.h b/xfa/include/fwl/theme/listboxtp.h
index 8b689814ff..8f5720c9fb 100644
--- a/xfa/include/fwl/theme/listboxtp.h
+++ b/xfa/include/fwl/theme/listboxtp.h
@@ -20,7 +20,7 @@ class CFWL_ListBoxTP : public CFWL_WidgetTP {
 
  protected:
   void DrawListBoxItem(CFX_Graphics* pGraphics,
-                       FX_DWORD dwStates,
+                       uint32_t dwStates,
                        const CFX_RectF* prtItem,
                        void* pData = NULL,
                        CFX_Matrix* pMatrix = NULL);
diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h
index cf7f1e70b1..8321965a8b 100644
--- a/xfa/include/fwl/theme/monthcalendartp.h
+++ b/xfa/include/fwl/theme/monthcalendartp.h
@@ -14,12 +14,12 @@ class CFWL_MonthCalendarTP : public CFWL_WidgetTP {
   CFWL_MonthCalendarTP();
   virtual ~CFWL_MonthCalendarTP();
   virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
-  virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget,
-                              FX_DWORD dwThemeID,
+  virtual uint32_t SetThemeID(IFWL_Widget* pWidget,
+                              uint32_t dwThemeID,
                               FX_BOOL bChildren = TRUE);
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
   virtual FX_BOOL DrawText(CFWL_ThemeText* pParams);
-  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity);
+  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity);
   virtual FWL_ERR Initialize();
   virtual FWL_ERR Finalize();
 
@@ -33,8 +33,8 @@ class CFWL_MonthCalendarTP : public CFWL_WidgetTP {
   FX_BOOL DrawTodayCircle(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix);
   FX_BOOL DrawHSeperator(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix);
   FX_BOOL DrawWeekNumSep(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix);
-  FWLTHEME_STATE GetState(FX_DWORD dwFWLStates);
-  void SetThemeData(FX_DWORD dwThemeID);
+  FWLTHEME_STATE GetState(uint32_t dwFWLStates);
+  void SetThemeData(uint32_t dwThemeID);
   class MCThemeData {
    public:
     FX_ARGB clrCaption;
diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h
index 0b8cc4acf2..b951de0bed 100644
--- a/xfa/include/fwl/theme/pushbuttontp.h
+++ b/xfa/include/fwl/theme/pushbuttontp.h
@@ -14,24 +14,24 @@ class CFWL_PushButtonTP : public CFWL_WidgetTP {
   CFWL_PushButtonTP();
   virtual ~CFWL_PushButtonTP();
   virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
-  virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget,
-                              FX_DWORD dwThemeID,
+  virtual uint32_t SetThemeID(IFWL_Widget* pWidget,
+                              uint32_t dwThemeID,
                               FX_BOOL bChildren = TRUE);
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
-  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity);
+  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity);
   virtual FWL_ERR Initialize();
   virtual FWL_ERR Finalize();
 
  protected:
-  void SetThemeData(FX_DWORD dwID);
-  void SetTopLineColor(FX_DWORD* pData);
-  void SetLeftLineColor(FX_DWORD* pData);
-  void SetRightLineColor(FX_DWORD* pData);
-  void SetBottomLineColor(FX_DWORD* pData);
-  void SetBackgroudColor(FX_DWORD* pData);
-  void SetCaptionColor(FX_DWORD* pData);
-  void SetCornerColor(FX_DWORD* pData);
-  int32_t GetColorID(FX_DWORD dwStates);
+  void SetThemeData(uint32_t dwID);
+  void SetTopLineColor(uint32_t* pData);
+  void SetLeftLineColor(uint32_t* pData);
+  void SetRightLineColor(uint32_t* pData);
+  void SetBottomLineColor(uint32_t* pData);
+  void SetBackgroudColor(uint32_t* pData);
+  void SetCaptionColor(uint32_t* pData);
+  void SetCornerColor(uint32_t* pData);
+  int32_t GetColorID(uint32_t dwStates);
 
   struct PBThemeData {
     FX_ARGB clrBorder[5];
diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h
index 5cfcaea95d..5b7145c155 100644
--- a/xfa/include/fwl/theme/scrollbartp.h
+++ b/xfa/include/fwl/theme/scrollbartp.h
@@ -14,11 +14,11 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP {
   CFWL_ScrollBarTP();
   virtual ~CFWL_ScrollBarTP();
   virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
-  virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget,
-                              FX_DWORD dwThemeID,
+  virtual uint32_t SetThemeID(IFWL_Widget* pWidget,
+                              uint32_t dwThemeID,
                               FX_BOOL bChildren = TRUE);
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
-  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity);
+  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity);
 
  protected:
   void DrawThumbBtn(CFX_Graphics* pGraphics,
@@ -43,7 +43,7 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP {
                FX_BOOL bVert,
                FWLTHEME_STATE eState,
                CFX_Matrix* pMatrix = NULL);
-  void SetThemeData(FX_DWORD dwID);
+  void SetThemeData(uint32_t dwID);
   struct SBThemeData {
     FX_ARGB clrPawColorLight[4];
     FX_ARGB clrPawColorDark[4];
diff --git a/xfa/include/fwl/theme/utils.h b/xfa/include/fwl/theme/utils.h
index 73e865076d..0a37d3274b 100644
--- a/xfa/include/fwl/theme/utils.h
+++ b/xfa/include/fwl/theme/utils.h
@@ -29,7 +29,7 @@ enum FWLTHEME_DIRECTION {
 };
 struct FWLCOLOR {
   union {
-    FX_DWORD color;
+    uint32_t color;
     struct {
       uint8_t b;
       uint8_t g;
@@ -39,11 +39,11 @@ struct FWLCOLOR {
   };
 
   FWLCOLOR() : color(0) {}
-  FWLCOLOR(FX_DWORD c) : color(c) {}
+  FWLCOLOR(uint32_t c) : color(c) {}
   FWLCOLOR(const FWLCOLOR& c) : color(c.color) {}
 
   bool operator==(const FWLCOLOR& frColor) { return color == frColor.color; }
-  operator FX_DWORD() { return color; }
+  operator uint32_t() { return color; }
 };
 #define FWLTHEME_BEZIER FX_BEZIER
 #define FWLTHEME_PI FX_PI
diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h
index 8d3f9ee79a..344f4d3034 100644
--- a/xfa/include/fwl/theme/widgettp.h
+++ b/xfa/include/fwl/theme/widgettp.h
@@ -32,16 +32,16 @@ class IFX_FontSourceEnum;
 class CFWL_WidgetTP {
  public:
   virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
-  virtual FX_DWORD GetThemeID(IFWL_Widget* pWidget);
-  virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget,
-                              FX_DWORD dwThemeID,
+  virtual uint32_t GetThemeID(IFWL_Widget* pWidget);
+  virtual uint32_t SetThemeID(IFWL_Widget* pWidget,
+                              uint32_t dwThemeID,
                               FX_BOOL bChildren = TRUE);
   virtual FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix);
   virtual FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget,
                                  const CFX_Matrix& matrix);
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
   virtual FX_BOOL DrawText(CFWL_ThemeText* pParams);
-  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity);
+  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity);
   virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget);
   virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart);
   virtual FX_BOOL IsInPart(CFWL_ThemePart* pThemePart,
@@ -66,7 +66,7 @@ class CFWL_WidgetTP {
   FX_ERR InitTTO();
   FX_ERR FinalizeTTO();
   void DrawEdge(CFX_Graphics* pGraphics,
-                FX_DWORD dwStyles,
+                uint32_t dwStyles,
                 const CFX_RectF* pRect,
                 CFX_Matrix* pMatrix = NULL);
   void Draw3DRect(CFX_Graphics* pGraphics,
@@ -141,20 +141,20 @@ class CFWL_WidgetTP {
                     FWLTHEME_STATE eState,
                     CFX_Matrix* pMatrix = NULL);
   FWLCOLOR BlendColor(FWLCOLOR srcColor, FWLCOLOR renderColor, uint8_t scale);
-  FX_DWORD m_dwRefCount;
+  uint32_t m_dwRefCount;
   IFDE_TextOut* m_pTextOut;
   IFX_Font* m_pFDEFont;
   FX_FLOAT m_fValue;
-  FX_DWORD m_dwValue;
+  uint32_t m_dwValue;
   CFX_RectF m_rtMargin;
-  FX_DWORD m_dwThemeID;
+  uint32_t m_dwThemeID;
   CFX_Matrix _ctm;
 };
 FX_BOOL FWLTHEME_Init();
 void FWLTHEME_Release();
-FX_DWORD FWL_GetThemeLayout(FX_DWORD dwThemeID);
-FX_DWORD FWL_GetThemeColor(FX_DWORD dwThemeID);
-FX_DWORD FWL_MakeThemeID(FX_DWORD dwLayout, FX_DWORD dwColor);
+uint32_t FWL_GetThemeLayout(uint32_t dwThemeID);
+uint32_t FWL_GetThemeColor(uint32_t dwThemeID);
+uint32_t FWL_MakeThemeID(uint32_t dwLayout, uint32_t dwColor);
 
 class CFWL_ArrowData {
  public:
@@ -162,7 +162,7 @@ class CFWL_ArrowData {
   static FX_BOOL IsInstance();
   static void DestroyInstance();
   virtual ~CFWL_ArrowData();
-  void SetColorData(FX_DWORD dwID);
+  void SetColorData(uint32_t dwID);
 
   class CColorData {
    public:
@@ -182,17 +182,17 @@ class CFWL_FontData {
   CFWL_FontData();
   virtual ~CFWL_FontData();
   FX_BOOL Equal(const CFX_WideStringC& wsFontFamily,
-                FX_DWORD dwFontStyles,
+                uint32_t dwFontStyles,
                 uint16_t wCodePage);
   FX_BOOL LoadFont(const CFX_WideStringC& wsFontFamily,
-                   FX_DWORD dwFontStyles,
+                   uint32_t dwFontStyles,
                    uint16_t wCodePage);
   IFX_Font* GetFont() const { return m_pFont; }
 
  protected:
   CFX_WideString m_wsFamily;
-  FX_DWORD m_dwStyles;
-  FX_DWORD m_dwCodePage;
+  uint32_t m_dwStyles;
+  uint32_t m_dwCodePage;
   IFX_Font* m_pFont;
   IFX_FontMgr* m_pFontMgr;
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
@@ -206,7 +206,7 @@ class CFWL_FontManager {
   static void DestroyInstance();
 
   IFX_Font* FindFont(const CFX_WideStringC& wsFontFamily,
-                     FX_DWORD dwFontStyles,
+                     uint32_t dwFontStyles,
                      uint16_t dwCodePage);
 
  protected: