Remove FX_WORD in favor of uint16_t.

core/fpdfapi/fpdf_font/font_int.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 CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
 #define CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
 
 #include <map>
@@ skipping 53 matching lines @@
 
   // Takes ownership of |pFont|.
   void Set(CPDF_Document* key, int index, CPDF_Font* pFont);
 
   CPDF_CMapManager m_CMapManager;
   struct {
     const struct FXCMAP_CMap* m_pMapList;
     int m_Count;
   } m_EmbeddedCharsets[CIDSET_NUM_SETS];
   struct {
-    const FX_WORD* m_pMap;
+    const uint16_t* m_pMap;
     int m_Count;
   } m_EmbeddedToUnicodes[CIDSET_NUM_SETS];
 
  private:
   std::map<CPDF_Document*, std::unique_ptr<CFX_StockFontArray>> m_StockMap;
 };
 
 struct CMap_CodeRange {
   int m_CharSize;
   uint8_t m_Lower[4];
@@ skipping 36 matching lines @@
 class CPDF_CMap {
  public:
   CPDF_CMap();
   FX_BOOL LoadPredefined(CPDF_CMapManager* pMgr,
                          const FX_CHAR* name,
                          FX_BOOL bPromptCJK);
   FX_BOOL LoadEmbedded(const uint8_t* pData, FX_DWORD dwSize);
   void Release();
   FX_BOOL IsLoaded() const { return m_bLoaded; }
   FX_BOOL IsVertWriting() const { return m_bVertical; }
-  FX_WORD CIDFromCharCode(FX_DWORD charcode) const;
-  FX_DWORD CharCodeFromCID(FX_WORD CID) const;
+  uint16_t CIDFromCharCode(FX_DWORD charcode) const;
+  FX_DWORD CharCodeFromCID(uint16_t CID) const;
   int GetCharSize(FX_DWORD charcode) const;
   FX_DWORD GetNextChar(const FX_CHAR* pString, int nStrLen, int& offset) const;
   int CountChar(const FX_CHAR* pString, int size) const;
   int AppendChar(FX_CHAR* str, FX_DWORD charcode) const;
   typedef enum {
     OneByte,
     TwoBytes,
     MixedTwoBytes,
     MixedFourBytes
   } CodingScheme;
 
  protected:
   ~CPDF_CMap();
   friend class CPDF_CMapParser;
   friend class CPDF_CMapManager;
   friend class CPDF_CIDFont;
 
  protected:
   CFX_ByteString m_PredefinedCMap;
   FX_BOOL m_bVertical;
   CIDSet m_Charset;
   int m_Coding;
   CodingScheme m_CodingScheme;
   int m_nCodeRanges;
   uint8_t* m_pLeadingBytes;
-  FX_WORD* m_pMapping;
+  uint16_t* m_pMapping;
   uint8_t* m_pAddMapping;
   FX_BOOL m_bLoaded;
   const FXCMAP_CMap* m_pEmbedMap;
   CPDF_CMap* m_pUseMap;
 };
 
 class CPDF_CID2UnicodeMap {
  public:
   CPDF_CID2UnicodeMap();
   ~CPDF_CID2UnicodeMap();
   FX_BOOL Initialize();
   FX_BOOL IsLoaded();
   void Load(CPDF_CMapManager* pMgr, CIDSet charset, FX_BOOL bPromptCJK);
-  FX_WCHAR UnicodeFromCID(FX_WORD CID);
+  FX_WCHAR UnicodeFromCID(uint16_t CID);
 
  protected:
   CIDSet m_Charset;
-  const FX_WORD* m_pEmbeddedMap;
+  const uint16_t* m_pEmbeddedMap;
   FX_DWORD m_EmbeddedCount;
 };
 
 class CPDF_ToUnicodeMap {
  public:
   void Load(CPDF_Stream* pStream);
   CFX_WideString Lookup(FX_DWORD charcode);
   FX_DWORD ReverseLookup(FX_WCHAR unicode);
 
  protected:
   std::map<FX_DWORD, FX_DWORD> m_Map;
   CPDF_CID2UnicodeMap* m_pBaseMap;
   CFX_WideTextBuf m_MultiCharBuf;
 
  private:
   friend class fpdf_font_StringToCode_Test;
   friend class fpdf_font_StringToWideString_Test;
 
   static FX_DWORD StringToCode(const CFX_ByteStringC& str);
   static CFX_WideString StringToWideString(const CFX_ByteStringC& str);
 };
 
 void FPDFAPI_LoadCID2UnicodeMap(CIDSet charset,
-                                const FX_WORD*& pMap,
+                                const uint16_t*& pMap,
                                 FX_DWORD& count);
 
 #endif  // CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_