Remove FX_DWORD from XFA, part 2

Some headers were missed in the previous CL.

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

12 files changed, 81 insertions, 81 deletions

diff --git a/xfa/fde/css/fde_css.h b/xfa/fde/css/fde_css.h
index 791620071d..d2b67d294e 100644
--- a/xfa/fde/css/fde_css.h
+++ b/xfa/fde/css/fde_css.h
@@ -394,7 +394,7 @@ class IFDE_CSSSelector {
  public:
   virtual ~IFDE_CSSSelector() {}
   virtual FDE_CSSSELECTORTYPE GetType() const = 0;
-  virtual FX_DWORD GetNameHash() const = 0;
+  virtual uint32_t GetNameHash() const = 0;
   virtual IFDE_CSSSelector* GetNextSelector() const = 0;
 };
 #define FDE_CSSMEDIATYPE_Braille 0x01
@@ -428,7 +428,7 @@ class IFDE_CSSStyleRule : public IFDE_CSSRule {
 class IFDE_CSSMediaRule : public IFDE_CSSRule {
  public:
   virtual FDE_CSSRULETYPE GetType() const { return FDE_CSSRULETYPE_Media; }
-  virtual FX_DWORD GetMediaList() const = 0;
+  virtual uint32_t GetMediaList() const = 0;
   virtual int32_t CountRules() const = 0;
   virtual IFDE_CSSRule* GetRule(int32_t index) = 0;
 };
@@ -444,15 +444,15 @@ class IFDE_CSSStyleSheet : public IFX_Unknown {
       const CFX_WideString& szUrl,
       IFX_Stream* pStream,
       uint16_t wCodePage,
-      FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL);
+      uint32_t dwMediaList = FDE_CSSMEDIATYPE_ALL);
   static IFDE_CSSStyleSheet* LoadFromBuffer(
       const CFX_WideString& szUrl,
       const FX_WCHAR* pBuffer,
       int32_t iBufSize,
       uint16_t wCodePage,
-      FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL);
+      uint32_t dwMediaList = FDE_CSSMEDIATYPE_ALL);
   virtual FX_BOOL GetUrl(CFX_WideString& szUrl) = 0;
-  virtual FX_DWORD GetMediaList() const = 0;
+  virtual uint32_t GetMediaList() const = 0;
   virtual uint16_t GetCodePage() const = 0;
 
   virtual int32_t CountRules() const = 0;
