Remove FX_WORD in favor of uint16_t.

core/fxcodec/jbig2/JBig2_BitStream.cpp

 // Copyright 2015 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/fxcodec/jbig2/JBig2_BitStream.h"
 
 #include <algorithm>
 
@@ skipping 83 matching lines @@
 int32_t CJBig2_BitStream::readInteger(FX_DWORD* dwResult) {
   if (m_dwByteIdx + 3 >= m_dwLength)
     return -1;
 
   *dwResult = (m_pBuf[m_dwByteIdx] << 24) | (m_pBuf[m_dwByteIdx + 1] << 16) |
               (m_pBuf[m_dwByteIdx + 2] << 8) | m_pBuf[m_dwByteIdx + 3];
   m_dwByteIdx += 4;
   return 0;
 }
 
-int32_t CJBig2_BitStream::readShortInteger(FX_WORD* dwResult) {
+int32_t CJBig2_BitStream::readShortInteger(uint16_t* dwResult) {
   if (m_dwByteIdx + 1 >= m_dwLength)
     return -1;
 
   *dwResult = (m_pBuf[m_dwByteIdx] << 8) | m_pBuf[m_dwByteIdx + 1];
   m_dwByteIdx += 2;
   return 0;
 }
 
 void CJBig2_BitStream::alignByte() {
   if (m_dwBitIdx != 0) {
@@ skipping 65 matching lines @@
   return m_dwByteIdx < m_dwLength;
 }
 
 FX_DWORD CJBig2_BitStream::LengthInBits() const {
   return m_dwLength << 3;
 }
 
 FX_DWORD CJBig2_BitStream::getObjNum() const {
   return m_dwObjNum;
 }