Remove FX_WORD in favor of uint16_t.

core/fpdfdoc/doc_ap.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 "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
 #include "core/fpdfdoc/doc_utils.h"
@@ skipping 118 matching lines @@
       }
       return m_sSysFontAlias;
   }
   return "";
 }
 CPVT_Provider::CPVT_Provider(IPVT_FontMap* pFontMap) : m_pFontMap(pFontMap) {
   ASSERT(m_pFontMap);
 }
 CPVT_Provider::~CPVT_Provider() {}
 int32_t CPVT_Provider::GetCharWidth(int32_t nFontIndex,
-                                    FX_WORD word,
+                                    uint16_t word,
                                     int32_t nWordStyle) {
   if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
     FX_DWORD charcode = pPDFFont->CharCodeFromUnicode(word);
     if (charcode != CPDF_Font::kInvalidCharCode) {
       return pPDFFont->GetCharWidthF(charcode);
     }
   }
   return 0;
 }
 int32_t CPVT_Provider::GetTypeAscent(int32_t nFontIndex) {
   if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
     return pPDFFont->GetTypeAscent();
   }
   return 0;
 }
 int32_t CPVT_Provider::GetTypeDescent(int32_t nFontIndex) {
   if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
     return pPDFFont->GetTypeDescent();
   }
   return 0;
 }
-int32_t CPVT_Provider::GetWordFontIndex(FX_WORD word,
+int32_t CPVT_Provider::GetWordFontIndex(uint16_t word,
                                         int32_t charset,
                                         int32_t nFontIndex) {
   if (CPDF_Font* pDefFont = m_pFontMap->GetPDFFont(0)) {
     if (pDefFont->CharCodeFromUnicode(word) != CPDF_Font::kInvalidCharCode) {
       return 0;
     }
   }
   if (CPDF_Font* pSysFont = m_pFontMap->GetPDFFont(1)) {
     if (pSysFont->CharCodeFromUnicode(word) != CPDF_Font::kInvalidCharCode) {
       return 1;
     }
   }
   return -1;
 }
-FX_BOOL CPVT_Provider::IsLatinWord(FX_WORD word) {
+FX_BOOL CPVT_Provider::IsLatinWord(uint16_t word) {
   if ((word >= 0x61 && word <= 0x7A) || (word >= 0x41 && word <= 0x5A) ||
       word == 0x2D || word == 0x27) {
     return TRUE;
   }
   return FALSE;
 }
 int32_t CPVT_Provider::GetDefaultFontIndex() {
   return 0;
 }
 
 static CFX_ByteString GetPDFWordString(IPVT_FontMap* pFontMap,
                                        int32_t nFontIndex,
-                                       FX_WORD Word,
-                                       FX_WORD SubWord) {
+                                       uint16_t Word,
+                                       uint16_t SubWord) {
   CFX_ByteString sWord;
   if (SubWord > 0) {
     sWord.Format("%c", SubWord);
     return sWord;
   }
 
   if (!pFontMap)
     return sWord;
 
   if (CPDF_Font* pPDFFont = pFontMap->GetPDFFont(nFontIndex)) {
@@ skipping 277 matching lines @@
       if (IsFloatZero(fFontSize)) {
         vt.SetAutoFontSize(TRUE);
       } else {
         vt.SetFontSize(fFontSize);
       }
       FX_BOOL bMultiLine = (dwFlags >> 12) & 1;
       if (bMultiLine) {
         vt.SetMultiLine(TRUE);
         vt.SetAutoReturn(TRUE);
       }
-      FX_WORD subWord = 0;
+      uint16_t subWord = 0;
       if ((dwFlags >> 13) & 1) {
         subWord = '*';
         vt.SetPasswordChar(subWord);
       }
       FX_BOOL bCharArray = (dwFlags >> 24) & 1;
       if (bCharArray) {
         vt.SetCharArray(dwMaxLen);
       } else {
         vt.SetLimitChar(dwMaxLen);
       }
@@ skipping 215 matching lines @@
 }
 FX_BOOL CPVT_GenerateAP::GenerateListBoxAP(CPDF_Document* pDoc,
                                            CPDF_Dictionary* pAnnotDict) {
   return GenerateWidgetAP(pDoc, pAnnotDict, 2);
 }
 CFX_ByteString CPVT_GenerateAP::GenerateEditAP(
     IPVT_FontMap* pFontMap,
     IPDF_VariableText_Iterator* pIterator,
     const CFX_FloatPoint& ptOffset,
     FX_BOOL bContinuous,
-    FX_WORD SubWord,
+    uint16_t SubWord,
     const CPVT_WordRange* pVisible) {
   CFX_ByteTextBuf sEditStream, sLineStream, sWords;
   CFX_FloatPoint ptOld(0.0f, 0.0f), ptNew(0.0f, 0.0f);
   int32_t nCurFontIndex = -1;
   if (pIterator) {
     if (pVisible) {
       pIterator->SetAt(pVisible->BeginPos);
     } else {
       pIterator->SetAt(0);
     }
@@ skipping 192 matching lines @@
     case CPVT_Color::kCMYK:
       sColorStream << color.fColor1 << " " << color.fColor2 << " "
                    << color.fColor3 << " " << color.fColor4 << " "
                    << (bFillOrStroke ? "k" : "K") << "\n";
       break;
     case CPVT_Color::kTransparent:
       break;
   }
   return sColorStream.GetByteString();
 }