Remove FX_WORD in favor of uint16_t.

core/fxge/ge/fx_ge_fontmap.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 <algorithm>
 #include <limits>
 #include <vector>
 
 #include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
 #include "core/fxge/ge/fx_text_int.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
 #include "third_party/base/stl_util.h"
 
-#define GET_TT_SHORT(w) (FX_WORD)(((w)[0] << 8) | (w)[1])
+#define GET_TT_SHORT(w) (uint16_t)(((w)[0] << 8) | (w)[1])
 #define GET_TT_LONG(w) \
   (FX_DWORD)(((w)[0] << 24) | ((w)[1] << 16) | ((w)[2] << 8) | (w)[3])
 
 #define FX_FONT_STYLE_None 0x00
 #define FX_FONT_STYLE_Bold 0x01
 #define FX_FONT_STYLE_Italic 0x02
 #define FX_FONT_STYLE_BoldBold 0x04
 
 namespace {
 
@@ skipping 164 matching lines @@
 };
 
 const struct FX_FontStyle {
   const FX_CHAR* style;
   int32_t len;
 } g_FontStyles[] = {
     {"Bold", 4}, {"Italic", 6}, {"BoldItalic", 10}, {"Reg", 3}, {"Regular", 7},
 };
 
 const struct CODEPAGE_MAP {
-  FX_WORD codepage;
+  uint16_t codepage;
   uint8_t charset;
 } g_Codepage2CharsetTable[] = {
     {0, 1},      {42, 2},     {437, 254},  {850, 255},  {874, 222},
     {932, 128},  {936, 134},  {949, 129},  {950, 136},  {1250, 238},
     {1251, 204}, {1252, 0},   {1253, 161}, {1254, 162}, {1255, 177},
     {1256, 178}, {1257, 186}, {1258, 163}, {1361, 130}, {10000, 77},
     {10001, 78}, {10002, 81}, {10003, 79}, {10004, 84}, {10005, 83},
     {10006, 85}, {10007, 89}, {10008, 80}, {10021, 87}, {10029, 88},
     {10081, 86},
 };
@@ skipping 61 matching lines @@
     if (GET_TT_LONG(p) == tag) {
       FX_DWORD offset = GET_TT_LONG(p + 8);
       FX_DWORD size = GET_TT_LONG(p + 12);
       FXSYS_fseek(pFile, offset, FXSYS_SEEK_SET);
       return FPDF_ReadStringFromFile(pFile, size);
     }
   }
   return CFX_ByteString();
 }
 
-uint8_t GetCharsetFromCodePage(FX_WORD codepage) {
+uint8_t GetCharsetFromCodePage(uint16_t codepage) {
   const CODEPAGE_MAP* pEnd =
       g_Codepage2CharsetTable + FX_ArraySize(g_Codepage2CharsetTable);
   const CODEPAGE_MAP* pCharmap =
       std::lower_bound(g_Codepage2CharsetTable, pEnd, codepage,
-                       [](const CODEPAGE_MAP& charset, FX_WORD page) {
+                       [](const CODEPAGE_MAP& charset, uint16_t page) {
                          return charset.codepage < page;
                        });
   if (pCharmap < pEnd && codepage == pCharmap->codepage)
     return pCharmap->charset;
   return 1;
 }
 
 CFX_ByteString GetFontFamily(CFX_ByteString fontName, int nStyle) {
   if (fontName.Find("Script") >= 0) {
     if ((nStyle & FX_FONT_STYLE_Bold) == FX_FONT_STYLE_Bold) {
@@ skipping 1314 matching lines @@
 int PDF_GetStandardFontName(CFX_ByteString* name) {
   AltFontName* found = static_cast<AltFontName*>(
       FXSYS_bsearch(name->c_str(), g_AltFontNames, FX_ArraySize(g_AltFontNames),
                     sizeof(AltFontName), CompareString));
   if (!found)
     return -1;
 
   *name = g_Base14FontNames[found->m_Index];
   return found->m_Index;
 }