Remove FX_WORD in favor of uint16_t.

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,
-                             FX_WORD wCodePage,
+                             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)) {
     pFont->Release();
@@ skipping 157 matching lines @@
     }
     delete this;
   }
 }
 IFX_Font* CFX_GEFont::Retain() {
   ++m_iRefCount;
   return this;
 }
 FX_BOOL CFX_GEFont::LoadFont(const FX_WCHAR* pszFontFamily,
                              FX_DWORD dwFontStyles,
-                             FX_WORD wCodePage) {
+                             uint16_t wCodePage) {
   if (m_pFont) {
     return FALSE;
   }
   CFX_ByteString csFontFamily;
   if (pszFontFamily != NULL) {
     csFontFamily = CFX_ByteString::FromUnicode(pszFontFamily);
   }
   FX_DWORD dwFlags = 0;
   if (dwFontStyles & FX_FONTSTYLE_FixedPitch) {
     dwFlags |= FXFONT_FIXED_PITCH;
@@ skipping 11 matching lines @@
     dwFlags |= FXFONT_ITALIC;
   }
   if (dwFontStyles & FX_FONTSTYLE_Bold) {
     dwFlags |= FXFONT_BOLD;
   }
   if (dwFontStyles & FX_FONTSTYLE_ExactMatch) {
     dwFlags |= FXFONT_EXACTMATCH;
   }
   int32_t iWeight =
       (dwFontStyles & FX_FONTSTYLE_Bold) ? FXFONT_FW_BOLD : FXFONT_FW_NORMAL;
-  FX_WORD wCharSet = FX_GetCharsetFromCodePage(wCodePage);
+  uint16_t wCharSet = FX_GetCharsetFromCodePage(wCodePage);
   if (wCharSet == 0xFFFF) {
     wCharSet = FXSYS_GetACP();
   }
   m_wCharSet = wCharSet;
   m_pFont = new CFX_Font;
   if ((dwFlags & FXFONT_ITALIC) && (dwFlags & FXFONT_BOLD)) {
     csFontFamily += ",BoldItalic";
   } else if (dwFlags & FXFONT_BOLD) {
     csFontFamily += ",Bold";
   } else if (dwFlags & FXFONT_ITALIC) {
@@ skipping 87 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, FX_WORD wCodePage) {
+IFX_Font* CFX_GEFont::Derive(FX_DWORD 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()) {
@@ skipping 139 matching lines @@
   if (iGlyphIndex > 0) {
     if (ppFont != NULL) {
       *ppFont = (IFX_Font*)this;
     }
     return iGlyphIndex;
   }
   const FGAS_FONTUSB* pFontUSB = FGAS_GetUnicodeBitField(wUnicode);
   if (pFontUSB == NULL) {
     return 0xFFFF;
   }
-  FX_WORD wBitField = pFontUSB->wBitField;
+  uint16_t wBitField = pFontUSB->wBitField;
   if (wBitField >= 128) {
     return 0xFFFF;
   }
   IFX_Font* pFont = NULL;
   m_FontMapper.Lookup((void*)(uintptr_t)wUnicode, (void*&)pFont);
   if (pFont != NULL && pFont != (IFX_Font*)this) {
     iGlyphIndex =
         ((CFX_GEFont*)pFont)->GetGlyphIndex(wUnicode, FALSE, NULL, bCharCode);
     if (iGlyphIndex != 0xFFFF) {
       int32_t i = m_SubstFonts.Find(pFont);
@@ skipping 60 matching lines @@
   }
   if (m_pRectArray != NULL) {
     m_pRectArray->RemoveAll();
   }
 }
 IFX_Font* CFX_GEFont::GetSubstFont(int32_t iGlyphIndex) const {
   iGlyphIndex = ((FX_DWORD)iGlyphIndex) >> 24;
   return iGlyphIndex == 0 ? (IFX_Font*)this
                           : (IFX_Font*)m_SubstFonts[iGlyphIndex - 1];
 }