Remove FX_WORD in favor of uint16_t.

It isn't buying us anthing, and it looks strange in
a struct when other uint types are already present.

R=dsinclair@chromium.org

Review URL: https://codereview.chromium.org/1821043003 .

3 files changed, 9 insertions, 9 deletions

diff --git a/xfa/fgas/layout/fgas_linebreak.cpp b/xfa/fgas/layout/fgas_linebreak.cpp
index 8155af870a..4e5b405f5a 100644
--- a/xfa/fgas/layout/fgas_linebreak.cpp
+++ b/xfa/fgas/layout/fgas_linebreak.cpp
@@ -276,11 +276,11 @@ void FX_GetLineBreakPositions(const FX_WCHAR* pwsText,
   FX_DWORD dwCur, dwNext;
   FX_WCHAR wch;
   wch = *pwsText++;
-  dwCur = kTextLayoutCodeProperties[(FX_WORD)wch] & 0x003F;
+  dwCur = kTextLayoutCodeProperties[(uint16_t)wch] & 0x003F;
   iLength--;
   for (int32_t i = 0; i < iLength; i++) {
     wch = *pwsText++;
-    dwNext = kTextLayoutCodeProperties[(FX_WORD)wch] & 0x003F;
+    dwNext = kTextLayoutCodeProperties[(uint16_t)wch] & 0x003F;
     if (dwNext == FX_CBP_SP) {
       pBrkType[i] = FX_LBT_PROHIBITED_BRK;
     } else {
@@ -301,11 +301,11 @@ void FX_GetLineBreakPositions(const FX_WCHAR* pwsText,
   FX_DWORD dwCur, dwNext;
   FX_WCHAR wch;
   wch = *pwsText++;
-  dwCur = kTextLayoutCodeProperties[(FX_WORD)wch] & 0x003F;
+  dwCur = kTextLayoutCodeProperties[(uint16_t)wch] & 0x003F;
   iLength--;
   for (int32_t i = 0; i < iLength; i++) {
     wch = *pwsText++;
-    dwNext = kTextLayoutCodeProperties[(FX_WORD)wch] & 0x003F;
+    dwNext = kTextLayoutCodeProperties[(uint16_t)wch] & 0x003F;
     if (dwNext == FX_CBP_SP) {
       eType = FX_LBT_PROHIBITED_BRK;
     } else {
diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp
index f57a1335fb..dd150a3002 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.cpp
+++ b/xfa/fgas/layout/fgas_rtfbreak.cpp
@@ -515,7 +515,7 @@ FX_DWORD CFX_RTFBreak::AppendChar(FX_WCHAR wch) {
   if (m_bCharCode) {
     return AppendChar_CharCode(wch);
   }
-  FX_DWORD dwProps = kTextLayoutCodeProperties[(FX_WORD)wch];
+  FX_DWORD dwProps = kTextLayoutCodeProperties[(uint16_t)wch];
   FX_DWORD dwType = (dwProps & FX_CHARTYPEBITSMASK);
   CFX_RTFCharArray& tca = m_pCurLine->m_LineChars;
   CFX_RTFChar* pCurChar = tca.AddSpace();
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp
index 0cc41980cb..f182a6d413 100644
--- a/xfa/fgas/layout/fgas_textbreak.cpp
+++ b/xfa/fgas/layout/fgas_textbreak.cpp
@@ -732,10 +732,10 @@ static const FX_TxtBreak_LPFAppendChar g_FX_TxtBreak_lpfAppendChar[16] = {
     &CFX_TxtBreak::AppendChar_Others,      &CFX_TxtBreak::AppendChar_Others,
 };
 FX_DWORD CFX_TxtBreak::AppendChar(FX_WCHAR wch) {
-  FX_DWORD dwProps = kTextLayoutCodeProperties[(FX_WORD)wch];
+  FX_DWORD dwProps = kTextLayoutCodeProperties[(uint16_t)wch];
   FX_DWORD dwType = (dwProps & FX_CHARTYPEBITSMASK);
   CFX_TxtChar* pCurChar = m_pCurLine->m_pLineChars->AddSpace();
-  pCurChar->m_wCharCode = (FX_WORD)wch;
+  pCurChar->m_wCharCode = (uint16_t)wch;
   pCurChar->m_nRotation = m_iCharRotation;
   pCurChar->m_dwCharProps = dwProps;
   pCurChar->m_dwCharStyles = 0;
@@ -1324,8 +1324,8 @@ void CFX_TxtBreak::Reset() {
 }
 
 struct FX_FORMCHAR {
-  FX_WORD wch;
-  FX_WORD wForm;
+  uint16_t wch;
+  uint16_t wForm;
   int32_t iWidth;
 };