Remove FX_DWORD from XFA, part 2

xfa/fde/css/fde_cssstyleselector.h

 // 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
 
 #ifndef XFA_FDE_CSS_FDE_CSSSTYLESELECTOR_H_
 #define XFA_FDE_CSS_FDE_CSSSTYLESELECTOR_H_
 
 #include <vector>
 
 #include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fde/css/fde_css.h"
 #include "xfa/fde/css/fde_csscache.h"
 #include "xfa/fde/css/fde_cssdeclaration.h"
 #include "xfa/fgas/crt/fgas_memory.h"
 #include "xfa/fgas/crt/fgas_system.h"
 
 #define FDE_CSSUNIVERSALHASH ('*')
 
 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;
 };
 
 class CFDE_CSSRuleCollection : public CFX_Target {
  public:
   CFDE_CSSRuleCollection()
       : m_pStaticStore(nullptr),
         m_pUniversalRules(nullptr),
         m_pPersudoRules(nullptr),
         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
                : NULL;
   }
   FDE_CSSRuleData* GetUniversalRuleData() { return m_pUniversalRules; }
   FDE_CSSRuleData* GetPersudoRuleData() { return m_pPersudoRules; }
   IFX_MEMAllocator* m_pStaticStore;
 
  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);
   FDE_CSSRuleData* NewRuleData(IFDE_CSSSelector* pSel,
                                IFDE_CSSDeclaration* pDecl);
   CFX_MapPtrToPtr m_IDRules;
   CFX_MapPtrToPtr m_TagRules;
   CFX_MapPtrToPtr m_ClassRules;
   FDE_CSSRuleData* m_pUniversalRules;
   FDE_CSSRuleData* m_pPersudoRules;
   int32_t m_iSelectors;
 };
 class CFDE_CSSAccelerator;
 class CFDE_CSSComputedStyle;
 class CFDE_CSSStyleSelector : public IFDE_CSSStyleSelector, public CFX_Target {
  public:
   CFDE_CSSStyleSelector();
   ~CFDE_CSSStyleSelector();
   virtual void Release() { delete this; }
 
   virtual void SetFontMgr(IFX_FontMgr* pFontMgr);
   virtual void SetDefFontSize(FX_FLOAT fFontSize);
 
   virtual FX_BOOL SetStyleSheet(FDE_CSSSTYLESHEETGROUP eType,
                                 IFDE_CSSStyleSheet* pSheet);
   virtual FX_BOOL SetStyleSheets(FDE_CSSSTYLESHEETGROUP eType,
                                  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);
   virtual int32_t MatchDeclarations(
       IFDE_CSSTagProvider* pTag,
       CFDE_CSSDeclarationArray& matchedDecls,
       FDE_CSSPERSUDO ePersudoType = FDE_CSSPERSUDO_NONE);
   virtual void ComputeStyle(IFDE_CSSTagProvider* pTag,
                             const IFDE_CSSDeclaration** ppDeclArray,
                             int32_t iDeclCount,
@@ skipping 29 matching lines @@
   FDE_CSSDISPLAY ToDisplay(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSTEXTALIGN ToTextAlign(FDE_CSSPROPERTYVALUE eValue);
   uint16_t ToFontWeight(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSFONTSTYLE ToFontStyle(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSBORDERSTYLE ToBorderStyle(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSVERTICALALIGN ToVerticalAlign(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSLISTSTYLETYPE ToListStyleType(FDE_CSSPROPERTYVALUE eValue);
   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);
   FDE_CSSCLEAR ToClear(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSWRITINGMODE ToWritingMode(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSWORDBREAK ToWordBreak(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSPAGEBREAK ToPageBreak(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSOVERFLOW ToOverflow(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSLINEBREAK ToLineBreak(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSTEXTCOMBINE ToTextCombine(FDE_CSSPROPERTYVALUE eValue);
@@ skipping 165 matching lines @@
   FDE_CSSLENGTH m_ColumnRuleWidth;
   FDE_CSSLENGTH m_ColumnWidth;
   FX_ARGB m_dwColumnRuleColor;
   FDE_CSSLENGTH m_Top;
   FDE_CSSLENGTH m_Bottom;
   FDE_CSSLENGTH m_Left;
   FDE_CSSLENGTH m_Right;
 
   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,
                               public IFDE_CSSBoundaryStyle,
                               public IFDE_CSSPositionStyle,
                               public IFDE_CSSParagraphStyle,
                               public IFDE_CSSBackgroundStyle,
                               public IFDE_CSSVisualStyle,
                               public IFDE_CSSListStyle,
                               public IFDE_CSSMultiColumnStyle,
                               public IFDE_CSSGeneratedContentStyle,
                               public IFDE_CSSTableStyle,
                               public IFDE_CSSRubyStyle,
                               public CFX_Target {
  public:
   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;
       }
       FXTARGET_DeleteWith(CFDE_CSSComputedStyle, m_pAllocator, this);
     }
     return dwRefCount;
   }
 
   virtual void Reset() {
@@ skipping 304 matching lines @@
   }
   virtual FDE_CSSVERTICALALIGN GetVerticalAlign() const {
     return (FDE_CSSVERTICALALIGN)m_NonInheritedData.m_eVerticalAlign;
   }
   virtual FX_FLOAT GetNumberVerticalAlign() const {
     return m_NonInheritedData.m_fVerticalAlign;
   }
   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 {
     return m_InheritedData.m_LetterSpacing;
   }
   virtual const FDE_CSSLENGTH& GetWordSpacing() const {
     return m_InheritedData.m_WordSpacing;
   }
   virtual FDE_CSSWRITINGMODE GetWritingMode() const {
     return (FDE_CSSWRITINGMODE)m_InheritedData.m_eWritingMode;
@@ skipping 55 matching lines @@
   virtual void SetVerticalAlign(FDE_CSSVERTICALALIGN eVerticalAlign) {
     m_NonInheritedData.m_eVerticalAlign = eVerticalAlign;
   }
   virtual void SetNumberVerticalAlign(FX_FLOAT fAlign) {
     m_NonInheritedData.m_eVerticalAlign = FDE_CSSVERTICALALIGN_Number,
     m_NonInheritedData.m_fVerticalAlign = fAlign;
   }
   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) {
     m_InheritedData.m_LetterSpacing = letterSpacing;
   }
   virtual void SetWordSpacing(const FDE_CSSLENGTH& wordSpacing) {
     m_InheritedData.m_WordSpacing = wordSpacing;
   }
   virtual void SetWritingMode(FDE_CSSWRITINGMODE eWritingMode) {
     m_InheritedData.m_eWritingMode = eWritingMode;
@@ skipping 84 matching lines @@
   }
   virtual void SetListStylePosition(
       FDE_CSSLISTSTYLEPOSITION eListStylePosition) {
     m_NonInheritedData.m_eListStylePosition = eListStylePosition;
   }
   void AddCustomStyle(const CFX_WideString& wsName,
                       const CFX_WideString& wsValue) {
     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;
   CFX_WideStringArray m_CustomProperties;
 };
 
 #endif  // XFA_FDE_CSS_FDE_CSSSTYLESELECTOR_H_