@@ -936,7 +936,7 @@ class IFDE_CSSParagraphStyle {
   virtual FDE_CSSVERTICALALIGN GetVerticalAlign() const = 0;
   virtual FX_FLOAT GetNumberVerticalAlign() const = 0;
   virtual FDE_CSSTEXTTRANSFORM GetTextTransform() const = 0;
-  virtual FX_DWORD GetTextDecoration() const = 0;
+  virtual uint32_t GetTextDecoration() const = 0;
   virtual const FDE_CSSLENGTH& GetLetterSpacing() const = 0;
   virtual const FDE_CSSLENGTH& GetWordSpacing() const = 0;
   virtual FDE_CSSWRITINGMODE GetWritingMode() const = 0;
@@ -961,7 +961,7 @@ class IFDE_CSSParagraphStyle {
   virtual void SetVerticalAlign(FDE_CSSVERTICALALIGN eVerticalAlign) = 0;
   virtual void SetNumberVerticalAlign(FX_FLOAT fAlign) = 0;
   virtual void SetTextTransform(FDE_CSSTEXTTRANSFORM eTextTransform) = 0;
-  virtual void SetTextDecoration(FX_DWORD dwTextDecoration) = 0;
+  virtual void SetTextDecoration(uint32_t dwTextDecoration) = 0;
   virtual void SetLetterSpacing(const FDE_CSSLENGTH& letterSpacing) = 0;
   virtual void SetWordSpacing(const FDE_CSSLENGTH& wordSpacing) = 0;
   virtual void SetWritingMode(FDE_CSSWRITINGMODE eWritingMode) = 0;
@@ -1065,7 +1065,7 @@ class IFDE_CSSStyleSelector {
                                  const CFDE_CSSStyleSheetArray* pArray) = 0;
   virtual void SetStylePriority(FDE_CSSSTYLESHEETGROUP eType,
                                 FDE_CSSSTYLESHEETPRIORITY ePriority) = 0;
-  virtual void UpdateStyleIndex(FX_DWORD dwMediaList) = 0;
+  virtual void UpdateStyleIndex(uint32_t dwMediaList) = 0;
   virtual IFDE_CSSAccelerator* InitAccelerator() = 0;
   virtual IFDE_CSSComputedStyle* CreateComputedStyle(
       IFDE_CSSComputedStyle* pParentStyle) = 0;
diff --git a/xfa/fde/css/fde_csscache.h b/xfa/fde/css/fde_csscache.h
index b886424d64..20158b5371 100644
--- a/xfa/fde/css/fde_csscache.h
+++ b/xfa/fde/css/fde_csscache.h
@@ -18,7 +18,7 @@ class FDE_CSSCacheItem : public CFX_Target {
   ~FDE_CSSCacheItem();
 
   IFDE_CSSStyleSheet* pStylesheet;
-  FX_DWORD dwActivity;
+  uint32_t dwActivity;
 };
 
 class CFDE_CSSStyleSheetCache : public IFDE_CSSStyleSheetCache,
@@ -51,11 +51,11 @@ class FDE_CSSTagCache : public CFX_Target {
   FDE_CSSTagCache(const FDE_CSSTagCache& it);
   FDE_CSSTagCache* GetParent() const { return pParent; }
   IFDE_CSSTagProvider* GetTag() const { return pTag; }
-  FX_DWORD HashID() const { return dwIDHash; }
-  FX_DWORD HashTag() const { return dwTagHash; }
+  uint32_t HashID() const { return dwIDHash; }
+  uint32_t HashTag() const { return dwTagHash; }
   int32_t CountHashClass() const { return dwClassHashs.GetSize(); }
   void SetClassIndex(int32_t index) { iClassIndex = index; }
-  FX_DWORD HashClass() const {
+  uint32_t HashClass() const {
     return iClassIndex < dwClassHashs.GetSize()
                ? dwClassHashs.GetAt(iClassIndex)
                : 0;
@@ -64,8 +64,8 @@ class FDE_CSSTagCache : public CFX_Target {
  protected:
   IFDE_CSSTagProvider* pTag;
   FDE_CSSTagCache* pParent;
-  FX_DWORD dwIDHash;
-  FX_DWORD dwTagHash;
+  uint32_t dwIDHash;
+  uint32_t dwTagHash;
   int32_t iClassIndex;
   CFDE_DWordArray dwClassHashs;
 };
diff --git a/xfa/fde/css/fde_cssdatatable.h b/xfa/fde/css/fde_cssdatatable.h
index a44c24b614..8d17901d1d 100644
--- a/xfa/fde/css/fde_cssdatatable.h
+++ b/xfa/fde/css/fde_cssdatatable.h
@@ -132,8 +132,8 @@ class CFDE_CSSValueListParser : public CFX_Target {
 struct FDE_CSSPROPERTYTABLE {
   FDE_CSSPROPERTY eName;
   const FX_WCHAR* pszName;
-  FX_DWORD dwHash;
-  FX_DWORD dwType;
+  uint32_t dwHash;
+  uint32_t dwType;
 };
 typedef FDE_CSSPROPERTYTABLE const* FDE_LPCCSSPROPERTYTABLE;
 
@@ -143,7 +143,7 @@ FDE_LPCCSSPROPERTYTABLE FDE_GetCSSPropertyByEnum(FDE_CSSPROPERTY eName);
 struct FDE_CSSPROPERTYVALUETABLE {
   FDE_CSSPROPERTYVALUE eName;
   const FX_WCHAR* pszName;
-  FX_DWORD dwHash;
+  uint32_t dwHash;
 };
 typedef FDE_CSSPROPERTYVALUETABLE const* FDE_LPCCSSPROPERTYVALUETABLE;
 
@@ -167,7 +167,7 @@ typedef FDE_CSSLENGTHUNITTABLE const* FDE_LPCCSSLENGTHUNITTABLE;
 FDE_LPCCSSLENGTHUNITTABLE FDE_GetCSSLengthUnitByName(const FX_WCHAR* pszName,
                                                      int32_t iLength);
 struct FDE_CSSCOLORTABLE {
-  FX_DWORD dwHash;
+  uint32_t dwHash;
   FX_ARGB dwValue;
 };
 typedef FDE_CSSCOLORTABLE const* FDE_LPCCSSCOLORTABLE;
@@ -176,7 +176,7 @@ FDE_LPCCSSCOLORTABLE FDE_GetCSSColorByName(const FX_WCHAR* pszName,
 struct FDE_CSSPERSUDOTABLE {
   FDE_CSSPERSUDO eName;
   const FX_WCHAR* pszName;
-  FX_DWORD dwHash;
+  uint32_t dwHash;
 };
 typedef FDE_CSSPERSUDOTABLE const* FDE_LPCCSSPERSUDOTABLE;
 
diff --git a/xfa/fde/css/fde_cssstyleselector.h b/xfa/fde/css/fde_cssstyleselector.h
index 0584a2983f..2652e3f8ea 100644
--- a/xfa/fde/css/fde_cssstyleselector.h
+++ b/xfa/fde/css/fde_cssstyleselector.h
@@ -22,11 +22,11 @@ class FDE_CSSRuleData : public CFX_Target {
  public:
   FDE_CSSRuleData(IFDE_CSSSelector* pSel,
                   IFDE_CSSDeclaration* pDecl,
-                  FX_DWORD dwPos);
+                  uint32_t dwPos);
 
   IFDE_CSSSelector* pSelector;
   IFDE_CSSDeclaration* pDeclaration;
-  FX_DWORD dwPriority;
+  uint32_t dwPriority;
   FDE_CSSRuleData* pNext;
 };
 
@@ -39,24 +39,24 @@ class CFDE_CSSRuleCollection : public CFX_Target {
         m_iSelectors(0) {}
   ~CFDE_CSSRuleCollection() { Clear(); }
   void AddRulesFrom(const CFDE_CSSStyleSheetArray& sheets,
-                    FX_DWORD dwMediaList,
+                    uint32_t dwMediaList,
                     IFX_FontMgr* pFontMgr);
   void Clear();
 
   int32_t CountSelectors() const { return m_iSelectors; }
-  FDE_CSSRuleData* GetIDRuleData(FX_DWORD dwIDHash) {
+  FDE_CSSRuleData* GetIDRuleData(uint32_t dwIDHash) {
     void* pData;
     return m_IDRules.Lookup((void*)(uintptr_t)dwIDHash, pData)
                ? (FDE_CSSRuleData*)pData
                : NULL;
   }
-  FDE_CSSRuleData* GetTagRuleData(FX_DWORD dwTagHasn) {
+  FDE_CSSRuleData* GetTagRuleData(uint32_t dwTagHasn) {
     void* pData;
     return m_TagRules.Lookup((void*)(uintptr_t)dwTagHasn, pData)
                ? (FDE_CSSRuleData*)pData
                : NULL;
   }
-  FDE_CSSRuleData* GetClassRuleData(FX_DWORD dwIDHash) {
+  FDE_CSSRuleData* GetClassRuleData(uint32_t dwIDHash) {
     void* pData;
     return m_ClassRules.Lookup((void*)(uintptr_t)dwIDHash, pData)
                ? (FDE_CSSRuleData*)pData
@@ -69,10 +69,10 @@ class CFDE_CSSRuleCollection : public CFX_Target {
  protected:
   void AddRulesFrom(IFDE_CSSStyleSheet* pStyleSheet,
                     IFDE_CSSRule* pRule,
-                    FX_DWORD dwMediaList,
+                    uint32_t dwMediaList,
                     IFX_FontMgr* pFontMgr);
   void AddRuleTo(CFX_MapPtrToPtr& map,
-                 FX_DWORD dwKey,
+                 uint32_t dwKey,
                  IFDE_CSSSelector* pSel,
                  IFDE_CSSDeclaration* pDecl);
   FX_BOOL AddRuleTo(FDE_CSSRuleData*& pList, FDE_CSSRuleData* pData);
@@ -102,7 +102,7 @@ class CFDE_CSSStyleSelector : public IFDE_CSSStyleSelector, public CFX_Target {
                                  const CFDE_CSSStyleSheetArray* pArray);
   virtual void SetStylePriority(FDE_CSSSTYLESHEETGROUP eType,
                                 FDE_CSSSTYLESHEETPRIORITY ePriority);
-  virtual void UpdateStyleIndex(FX_DWORD dwMediaList);
+  virtual void UpdateStyleIndex(uint32_t dwMediaList);
   virtual IFDE_CSSAccelerator* InitAccelerator();
   virtual IFDE_CSSComputedStyle* CreateComputedStyle(
       IFDE_CSSComputedStyle* pParentStyle);
@@ -152,7 +152,7 @@ class CFDE_CSSStyleSelector : public IFDE_CSSStyleSelector, public CFX_Target {
   FDE_CSSLISTSTYLEPOSITION ToListStylePosition(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSVISIBILITY ToVisibility(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSWHITESPACE ToWhiteSpace(FDE_CSSPROPERTYVALUE eValue);
-  FX_DWORD ToTextDecoration(IFDE_CSSValueList* pList);
+  uint32_t ToTextDecoration(IFDE_CSSValueList* pList);
   FDE_CSSTEXTTRANSFORM ToTextTransform(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSFONTVARIANT ToFontVariant(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSFLOAT ToFloat(FDE_CSSPROPERTYVALUE eValue);
@@ -338,32 +338,32 @@ class CFDE_CSSNonInheritedData {
 
   FX_FLOAT m_fVerticalAlign;
   FX_FLOAT m_fTextCombineNumber;
-  FX_DWORD m_eBDRLeftStyle : 4;
-  FX_DWORD m_eBDRTopStyle : 4;
-  FX_DWORD m_eBDRRightStyle : 4;
-  FX_DWORD m_eBDRBottomStyle : 4;
-  FX_DWORD m_eDisplay : 5;
-  FX_DWORD m_eVerticalAlign : 4;
-  FX_DWORD m_eListStyleType : 5;
-  FX_DWORD m_eColumnRuleStyle : 4;
-  FX_DWORD m_ePageBreakInside : 3;
-  FX_DWORD m_ePageBreakAfter : 3;
-  FX_DWORD m_ePageBreakBefore : 3;
-  FX_DWORD m_ePosition : 2;
-  FX_DWORD m_eBKGRepeat : 2;
-  FX_DWORD m_eFloat : 2;
-  FX_DWORD m_eClear : 2;
-  FX_DWORD m_eOverflowX : 3;
-  FX_DWORD m_eOverflowY : 3;
-  FX_DWORD m_eListStylePosition : 1;
-  FX_DWORD m_eBKGAttachment : 1;
-  FX_DWORD m_bHasMargin : 1;
-  FX_DWORD m_bHasBorder : 1;
-  FX_DWORD m_bHasPadding : 1;
-  FX_DWORD m_dwTextDecoration : 5;
-  FX_DWORD m_eTextCombine : 1;
-  FX_DWORD m_bColumnRuleColorSame : 1;
-  FX_DWORD m_bHasTextCombineNumber : 1;
+  uint32_t m_eBDRLeftStyle : 4;
+  uint32_t m_eBDRTopStyle : 4;
+  uint32_t m_eBDRRightStyle : 4;
+  uint32_t m_eBDRBottomStyle : 4;
+  uint32_t m_eDisplay : 5;
+  uint32_t m_eVerticalAlign : 4;
+  uint32_t m_eListStyleType : 5;
+  uint32_t m_eColumnRuleStyle : 4;
+  uint32_t m_ePageBreakInside : 3;
+  uint32_t m_ePageBreakAfter : 3;
+  uint32_t m_ePageBreakBefore : 3;
+  uint32_t m_ePosition : 2;
+  uint32_t m_eBKGRepeat : 2;
+  uint32_t m_eFloat : 2;
+  uint32_t m_eClear : 2;
+  uint32_t m_eOverflowX : 3;
+  uint32_t m_eOverflowY : 3;
+  uint32_t m_eListStylePosition : 1;
+  uint32_t m_eBKGAttachment : 1;
+  uint32_t m_bHasMargin : 1;
+  uint32_t m_bHasBorder : 1;
+  uint32_t m_bHasPadding : 1;
+  uint32_t m_dwTextDecoration : 5;
+  uint32_t m_eTextCombine : 1;
+  uint32_t m_bColumnRuleColorSame : 1;
+  uint32_t m_bHasTextCombineNumber : 1;
 };
 class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle,
                               public IFDE_CSSFontStyle,
@@ -382,9 +382,9 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle,
   CFDE_CSSComputedStyle(IFX_MEMAllocator* pAlloc)
       : m_dwRefCount(1), m_pAllocator(pAlloc) {}
   ~CFDE_CSSComputedStyle() {}
-  virtual FX_DWORD AddRef() { return ++m_dwRefCount; }
-  virtual FX_DWORD Release() {
-    FX_DWORD dwRefCount = --m_dwRefCount;
+  virtual uint32_t AddRef() { return ++m_dwRefCount; }
+  virtual uint32_t Release() {
+    uint32_t dwRefCount = --m_dwRefCount;
     if (dwRefCount == 0) {
       if (m_NonInheritedData.m_pCounterStyle != NULL) {
         delete m_NonInheritedData.m_pCounterStyle;
@@ -709,7 +709,7 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle,
   virtual FDE_CSSTEXTTRANSFORM GetTextTransform() const {
     return (FDE_CSSTEXTTRANSFORM)m_InheritedData.m_eTextTransform;
   }
-  virtual FX_DWORD GetTextDecoration() const {
+  virtual uint32_t GetTextDecoration() const {
     return m_NonInheritedData.m_dwTextDecoration;
   }
   virtual const FDE_CSSLENGTH& GetLetterSpacing() const {
@@ -785,7 +785,7 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle,
   virtual void SetTextTransform(FDE_CSSTEXTTRANSFORM eTextTransform) {
     m_InheritedData.m_eTextTransform = eTextTransform;
   }
-  virtual void SetTextDecoration(FX_DWORD dwTextDecoration) {
+  virtual void SetTextDecoration(uint32_t dwTextDecoration) {
     m_NonInheritedData.m_dwTextDecoration = dwTextDecoration;
   }
   virtual void SetLetterSpacing(const FDE_CSSLENGTH& letterSpacing) {
@@ -890,7 +890,7 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle,
     m_CustomProperties.Add(wsName);
     m_CustomProperties.Add(wsValue);
   }
-  FX_DWORD m_dwRefCount;
+  uint32_t m_dwRefCount;
   IFX_MEMAllocator* m_pAllocator;
   CFDE_CSSInheritedData m_InheritedData;
   CFDE_CSSNonInheritedData m_NonInheritedData;
diff --git a/xfa/fde/css/fde_cssstylesheet.h b/xfa/fde/css/fde_cssstylesheet.h
index 882f80f366..8ae8bd5393 100644
--- a/xfa/fde/css/fde_cssstylesheet.h
+++ b/xfa/fde/css/fde_cssstylesheet.h
@@ -21,7 +21,7 @@ class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target {
         m_pNext(NULL) {}
   virtual FDE_CSSSELECTORTYPE GetType() const { return m_eType; }
 
-  virtual FX_DWORD GetNameHash() const { return m_dwHash; }
+  virtual uint32_t GetNameHash() const { return m_dwHash; }
 
   virtual IFDE_CSSSelector* GetNextSelector() const { return m_pNext; }
   static IFDE_CSSSelector* FromString(IFX_MEMAllocator* pStaticStore,
@@ -37,7 +37,7 @@ class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target {
                                          FDE_CSSSELECTORTYPE eType);
   void SetType(FDE_CSSSELECTORTYPE eType) { m_eType = eType; }
   FDE_CSSSELECTORTYPE m_eType;
-  FX_DWORD m_dwHash;
+  uint32_t m_dwHash;
   IFDE_CSSSelector* m_pNext;
 };
 typedef CFX_ArrayTemplate<IFDE_CSSSelector*> CFDE_CSSSelectorArray;
@@ -63,10 +63,10 @@ class CFDE_CSSStyleRule : public IFDE_CSSStyleRule, public CFX_Target {
 };
 class CFDE_CSSMediaRule : public IFDE_CSSMediaRule, public CFX_Target {
  public:
-  CFDE_CSSMediaRule(FX_DWORD dwMediaList) : m_dwMediaList(dwMediaList) {}
+  CFDE_CSSMediaRule(uint32_t dwMediaList) : m_dwMediaList(dwMediaList) {}
   ~CFDE_CSSMediaRule();
 
-  virtual FX_DWORD GetMediaList() const { return m_dwMediaList; }
+  virtual uint32_t GetMediaList() const { return m_dwMediaList; }
 
   virtual int32_t CountRules() const { return m_RuleArray.GetSize(); }
   virtual IFDE_CSSRule* GetRule(int32_t index) {
@@ -75,7 +75,7 @@ class CFDE_CSSMediaRule : public IFDE_CSSMediaRule, public CFX_Target {
   CFDE_CSSRuleArray& GetArray() { return m_RuleArray; }
 
  protected:
-  FX_DWORD m_dwMediaList;
+  uint32_t m_dwMediaList;
   CFDE_CSSRuleArray m_RuleArray;
 };
 class CFDE_CSSFontFaceRule : public IFDE_CSSFontFaceRule, public CFX_Target {
@@ -96,16 +96,16 @@ class CFDE_CSSFontFaceRule : public IFDE_CSSFontFaceRule, public CFX_Target {
     return FDE_CSSSYNTAXSTATUS_Error;
 class CFDE_CSSStyleSheet : public IFDE_CSSStyleSheet, public CFX_Target {
  public:
-  CFDE_CSSStyleSheet(FX_DWORD dwMediaList);
+  CFDE_CSSStyleSheet(uint32_t dwMediaList);
   ~CFDE_CSSStyleSheet();
-  virtual FX_DWORD AddRef();
-  virtual FX_DWORD Release();
+  virtual uint32_t AddRef();
+  virtual uint32_t Release();
 
   virtual FX_BOOL GetUrl(CFX_WideString& szUrl) {
     szUrl = m_szUrl;
     return szUrl.GetLength() > 0;
   }
-  virtual FX_DWORD GetMediaList() const { return m_dwMediaList; }
+  virtual uint32_t GetMediaList() const { return m_dwMediaList; }
   virtual uint16_t GetCodePage() const { return m_wCodePage; }
   virtual int32_t CountRules() const;
   virtual IFDE_CSSRule* GetRule(int32_t index);
@@ -130,7 +130,7 @@ class CFDE_CSSStyleSheet : public IFDE_CSSStyleSheet, public CFX_Target {
   FDE_CSSSYNTAXSTATUS SkipRuleSet(IFDE_CSSSyntaxParser* pSyntax);
   uint16_t m_wCodePage;
   uint16_t m_wRefCount;
-  FX_DWORD m_dwMediaList;
+  uint32_t m_dwMediaList;
   IFX_MEMAllocator* m_pAllocator;
   CFDE_CSSRuleArray m_RuleArray;
   CFX_WideString m_szUrl;
diff --git a/xfa/fde/css/fde_csssyntax.h b/xfa/fde/css/fde_csssyntax.h
index a25ab3badd..0f97604073 100644
--- a/xfa/fde/css/fde_csssyntax.h
+++ b/xfa/fde/css/fde_csssyntax.h
@@ -110,7 +110,7 @@ class CFDE_CSSSyntaxParser : public IFDE_CSSSyntaxParser, public CFX_Target {
   CFDE_CSSTextBuf m_TextData;
   CFDE_CSSTextBuf m_TextPlane;
   int32_t m_iTextDatLen;
-  FX_DWORD m_dwCheck;
+  uint32_t m_dwCheck;
   FDE_CSSSYNTAXMODE m_eMode;
   FDE_CSSSYNTAXSTATUS m_eStatus;
   CFX_StackTemplate<FDE_CSSSYNTAXMODE> m_ModeStack;
diff --git a/xfa/fde/fde_iterator.h b/xfa/fde/fde_iterator.h
index 6be6c4c0a5..5a0e7566a0 100644
--- a/xfa/fde/fde_iterator.h
+++ b/xfa/fde/fde_iterator.h
@@ -24,7 +24,7 @@ class CFDE_VisualSetIterator : public IFDE_VisualSetIterator,
   virtual void Release() { delete this; }
 
   virtual FX_BOOL AttachCanvas(IFDE_CanvasSet* pCanvas);
-  virtual FX_BOOL FilterObjects(FX_DWORD dwObjects = 0xFFFFFFFF);
+  virtual FX_BOOL FilterObjects(uint32_t dwObjects = 0xFFFFFFFF);
 
   virtual void Reset();
   virtual FDE_HVISUALOBJ GetNext(IFDE_VisualSet*& pVisualSet,
@@ -32,7 +32,7 @@ class CFDE_VisualSetIterator : public IFDE_VisualSetIterator,
                                  IFDE_CanvasSet** ppCanvasSet = NULL);
 
  protected:
-  FX_DWORD m_dwFilter;
+  uint32_t m_dwFilter;
   CFX_StackTemplate<FDE_CANVASITEM> m_CanvasStack;
 };
 
diff --git a/xfa/fde/fde_render.h b/xfa/fde/fde_render.h
index 2b09ed67ac..99e4bbe963 100644
--- a/xfa/fde/fde_render.h
+++ b/xfa/fde/fde_render.h
@@ -16,7 +16,7 @@ void FDE_GetPageMatrix(CFX_Matrix& pageMatrix,
                        const CFX_RectF& docPageRect,
                        const CFX_Rect& devicePageRect,
                        int32_t iRotate,
-                       FX_DWORD dwCoordinatesType = 0);
+                       uint32_t dwCoordinatesType = 0);
 enum FDE_RENDERSTATUS {
   FDE_RENDERSTATUS_Reset = 0,
   FDE_RENDERSTATUS_Paused,
diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/fde_visualset.h
index 593d42de20..5dc7f84cb7 100644
--- a/xfa/fde/fde_visualset.h
+++ b/xfa/fde/fde_visualset.h
@@ -113,7 +113,7 @@ class IFDE_VisualSetIterator {
   virtual ~IFDE_VisualSetIterator() {}
   virtual void Release() = 0;
   virtual FX_BOOL AttachCanvas(IFDE_CanvasSet* pCanvas) = 0;
-  virtual FX_BOOL FilterObjects(FX_DWORD dwObjects = 0xFFFFFFFF) = 0;
+  virtual FX_BOOL FilterObjects(uint32_t dwObjects = 0xFFFFFFFF) = 0;
   virtual void Reset() = 0;
   virtual FDE_HVISUALOBJ GetNext(IFDE_VisualSet*& pVisualSet,
                                  FDE_HVISUALOBJ* phCanvasObj = NULL,
diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h
index c94571b5f8..159850e0f2 100644
--- a/xfa/fde/tto/fde_textout.h
+++ b/xfa/fde/tto/fde_textout.h
@@ -44,7 +44,7 @@ class IFDE_TextOut {
   virtual void SetFont(IFX_Font* pFont) = 0;
   virtual void SetFontSize(FX_FLOAT fFontSize) = 0;
   virtual void SetTextColor(FX_ARGB color) = 0;
-  virtual void SetStyles(FX_DWORD dwStyles) = 0;
+  virtual void SetStyles(uint32_t dwStyles) = 0;
   virtual void SetTabWidth(FX_FLOAT fTabWidth) = 0;
   virtual void SetEllipsisString(const CFX_WideString& wsEllipsis) = 0;
   virtual void SetParagraphBreakChar(FX_WCHAR wch) = 0;
diff --git a/xfa/fde/xml/fde_xml.h b/xfa/fde/xml/fde_xml.h
index 757ebf9be8..cb76ac3b8a 100644
--- a/xfa/fde/xml/fde_xml.h
+++ b/xfa/fde/xml/fde_xml.h
@@ -209,7 +209,7 @@ class IFDE_XMLSyntaxParser {
   virtual void Init(IFX_Stream* pStream,
                     int32_t iXMLPlaneSize,
                     int32_t iTextDataSize = 256) = 0;
-  virtual FX_DWORD DoSyntaxParse() = 0;
+  virtual uint32_t DoSyntaxParse() = 0;
   virtual int32_t GetStatus() const = 0;
   virtual int32_t GetCurrentPos() const = 0;
   virtual FX_FILESIZE GetCurrentBinaryPos() const = 0;
diff --git a/xfa/fde/xml/fde_xml_imp.h b/xfa/fde/xml/fde_xml_imp.h
index f30e12a7bb..7d74ff62bf 100644
--- a/xfa/fde/xml/fde_xml_imp.h
+++ b/xfa/fde/xml/fde_xml_imp.h
@@ -293,7 +293,7 @@ class CFDE_XMLSyntaxParser : public IFDE_XMLSyntaxParser, public CFX_Target {
   virtual void Init(IFX_Stream* pStream,
                     int32_t iXMLPlaneSize,
                     int32_t iTextDataSize = 256);
-  virtual FX_DWORD DoSyntaxParse();
+  virtual uint32_t DoSyntaxParse();
   virtual int32_t GetStatus() const;
   virtual int32_t GetCurrentPos() const {
     return m_iParsedChars + (m_pStart - m_pBuffer);
@@ -342,8 +342,8 @@ class CFDE_XMLSyntaxParser : public IFDE_XMLSyntaxParser, public CFX_Target {
   FX_WCHAR* m_pCurrentBlock;
   int32_t m_iIndexInBlock;
   int32_t m_iTextDataLength;
-  FX_DWORD m_dwStatus;
-  FX_DWORD m_dwMode;
+  uint32_t m_dwStatus;
+  uint32_t m_dwMode;
   FX_WCHAR m_wQuotationMark;
   int32_t m_iEntityStart;
   CFX_DWordStack m_SkipStack;