Merge to XFA: Use stdint.h types throughout PDFium.

core/src/fxcrt/fx_basic_wstring.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 <stddef.h>  // For offsetof().
 
 #include "../../include/fxcrt/fx_basic.h"
 #include "../../../third_party/base/numerics/safe_math.h"
@@ skipping 15 matching lines @@
 
     // Now round to an 8-byte boundary. We'd expect that this is the minimum
     // granularity of any of the underlying allocators, so there may be cases
     // where we can save a re-alloc when adding a few characters to a string
     // by using this otherwise wasted space.
     iSize += 7;
     int totalSize = iSize.ValueOrDie() & ~7;
     int usableLen = (totalSize - overhead) / sizeof(FX_WCHAR);
     FXSYS_assert(usableLen >= nLen);
 
-    void* pData = FX_Alloc(FX_BYTE, iSize.ValueOrDie());
+    void* pData = FX_Alloc(uint8_t, iSize.ValueOrDie());
     return new (pData) StringData(nLen, usableLen);
 }
 CFX_WideString::~CFX_WideString()
 {
     if (m_pData) {
         m_pData->Release();
     }
 }
 CFX_WideString::CFX_WideString(const CFX_WideString& stringSrc)
 {
@@ skipping 857 matching lines @@
             }
         } else {
             switch (*lpsz) {
                 case 'd':
                 case 'i':
                 case 'u':
                 case 'x':
                 case 'X':
                 case 'o':
                     if (nModifier & FORCE_INT64) {
-                        va_arg(argList, FX_INT64);
+                        va_arg(argList, int64_t);
                     } else {
                         va_arg(argList, int);
                     }
                     nItemLen = 32;
                     if (nItemLen < nWidth + nPrecision) {
                         nItemLen = nWidth + nPrecision;
                     }
                     break;
                 case 'a':
                 case 'A':
@@ skipping 136 matching lines @@
 }
 static int _DefMap_GetBig5CodePage()
 {
     return 950;
 }
 static const CFX_CharMap g_DefaultMapper = {&_DefMap_GetWideString, &_DefMap_GetByteString, NULL};
 static const CFX_CharMap g_DefaultGBKMapper = {&_DefMap_GetWideString, &_DefMap_GetByteString, &_DefMap_GetGBKCodePage};
 static const CFX_CharMap g_DefaultJISMapper = {&_DefMap_GetWideString, &_DefMap_GetByteString, &_DefMap_GetJISCodePage};
 static const CFX_CharMap g_DefaultUHCMapper = {&_DefMap_GetWideString, &_DefMap_GetByteString, &_DefMap_GetUHCCodePage};
 static const CFX_CharMap g_DefaultBig5Mapper = {&_DefMap_GetWideString, &_DefMap_GetByteString, &_DefMap_GetBig5CodePage};
-CFX_CharMap* CFX_CharMap::GetDefaultMapper(FX_INT32 codepage)
+CFX_CharMap* CFX_CharMap::GetDefaultMapper(int32_t codepage)
 {
     switch (codepage) {
         case 0:
             return (CFX_CharMap*)&g_DefaultMapper;
         case 932:
             return (CFX_CharMap*)&g_DefaultJISMapper;
         case 936:
             return (CFX_CharMap*)&g_DefaultGBKMapper;
         case 949:
             return (CFX_CharMap*)&g_DefaultUHCMapper;
         case 950:
             return (CFX_CharMap*)&g_DefaultBig5Mapper;
     }
     return NULL;
 }