Remove FX_DWORD from XFA.

xfa/fgas/font/fgas_gefont.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/fgas/font/fgas_gefont.h"
 
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fgas/font/fgas_fontutils.h"
 
 IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFontFamily,
-                             FX_DWORD dwFontStyles,
+                             uint32_t dwFontStyles,
                              uint16_t wCodePage,
                              IFX_FontMgr* pFontMgr) {
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
   if (NULL != pFontMgr) {
     return pFontMgr->GetFontByCodePage(wCodePage, dwFontStyles, pszFontFamily);
   }
   return NULL;
 #else
   CFX_GEFont* pFont = new CFX_GEFont(pFontMgr);
   if (!pFont->LoadFont(pszFontFamily, dwFontStyles, wCodePage)) {
@@ skipping 78 matching lines @@
       m_pFontEncoding(NULL),
       m_pCharWidthMap(NULL),
       m_pRectArray(NULL),
       m_pBBoxMap(NULL),
       m_pProvider(NULL),
       m_wCharSet(0xFFFF),
       m_SubstFonts(),
       m_FontMapper(16) {
 }
 
-CFX_GEFont::CFX_GEFont(const CFX_GEFont& src, FX_DWORD dwFontStyles)
+CFX_GEFont::CFX_GEFont(const CFX_GEFont& src, uint32_t dwFontStyles)
     :
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
       m_bUseLogFontStyle(FALSE),
       m_dwLogFontStyle(0),
 #endif
       m_pFont(NULL),
       m_pFontMgr(src.m_pFontMgr),
       m_iRefCount(1),
       m_bExtFont(FALSE),
       m_pStream(NULL),
@@ skipping 58 matching lines @@
       m_pFontMgr->RemoveFont(this);
     }
     delete this;
   }
 }
 IFX_Font* CFX_GEFont::Retain() {
   ++m_iRefCount;
   return this;
 }
 FX_BOOL CFX_GEFont::LoadFont(const FX_WCHAR* pszFontFamily,
-                             FX_DWORD dwFontStyles,
+                             uint32_t dwFontStyles,
                              uint16_t wCodePage) {
   if (m_pFont) {
     return FALSE;
   }
   CFX_ByteString csFontFamily;
   if (pszFontFamily != NULL) {
     csFontFamily = CFX_ByteString::FromUnicode(pszFontFamily);
   }
-  FX_DWORD dwFlags = 0;
+  uint32_t dwFlags = 0;
   if (dwFontStyles & FX_FONTSTYLE_FixedPitch) {
     dwFlags |= FXFONT_FIXED_PITCH;
   }
   if (dwFontStyles & FX_FONTSTYLE_Serif) {
     dwFlags |= FXFONT_SERIF;
   }
   if (dwFontStyles & FX_FONTSTYLE_Symbolic) {
     dwFlags |= FXFONT_SYMBOLIC;
   }
   if (dwFontStyles & FX_FONTSTYLE_Script) {
@@ skipping 111 matching lines @@
     m_pCharWidthMap = new CFX_WordDiscreteArray(1024);
   }
   if (!m_pRectArray) {
     m_pRectArray = new CFX_RectMassArray(16);
   }
   if (!m_pBBoxMap) {
     m_pBBoxMap = new CFX_MapPtrToPtr(16);
   }
   return TRUE;
 }
-IFX_Font* CFX_GEFont::Derive(FX_DWORD dwFontStyles, uint16_t wCodePage) {
+IFX_Font* CFX_GEFont::Derive(uint32_t dwFontStyles, uint16_t wCodePage) {
   if (GetFontStyles() == dwFontStyles) {
     return Retain();
   }
   return new CFX_GEFont(*this, dwFontStyles);
 }
 uint8_t CFX_GEFont::GetCharSet() const {
   if (m_wCharSet != 0xFFFF) {
     return (uint8_t)m_wCharSet;
   }
   if (!m_pFont->GetSubstFont()) {
     return FX_CHARSET_Default;
   }
   return m_pFont->GetSubstFont()->m_Charset;
 }
 void CFX_GEFont::GetFamilyName(CFX_WideString& wsFamily) const {
   if (!m_pFont->GetSubstFont() ||
       m_pFont->GetSubstFont()->m_Family.GetLength() == 0) {
     wsFamily = CFX_WideString::FromLocal(m_pFont->GetFamilyName());
   } else {
     wsFamily = CFX_WideString::FromLocal(m_pFont->GetSubstFont()->m_Family);
   }
 }
 void CFX_GEFont::GetPsName(CFX_WideString& wsName) const {
   wsName = m_pFont->GetPsName();
 }
-FX_DWORD CFX_GEFont::GetFontStyles() const {
+uint32_t CFX_GEFont::GetFontStyles() const {
   FXSYS_assert(m_pFont != NULL);
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
   if (m_bUseLogFontStyle) {
     return m_dwLogFontStyle;
   }
 #endif
-  FX_DWORD dwStyles = 0;
+  uint32_t dwStyles = 0;
   if (!m_pFont->GetSubstFont()) {
     if (m_pFont->IsBold()) {
       dwStyles |= FX_FONTSTYLE_Bold;
     }
     if (m_pFont->IsItalic()) {
       dwStyles |= FX_FONTSTYLE_Italic;
     }
   } else {
     if (m_pFont->GetSubstFont()->m_Weight == FXFONT_FW_BOLD) {
       dwStyles |= FX_FONTSTYLE_Bold;
@@ skipping 183 matching lines @@
     m_pCharWidthMap->RemoveAll();
   }
   if (m_pBBoxMap != NULL) {
     m_pBBoxMap->RemoveAll();
   }
   if (m_pRectArray != NULL) {
     m_pRectArray->RemoveAll();
   }
 }
 IFX_Font* CFX_GEFont::GetSubstFont(int32_t iGlyphIndex) const {
-  iGlyphIndex = ((FX_DWORD)iGlyphIndex) >> 24;
+  iGlyphIndex = ((uint32_t)iGlyphIndex) >> 24;
   return iGlyphIndex == 0 ? (IFX_Font*)this
                           : (IFX_Font*)m_SubstFonts[iGlyphIndex - 1];
 }