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

core/src/fxcrt/fx_basic_bstring.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 54 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.
     nSize += 7;
     int totalSize = nSize.ValueOrDie() & ~7;
     int usableSize = totalSize - overhead;
     FXSYS_assert(usableSize >= nLen);
 
-    void* pData = FX_Alloc(FX_BYTE, totalSize);
+    void* pData = FX_Alloc(uint8_t, totalSize);
     return new (pData) StringData(nLen, usableSize);
 }
 CFX_ByteString::~CFX_ByteString()
 {
     if (m_pData) {
         m_pData->Release();
     }
 }
 CFX_ByteString::CFX_ByteString(FX_LPCSTR lpsz, FX_STRSIZE nLen)
 {
@@ skipping 191 matching lines @@
         return str.IsEmpty();
     }
     FX_STRSIZE len = str.GetLength();
     if (m_pData->m_nDataLength != len) {
         return false;
     }
     FX_LPCBYTE pThis = (FX_LPCBYTE)m_pData->m_String;
     FX_LPCBYTE pThat = str.GetPtr();
     for (FX_STRSIZE i = 0; i < len; i ++) {
         if ((*pThis) != (*pThat)) {
-            FX_BYTE bThis = *pThis;
+            uint8_t bThis = *pThis;
             if (bThis >= 'A' && bThis <= 'Z') {
                 bThis += 'a' - 'A';
             }
-            FX_BYTE bThat = *pThat;
+            uint8_t bThat = *pThat;
             if (bThat >= 'A' && bThat <= 'Z') {
                 bThat += 'a' - 'A';
             }
             if (bThis != bThat) {
                 return false;
             }
         }
         pThis ++;
         pThat ++;
     }
@@ skipping 336 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 270 matching lines @@
     }
     FXSYS_assert(nIndex >= 0);
     FXSYS_assert(nIndex < m_pData->m_nDataLength);
     CopyBeforeWrite();
     m_pData->m_String[nIndex] = ch;
 }
 CFX_WideString CFX_ByteString::UTF8Decode() const
 {
     CFX_UTF8Decoder decoder;
     for (FX_STRSIZE i = 0; i < GetLength(); i ++) {
-        decoder.Input((FX_BYTE)m_pData->m_String[i]);
+        decoder.Input((uint8_t)m_pData->m_String[i]);
     }
     return decoder.GetResult();
 }
 CFX_ByteString CFX_ByteString::FromUnicode(FX_LPCWSTR str, FX_STRSIZE len)
 {
     if (len < 0) {
         len = FXSYS_wcslen(str);
     }
     CFX_ByteString bstr;
     bstr.ConvertFrom(CFX_WideString(str, len));
@@ skipping 12 matching lines @@
 }
 int CFX_ByteString::Compare(FX_BSTR str) const
 {
     if (m_pData == NULL) {
         return str.IsEmpty() ? 0 : -1;
     }
     int this_len = m_pData->m_nDataLength;
     int that_len = str.GetLength();
     int min_len = this_len < that_len ? this_len : that_len;
     for (int i = 0; i < min_len; i ++) {
-        if ((FX_BYTE)m_pData->m_String[i] < str.GetAt(i)) {
+        if ((uint8_t)m_pData->m_String[i] < str.GetAt(i)) {
             return -1;
-        } else if ((FX_BYTE)m_pData->m_String[i] > str.GetAt(i)) {
+        } else if ((uint8_t)m_pData->m_String[i] > str.GetAt(i)) {
             return 1;
         }
     }
     if (this_len < that_len) {
         return -1;
     } else if (this_len > that_len) {
         return 1;
     }
     return 0;
 }
@@ skipping 139 matching lines @@
         scale /= 10;
     }
     return buf_size;
 }
 CFX_ByteString CFX_ByteString::FormatFloat(FX_FLOAT d, int precision)
 {
     FX_CHAR buf[32];
     FX_STRSIZE len = FX_ftoa(d, buf);
     return CFX_ByteString(buf, len);
 }