Remove FX_DWORD from XFA, part 2

xfa/fxfa/app/xfa_textlayout.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_FXFA_APP_XFA_TEXTLAYOUT_H_
 #define XFA_FXFA_APP_XFA_TEXTLAYOUT_H_
 
 #include "xfa/fde/css/fde_css.h"
@@ skipping 56 matching lines @@
     if (m_pParentStyle)
       m_pParentStyle->Release();
     FX_Free(m_ppMatchedDecls);
   }
   void SetDisplay(FDE_CSSDISPLAY eDisplay) { m_eDisplay = eDisplay; }
   FDE_CSSDISPLAY GetDisplay() const { return m_eDisplay; }
   void SetDecls(const IFDE_CSSDeclaration** ppDeclArray, int32_t iDeclCount);
   const IFDE_CSSDeclaration** GetDecls() {
     return (const IFDE_CSSDeclaration**)m_ppMatchedDecls;
   }
-  FX_DWORD CountDecls() const { return m_dwMatchedDecls; }
+  uint32_t CountDecls() const { return m_dwMatchedDecls; }
   IFDE_CSSComputedStyle* m_pParentStyle;
 
  protected:
   IFDE_CSSDeclaration** m_ppMatchedDecls;
-  FX_DWORD m_dwMatchedDecls;
+  uint32_t m_dwMatchedDecls;
   FDE_CSSDISPLAY m_eDisplay;
 };
 
 class CXFA_TextParser {
  public:
   CXFA_TextParser() : m_pAllocator(NULL), m_pSelector(NULL), m_pUASheet(NULL) {}
   virtual ~CXFA_TextParser();
   void Reset();
   void DoParse(IFDE_XMLNode* pXMLContainer, IXFA_TextProvider* pTextProvider);
   IFDE_CSSComputedStyle* CreateRootStyle(IXFA_TextProvider* pTextProvider);
@@ skipping 69 matching lines @@
   FX_FLOAT m_fHeight;
   FX_FLOAT m_fLastPos;
   FX_FLOAT m_fStartLineOffset;
   int32_t m_iChar;
   int32_t m_iLines;
   int32_t m_iTotalLines;
   IFDE_XMLNode* m_pXMLNode;
   CXFA_Node* m_pNode;
   IFDE_CSSComputedStyle* m_pParentStyle;
   CFX_ArrayTemplate<FX_FLOAT> m_lineHeights;
-  FX_DWORD m_dwFlags;
+  uint32_t m_dwFlags;
   CFX_FloatArray m_BlocksHeight;
 };
 
 class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target {
  public:
   CXFA_LinkUserData(IFX_MEMAllocator* pAllocator, FX_WCHAR* pszText)
       : m_pAllocator(pAllocator), m_dwRefCount(1) {
     m_pszURLContent = pszText;
   }
   ~CXFA_LinkUserData() {}
-  virtual FX_DWORD Release() {
-    FX_DWORD dwRefCount = --m_dwRefCount;
+  virtual uint32_t Release() {
+    uint32_t dwRefCount = --m_dwRefCount;
     if (dwRefCount <= 0) {
       FXTARGET_DeleteWith(CXFA_LinkUserData, m_pAllocator, this);
     }
     return dwRefCount;
   }
-  virtual FX_DWORD AddRef() { return ++m_dwRefCount; }
+  virtual uint32_t AddRef() { return ++m_dwRefCount; }
 
  public:
   const FX_WCHAR* GetLinkURL() { return m_pszURLContent; }
 
  protected:
   IFX_MEMAllocator* m_pAllocator;
-  FX_DWORD m_dwRefCount;
+  uint32_t m_dwRefCount;
   CFX_WideString m_pszURLContent;
 };
 
 class CXFA_TextUserData : public IFX_Unknown, public CFX_Target {
  public:
   CXFA_TextUserData(IFX_MEMAllocator* pAllocator, IFDE_CSSComputedStyle* pStyle)
       : m_pStyle(pStyle),
         m_pLinkData(nullptr),
         m_pAllocator(pAllocator),
         m_dwRefCount(0) {
@@ skipping 11 matching lines @@
     FXSYS_assert(m_pAllocator);
     if (m_pStyle)
       m_pStyle->AddRef();
   }
   ~CXFA_TextUserData() {
     if (m_pStyle)
       m_pStyle->Release();
     if (m_pLinkData)
       m_pLinkData->Release();
   }
-  virtual FX_DWORD Release() {
-    FX_DWORD dwRefCount = --m_dwRefCount;
+  virtual uint32_t Release() {
+    uint32_t dwRefCount = --m_dwRefCount;
     if (dwRefCount == 0) {
       FXTARGET_DeleteWith(CXFA_TextUserData, m_pAllocator, this);
     }
     return dwRefCount;
   }
-  virtual FX_DWORD AddRef() { return ++m_dwRefCount; }
+  virtual uint32_t AddRef() { return ++m_dwRefCount; }
 
   IFDE_CSSComputedStyle* m_pStyle;
   CXFA_LinkUserData* m_pLinkData;
 
  protected:
   IFX_MEMAllocator* m_pAllocator;
-  FX_DWORD m_dwRefCount;
+  uint32_t m_dwRefCount;
 };
 
 class XFA_TextPiece : public CFX_Target {
  public:
   XFA_TextPiece() : pszText(nullptr), pFont(nullptr), pLinkData(nullptr) {}
   ~XFA_TextPiece() {
     if (pLinkData)
       pLinkData->Release();
   }
 
@@ skipping 16 matching lines @@
 
 class CXFA_PieceLine : public CFX_Target {
  public:
   CXFA_PieceLine() {}
   CXFA_PieceArray m_textPieces;
   CFX_Int32Array m_charCounts;
 };
 typedef CFX_ArrayTemplate<CXFA_PieceLine*> CXFA_PieceLineArray;
 
 struct XFA_TABSTOPS {
-  FX_DWORD dwAlign;
+  uint32_t dwAlign;
   FX_FLOAT fTabstops;
 };
 
 class CXFA_TextTabstopsContext {
  public:
   CXFA_TextTabstopsContext()
       : m_iTabCount(0),
         m_iTabIndex(-1),
         m_bTabstops(FALSE),
         m_fTabWidth(0),
         m_fLeft(0) {}
-  void Append(FX_DWORD dwAlign, FX_FLOAT fTabstops) {
+  void Append(uint32_t dwAlign, FX_FLOAT fTabstops) {
     int32_t i = 0;
     for (i = 0; i < m_iTabCount; i++) {
       XFA_TABSTOPS* pTabstop = m_tabstops.GetDataPtr(i);
       if (fTabstops < pTabstop->fTabstops) {
         break;
       }
     }
     m_tabstops.InsertSpaceAt(i, 1);
     XFA_TABSTOPS tabstop;
     tabstop.dwAlign = dwAlign;
@@ skipping 70 matching lines @@
                        IFDE_CSSComputedStyle* pParentStyle,
                        FX_BOOL bSavePieces,
                        CXFA_LinkUserData* pLinkData = NULL,
                        FX_BOOL bEndBreak = TRUE,
                        FX_BOOL bIsOl = FALSE,
                        int32_t iLiCount = 0);
   FX_BOOL AppendChar(const CFX_WideString& wsText,
                      FX_FLOAT& fLinePos,
                      FX_FLOAT fSpaceAbove,
                      FX_BOOL bSavePieces);
-  void AppendTextLine(FX_DWORD dwStatus,
+  void AppendTextLine(uint32_t dwStatus,
                       FX_FLOAT& fLinePos,
                       FX_BOOL bSavePieces,
                       FX_BOOL bEndBreak = FALSE);
-  void EndBreak(FX_DWORD dwStatus, FX_FLOAT& fLinePos, FX_BOOL bDefault);
+  void EndBreak(uint32_t dwStatus, FX_FLOAT& fLinePos, FX_BOOL bDefault);
   FX_BOOL IsEnd(FX_BOOL bSavePieces);
   void ProcessText(CFX_WideString& wsText);
   void UpdateAlign(FX_FLOAT fHeight, FX_FLOAT fBottom);
   void RenderString(IFDE_RenderDevice* pDevice,
                     IFDE_SolidBrush* pBrush,
                     CXFA_PieceLine* pPieceLine,
                     int32_t iPiece,
                     FXTEXT_CHARPOS* pCharPos,
                     const CFX_Matrix& tmDoc2Device);
   void RenderPath(IFDE_RenderDevice* pDevice,
@@ skipping 18 matching lines @@
   CXFA_LoaderContext* m_pLoader;
   int32_t m_iLines;
   FX_FLOAT m_fMaxWidth;
   CXFA_TextParser m_textParser;
   CXFA_PieceLineArray m_pieceLines;
   CXFA_TextTabstopsContext* m_pTabstopContext;
   FX_BOOL m_bBlockContinue;
 };
 
 #endif  // XFA_FXFA_APP_XFA_TEXTLAYOUT_H_