Remove FX_DWORD from XFA.

xfa/fxfa/app/xfa_textlayout.cpp

 // 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
 
 #include "xfa/fxfa/app/xfa_textlayout.h"
 
 #include <algorithm>
 
@@ skipping 152 matching lines @@
     pFontStyle->SetColor(font.GetColor());
     pFontStyle->SetFontStyle(font.IsItalic() ? FDE_CSSFONTSTYLE_Italic
                                              : FDE_CSSFONTSTYLE_Normal);
     pFontStyle->SetFontWeight(font.IsBold() ? FXFONT_FW_BOLD
                                             : FXFONT_FW_NORMAL);
     pParaStyle->SetNumberVerticalAlign(-font.GetBaselineShift());
     fFontSize = font.GetFontSize();
     FDE_CSSLENGTH letterSpacing;
     letterSpacing.Set(FDE_CSSLENGTHUNIT_Point, font.GetLetterSpacing());
     pParaStyle->SetLetterSpacing(letterSpacing);
-    FX_DWORD dwDecoration = 0;
+    uint32_t dwDecoration = 0;
     if (font.GetLineThrough() > 0) {
       dwDecoration |= FDE_CSSTEXTDECORATION_LineThrough;
     }
     if (font.GetUnderline() > 1) {
       dwDecoration |= FDE_CSSTEXTDECORATION_Double;
     } else if (font.GetUnderline() > 0) {
       dwDecoration |= FDE_CSSTEXTDECORATION_Underline;
     }
     pParaStyle->SetTextDecoration(dwDecoration);
   }
   pParaStyle->SetLineHeight(fLineHeight);
   pFontStyle->SetFontSize(fFontSize);
   return pStyle;
 }
 IFDE_CSSComputedStyle* CXFA_TextParser::CreateStyle(
     IFDE_CSSComputedStyle* pParentStyle) {
   IFDE_CSSComputedStyle* pNewStyle =
       m_pSelector->CreateComputedStyle(pParentStyle);
   FXSYS_assert(pNewStyle);
   if (pParentStyle) {
     IFDE_CSSParagraphStyle* pParaStyle = pParentStyle->GetParagraphStyles();
-    FX_DWORD dwDecoration = pParaStyle->GetTextDecoration();
+    uint32_t dwDecoration = pParaStyle->GetTextDecoration();
     FX_FLOAT fBaseLine = 0;
     if (pParaStyle->GetVerticalAlign() == FDE_CSSVERTICALALIGN_Number) {
       fBaseLine = pParaStyle->GetNumberVerticalAlign();
     }
     pParaStyle = pNewStyle->GetParagraphStyles();
     pParaStyle->SetTextDecoration(dwDecoration);
     pParaStyle->SetNumberVerticalAlign(fBaseLine);
     IFDE_CSSBoundaryStyle* pBoundarytyle = pParentStyle->GetBoundaryStyles();
     const FDE_CSSRECT* pRect = pBoundarytyle->GetMarginWidth();
     if (pRect) {
@@ skipping 76 matching lines @@
            pXMLNode->GetNodeItem(IFDE_XMLNode::FirstChild);
        pXMLChild;
        pXMLChild = pXMLChild->GetNodeItem(IFDE_XMLNode::NextSibling)) {
     ParseRichText(pXMLChild, pNewStyle);
   }
   if (pNewStyle)
     pNewStyle->Release();
 }
 void CXFA_TextParser::ParseTagInfo(IFDE_XMLNode* pXMLNode,
                                    CXFA_CSSTagProvider& tagProvider) {
-  static const FX_DWORD s_XFATagName[] = {
+  static const uint32_t s_XFATagName[] = {
       0x61,       0x62,       0x69,       0x70,       0x0001f714,
       0x00022a55, 0x000239bb, 0x00025881, 0x0bd37faa, 0x0bd37fb8,
       0xa73e3af2, 0xb182eaae, 0xdb8ac455,
   };
   CFX_WideString wsName;
   if (pXMLNode->GetType() == FDE_XMLNODE_Element) {
     IFDE_XMLElement* pXMLElement = (IFDE_XMLElement*)pXMLNode;
     pXMLElement->GetLocalTagName(wsName);
     tagProvider.SetTagNameObj(wsName);
-    FX_DWORD dwHashCode =
+    uint32_t dwHashCode =
         FX_HashCode_String_GetW(wsName, wsName.GetLength(), TRUE);
-    static const int32_t s_iCount = sizeof(s_XFATagName) / sizeof(FX_DWORD);
-    CFX_DSPATemplate<FX_DWORD> lookup;
+    static const int32_t s_iCount = sizeof(s_XFATagName) / sizeof(uint32_t);
+    CFX_DSPATemplate<uint32_t> lookup;
     tagProvider.m_bTagAviliable =
         lookup.Lookup(dwHashCode, s_XFATagName, s_iCount) > -1;
     CFX_WideString wsValue;
     pXMLElement->GetString(FX_WSTRC(L"style").GetPtr(), wsValue);
     if (!wsValue.IsEmpty()) {
       tagProvider.SetAttribute(FX_WSTRC(L"style"), wsValue);
     }
   } else if (pXMLNode->GetType() == FDE_XMLNODE_Text) {
     tagProvider.m_bTagAviliable = TRUE;
     tagProvider.m_bContent = TRUE;
@@ skipping 26 matching lines @@
   CFX_WideString wsValue;
   if (pStyle && pStyle->GetCustomStyle(FX_WSTRC(L"xfa-spacerun"), wsValue)) {
     wsValue.MakeLower();
     return wsValue == FX_WSTRC(L"yes");
   }
   return FALSE;
 }
 IFX_Font* CXFA_TextParser::GetFont(IXFA_TextProvider* pTextProvider,
                                    IFDE_CSSComputedStyle* pStyle) const {
   CFX_WideStringC wsFamily = FX_WSTRC(L"Courier");
-  FX_DWORD dwStyle = 0;
+  uint32_t dwStyle = 0;
   CXFA_Font font = pTextProvider->GetFontNode();
   if (font) {
     font.GetTypeface(wsFamily);
     if (font.IsBold()) {
       dwStyle |= FX_FONTSTYLE_Bold;
     }
     if (font.IsItalic()) {
       dwStyle |= FX_FONTSTYLE_Italic;
     }
   }
@@ skipping 64 matching lines @@
   }
   return 100;
 }
 void CXFA_TextParser::GetUnderline(IXFA_TextProvider* pTextProvider,
                                    IFDE_CSSComputedStyle* pStyle,
                                    int32_t& iUnderline,
                                    int32_t& iPeriod) const {
   iUnderline = 0;
   iPeriod = XFA_ATTRIBUTEENUM_All;
   if (pStyle) {
-    FX_DWORD dwDecoration = pStyle->GetParagraphStyles()->GetTextDecoration();
+    uint32_t dwDecoration = pStyle->GetParagraphStyles()->GetTextDecoration();
     if (dwDecoration & FDE_CSSTEXTDECORATION_Double) {
       iUnderline = 2;
     } else if (dwDecoration & FDE_CSSTEXTDECORATION_Underline) {
       iUnderline = 1;
     }
     CFX_WideString wsValue;
     if (pStyle->GetCustomStyle(FX_WSTRC(L"underlinePeriod"), wsValue)) {
       if (wsValue == FX_WSTRC(L"word")) {
         iPeriod = XFA_ATTRIBUTEENUM_Word;
       }
     } else if (CXFA_Font font = pTextProvider->GetFontNode()) {
       iPeriod = font.GetUnderlinePeriod();
     }
   } else {
     CXFA_Font font = pTextProvider->GetFontNode();
     if (font) {
       iUnderline = font.GetUnderline();
       iPeriod = font.GetUnderlinePeriod();
     }
   }
 }
 void CXFA_TextParser::GetLinethrough(IXFA_TextProvider* pTextProvider,
                                      IFDE_CSSComputedStyle* pStyle,
                                      int32_t& iLinethrough) const {
   if (pStyle) {
-    FX_DWORD dwDecoration = pStyle->GetParagraphStyles()->GetTextDecoration();
+    uint32_t dwDecoration = pStyle->GetParagraphStyles()->GetTextDecoration();
     iLinethrough = (dwDecoration & FDE_CSSTEXTDECORATION_LineThrough) ? 1 : 0;
   } else {
     CXFA_Font font = pTextProvider->GetFontNode();
     if (font) {
       iLinethrough = font.GetLineThrough();
     }
   }
 }
 FX_ARGB CXFA_TextParser::GetColor(IXFA_TextProvider* pTextProvider,
                                   IFDE_CSSComputedStyle* pStyle) const {
@@ skipping 159 matching lines @@
           }
           while (iCur < iLength && pTabStops[iCur] <= ' ') {
             iCur++;
           }
           iLast = iCur;
           eStatus = XFA_TABSTOPSSTATUS_Location;
         }
         break;
       case XFA_TABSTOPSSTATUS_Location:
         if (ch == ' ') {
-          FX_DWORD dwHashCode =
+          uint32_t dwHashCode =
               FX_HashCode_String_GetW(wsAlign, wsAlign.GetLength(), TRUE);
           CXFA_Measurement ms(CFX_WideStringC(pTabStops + iLast, iCur - iLast));
           FX_FLOAT fPos = ms.ToUnit(XFA_UNIT_Pt);
           pTabstopContext->Append(dwHashCode, fPos);
           wsAlign.Empty();
           eStatus = XFA_TABSTOPSSTATUS_None;
         }
         iCur++;
         break;
       default:
         break;
     }
   }
   if (!wsAlign.IsEmpty()) {
-    FX_DWORD dwHashCode =
+    uint32_t dwHashCode =
         FX_HashCode_String_GetW(wsAlign, wsAlign.GetLength(), TRUE);
     CXFA_Measurement ms(CFX_WideStringC(pTabStops + iLast, iCur - iLast));
     FX_FLOAT fPos = ms.ToUnit(XFA_UNIT_Pt);
     pTabstopContext->Append(dwHashCode, fPos);
   }
   return TRUE;
 }
 CXFA_TextLayout::CXFA_TextLayout(IXFA_TextProvider* pTextProvider)
     : m_bHasBlock(FALSE),
       m_pTextProvider(pTextProvider),
@@ skipping 61 matching lines @@
         if (wsTag.Equal(FX_WSTRC(L"body")) || wsTag.Equal(FX_WSTRC(L"html"))) {
           pXMLContainer = pXMLChild;
           break;
         }
       }
     }
   }
   return pXMLContainer;
 }
 IFX_RTFBreak* CXFA_TextLayout::CreateBreak(FX_BOOL bDefault) {
-  FX_DWORD dwStyle = FX_RTFLAYOUTSTYLE_ExpandTab;
+  uint32_t dwStyle = FX_RTFLAYOUTSTYLE_ExpandTab;
   if (!bDefault) {
     dwStyle |= FX_RTFLAYOUTSTYLE_Pagination;
   }
   IFX_RTFBreak* pBreak = IFX_RTFBreak::Create(0);
   pBreak->SetLayoutStyles(dwStyle);
   pBreak->SetLineBreakChar(L'\n');
   pBreak->SetLineBreakTolerance(1);
   pBreak->SetFont(m_textParser.GetFont(m_pTextProvider, NULL));
   pBreak->SetFontSize(m_textParser.GetFontSize(m_pTextProvider, NULL));
   return pBreak;
@@ skipping 777 matching lines @@
     if (bCurLi) {
       EndBreak(FX_RTFBREAK_LineBreak, fLinePos, bSavePieces);
     }
   } else {
     if (pContext) {
       eDisplay = pContext->GetDisplay();
     }
   }
   if (m_bBlockContinue) {
     if (pContext && !bContentNode) {
-      FX_DWORD dwStatus = (eDisplay == FDE_CSSDISPLAY_Block)
+      uint32_t dwStatus = (eDisplay == FDE_CSSDISPLAY_Block)
                               ? FX_RTFBREAK_ParagraphBreak
                               : FX_RTFBREAK_PieceBreak;
       EndBreak(dwStatus, fLinePos, bSavePieces);
       if (eDisplay == FDE_CSSDISPLAY_Block) {
         fLinePos += fSpaceBelow;
         if (m_pTabstopContext) {
           m_pTabstopContext->RemoveAll();
         }
       }
       if (wsName == FX_WSTRC(L"a")) {
@@ skipping 16 matching lines @@
     }
   }
   if (pStyle)
     pStyle->Release();
   return TRUE;
 }
 FX_BOOL CXFA_TextLayout::AppendChar(const CFX_WideString& wsText,
                                     FX_FLOAT& fLinePos,
                                     FX_FLOAT fSpaceAbove,
                                     FX_BOOL bSavePieces) {
-  FX_DWORD dwStatus = 0;
+  uint32_t dwStatus = 0;
   int32_t iChar = 0;
   if (m_pLoader) {
     iChar = m_pLoader->m_iChar;
   }
   int32_t iLength = wsText.GetLength();
   for (int32_t i = iChar; i < iLength; i++) {
     FX_WCHAR wch = wsText.GetAt(i);
     if (wch == 0xA0) {
       wch = 0x20;
     }
@@ skipping 38 matching lines @@
     }
     if (wch == 0x20 && wPrev == 0x20) {
       continue;
     }
     wPrev = wch;
     psz[iTrimLeft++] = wch;
   }
   wsText.ReleaseBuffer(iLen);
   wsText = wsText.Left(iTrimLeft);
 }
-void CXFA_TextLayout::EndBreak(FX_DWORD dwStatus,
+void CXFA_TextLayout::EndBreak(uint32_t dwStatus,
                                FX_FLOAT& fLinePos,
                                FX_BOOL bSavePieces) {
   dwStatus = m_pBreak->EndBreak(dwStatus);
   if (dwStatus > FX_RTFBREAK_PieceBreak) {
     AppendTextLine(dwStatus, fLinePos, bSavePieces, TRUE);
   }
 }
 void CXFA_TextLayout::DoTabstops(IFDE_CSSComputedStyle* pStyle,
                                  CXFA_PieceLine* pPieceLine) {
   if (m_pTabstopContext == NULL || m_pTabstopContext->m_iTabCount == 0) {
@@ skipping 20 matching lines @@
       XFA_TextPiece* p = pPieceLine->m_textPieces.GetAt(iPieces - 2);
       fRight = p->rtPiece.right();
     }
     m_pTabstopContext->m_fTabWidth =
         pPiece->rtPiece.width + pPiece->rtPiece.left - fRight;
   } else if (iTabstopsIndex > -1) {
     FX_FLOAT fLeft = 0;
     if (m_pTabstopContext->m_bTabstops) {
       XFA_TABSTOPS* pTabstops =
           m_pTabstopContext->m_tabstops.GetDataPtr(iTabstopsIndex);
-      FX_DWORD dwAlgin = pTabstops->dwAlign;
+      uint32_t dwAlgin = pTabstops->dwAlign;
       if (dwAlgin == FX_HashCode_String_GetW(L"center", 6)) {
         fLeft = pPiece->rtPiece.width / 2.0f;
       } else if (dwAlgin == FX_HashCode_String_GetW(L"right", 5) ||
                  dwAlgin == FX_HashCode_String_GetW(L"before", 6)) {
         fLeft = pPiece->rtPiece.width;
       } else if (dwAlgin == FX_HashCode_String_GetW(L"decimal", 7)) {
         int32_t iChars = pPiece->iChars;
         for (int32_t i = 0; i < iChars; i++) {
           if (pPiece->pszText[i] == L'.') {
             break;
           }
           fLeft += pPiece->pWidths[i] / 20000.0f;
         }
       }
       m_pTabstopContext->m_fLeft =
           std::min(fLeft, m_pTabstopContext->m_fTabWidth);
       m_pTabstopContext->m_bTabstops = FALSE;
       m_pTabstopContext->m_fTabWidth = 0;
     }
     pPiece->rtPiece.left -= m_pTabstopContext->m_fLeft;
   }
 }
-void CXFA_TextLayout::AppendTextLine(FX_DWORD dwStatus,
+void CXFA_TextLayout::AppendTextLine(uint32_t dwStatus,
                                      FX_FLOAT& fLinePos,
                                      FX_BOOL bSavePieces,
                                      FX_BOOL bEndBreak) {
   int32_t iPieces = m_pBreak->CountBreakPieces();
   if (iPieces < 1) {
     return;
   }
   IFDE_CSSComputedStyle* pStyle = NULL;
   if (bSavePieces) {
     CXFA_PieceLine* pPieceLine = FXTARGET_NewWith(m_pAllocator) CXFA_PieceLine;
@@ skipping 283 matching lines @@
   tr.iLength = iLength;
   tr.fFontSize = pPiece->fFontSize;
   tr.iBidiLevel = pPiece->iBidiLevel;
   tr.iCharRotation = 0;
   tr.wLineBreakChar = L'\n';
   tr.iVerticalScale = pPiece->iVerScale;
   tr.dwLayoutStyles = FX_RTFLAYOUTSTYLE_ExpandTab;
   tr.iHorizontalScale = pPiece->iHorScale;
   return TRUE;
 }