diff --git a/include/base/cef_basictypes.h b/include/base/cef_basictypes.h index 4f39e83c6..ce4d6d8af 100644 --- a/include/base/cef_basictypes.h +++ b/include/base/cef_basictypes.h @@ -37,50 +37,4 @@ #include "include/base/cef_build.h" -// The NSPR system headers define 64-bit as |long| when possible, except on -// Mac OS X. In order to not have typedef mismatches, we do the same on LP64. -// -// On Mac OS X, |long long| is used for 64-bit types for compatibility with -// format macros even in the LP64 model. -#if defined(__LP64__) && !defined(OS_MAC) && !defined(OS_OPENBSD) -typedef long int64; -typedef unsigned long uint64; -#else -typedef long long int64; -typedef unsigned long long uint64; -#endif - -// TODO: Remove these type guards. These are to avoid conflicts with -// obsolete/protypes.h in the Gecko SDK. -#ifndef _INT32 -#define _INT32 -typedef int int32; -#endif - -// TODO: Remove these type guards. These are to avoid conflicts with -// obsolete/protypes.h in the Gecko SDK. -#ifndef _UINT32 -#define _UINT32 -typedef unsigned int uint32; -#endif - -#ifndef _INT16 -#define _INT16 -typedef short int16; -#endif - -#ifndef _UINT16 -#define _UINT16 -typedef unsigned short uint16; -#endif - -// UTF-16 character type. -#ifndef char16 -#if defined(WCHAR_T_IS_UTF16) -typedef wchar_t char16; -#elif defined(WCHAR_T_IS_UTF32) -typedef unsigned short char16; -#endif -#endif - #endif // CEF_INCLUDE_BASE_CEF_BASICTYPES_H_ diff --git a/include/base/cef_build.h b/include/base/cef_build.h index 48a088cb9..d32c6170f 100644 --- a/include/base/cef_build.h +++ b/include/base/cef_build.h @@ -253,7 +253,7 @@ // The compiler thinks std::string::const_iterator and "const char*" are // equivalent types. #define STD_STRING_ITERATOR_IS_CHAR_POINTER -// The compiler thinks std::u16string::const_iterator and "char16*" are +// The compiler thinks std::u16string::const_iterator and "char16_t*" are // equivalent types. #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER #endif diff --git a/include/base/cef_logging.h b/include/base/cef_logging.h index bae61c4fe..31adf2151 100644 --- a/include/base/cef_logging.h +++ b/include/base/cef_logging.h @@ -723,6 +723,13 @@ std::ostream& operator<<(std::ostream& out, const wchar_t* wstr); inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) { return out << wstr.c_str(); } +#if defined(WCHAR_T_IS_UTF32) +std::ostream& operator<<(std::ostream& out, const char16_t* wstr); +#elif defined(WCHAR_T_IS_UTF16) +inline std::ostream& operator<<(std::ostream& out, const char16_t* wstr) { + return operator<<(out, reinterpret_cast(wstr)); +} +#endif // The NOTIMPLEMENTED() macro annotates codepaths which have // not been implemented yet. diff --git a/include/cef_audio_handler.h b/include/cef_audio_handler.h index 680db3845..5211cba74 100644 --- a/include/cef_audio_handler.h +++ b/include/cef_audio_handler.h @@ -87,7 +87,7 @@ class CefAudioHandler : public virtual CefBaseRefCounted { virtual void OnAudioStreamPacket(CefRefPtr browser, const float** data, int frames, - int64 pts) = 0; + int64_t pts) = 0; /// /// Called on the UI thread when the stream has stopped. OnAudioSteamStopped diff --git a/include/cef_browser.h b/include/cef_browser.h index 826c99dca..3d8b809a3 100644 --- a/include/cef_browser.h +++ b/include/cef_browser.h @@ -170,7 +170,7 @@ class CefBrowser : public virtual CefBaseRefCounted { /// Returns the frame with the specified identifier, or NULL if not found. /// /*--cef(capi_name=get_frame_byident)--*/ - virtual CefRefPtr GetFrame(int64 identifier) = 0; + virtual CefRefPtr GetFrame(int64_t identifier) = 0; /// /// Returns the frame with the specified name, or NULL if not found. @@ -188,7 +188,7 @@ class CefBrowser : public virtual CefBaseRefCounted { /// Returns the identifiers of all existing frames. /// /*--cef(count_func=identifiers:GetFrameCount)--*/ - virtual void GetFrameIdentifiers(std::vector& identifiers) = 0; + virtual void GetFrameIdentifiers(std::vector& identifiers) = 0; /// /// Returns the names of all existing frames. @@ -456,7 +456,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void DownloadImage(const CefString& image_url, bool is_favicon, - uint32 max_image_size, + uint32_t max_image_size, bool bypass_cache, CefRefPtr callback) = 0; diff --git a/include/cef_browser_process_handler.h b/include/cef_browser_process_handler.h index 6579337a8..4ab8c9a09 100644 --- a/include/cef_browser_process_handler.h +++ b/include/cef_browser_process_handler.h @@ -111,7 +111,7 @@ class CefBrowserProcessHandler : public virtual CefBaseRefCounted { /// pending scheduled call should be cancelled. /// /*--cef()--*/ - virtual void OnScheduleMessagePumpWork(int64 delay_ms) {} + virtual void OnScheduleMessagePumpWork(int64_t delay_ms) {} /// /// Return the default client for use with a newly created browser window. If diff --git a/include/cef_download_item.h b/include/cef_download_item.h index 671f32f16..bb4be2b1f 100644 --- a/include/cef_download_item.h +++ b/include/cef_download_item.h @@ -87,7 +87,7 @@ class CefDownloadItem : public virtual CefBaseRefCounted { /// Returns a simple speed estimate in bytes/s. /// /*--cef()--*/ - virtual int64 GetCurrentSpeed() = 0; + virtual int64_t GetCurrentSpeed() = 0; /// /// Returns the rough percent complete or -1 if the receive total size is @@ -100,13 +100,13 @@ class CefDownloadItem : public virtual CefBaseRefCounted { /// Returns the total number of bytes. /// /*--cef()--*/ - virtual int64 GetTotalBytes() = 0; + virtual int64_t GetTotalBytes() = 0; /// /// Returns the number of received bytes. /// /*--cef()--*/ - virtual int64 GetReceivedBytes() = 0; + virtual int64_t GetReceivedBytes() = 0; /// /// Returns the time that the download started. @@ -130,7 +130,7 @@ class CefDownloadItem : public virtual CefBaseRefCounted { /// Returns the unique identifier for this download. /// /*--cef()--*/ - virtual uint32 GetId() = 0; + virtual uint32_t GetId() = 0; /// /// Returns the URL. diff --git a/include/cef_frame.h b/include/cef_frame.h index 9e9ce7f26..ab11dee68 100644 --- a/include/cef_frame.h +++ b/include/cef_frame.h @@ -184,7 +184,7 @@ class CefFrame : public virtual CefBaseRefCounted { /// underlying frame does not yet exist. /// /*--cef()--*/ - virtual int64 GetIdentifier() = 0; + virtual int64_t GetIdentifier() = 0; /// /// Returns the parent of this frame or NULL if this is the main (top-level) diff --git a/include/cef_permission_handler.h b/include/cef_permission_handler.h index 59f414734..e28c6a60a 100644 --- a/include/cef_permission_handler.h +++ b/include/cef_permission_handler.h @@ -57,7 +57,7 @@ class CefMediaAccessCallback : public virtual CefBaseRefCounted { /// OnRequestMediaAccessPermission. /// /*--cef(capi_name=cont)--*/ - virtual void Continue(uint32 allowed_permissions) = 0; + virtual void Continue(uint32_t allowed_permissions) = 0; /// /// Cancel the media access request. @@ -104,7 +104,7 @@ class CefPermissionHandler : public virtual CefBaseRefCounted { CefRefPtr browser, CefRefPtr frame, const CefString& requesting_origin, - uint32 requested_permissions, + uint32_t requested_permissions, CefRefPtr callback) { return false; } @@ -123,9 +123,9 @@ class CefPermissionHandler : public virtual CefBaseRefCounted { /*--cef()--*/ virtual bool OnShowPermissionPrompt( CefRefPtr browser, - uint64 prompt_id, + uint64_t prompt_id, const CefString& requesting_origin, - uint32 requested_permissions, + uint32_t requested_permissions, CefRefPtr callback) { return false; } @@ -142,7 +142,7 @@ class CefPermissionHandler : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void OnDismissPermissionPrompt( CefRefPtr browser, - uint64 prompt_id, + uint64_t prompt_id, cef_permission_request_result_t result) {} }; diff --git a/include/cef_request.h b/include/cef_request.h index 138b4f1e6..5f5a440ff 100644 --- a/include/cef_request.h +++ b/include/cef_request.h @@ -217,7 +217,7 @@ class CefRequest : public virtual CefBaseRefCounted { /// browser process to track a single request across multiple callbacks. /// /*--cef()--*/ - virtual uint64 GetIdentifier() = 0; + virtual uint64_t GetIdentifier() = 0; }; /// diff --git a/include/cef_resource_handler.h b/include/cef_resource_handler.h index 30dd76f78..9c43ee7c9 100644 --- a/include/cef_resource_handler.h +++ b/include/cef_resource_handler.h @@ -58,7 +58,7 @@ class CefResourceSkipCallback : public virtual CefBaseRefCounted { /// <= 0 the request will fail with ERR_REQUEST_RANGE_NOT_SATISFIABLE. /// /*--cef(capi_name=cont)--*/ - virtual void Continue(int64 bytes_skipped) = 0; + virtual void Continue(int64_t bytes_skipped) = 0; }; /// @@ -136,7 +136,7 @@ class CefResourceHandler : public virtual CefBaseRefCounted { /// /*--cef()--*/ virtual void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) = 0; /// @@ -149,8 +149,8 @@ class CefResourceHandler : public virtual CefBaseRefCounted { /// method will be called in sequence but not from a dedicated thread. /// /*--cef()--*/ - virtual bool Skip(int64 bytes_to_skip, - int64& bytes_skipped, + virtual bool Skip(int64_t bytes_to_skip, + int64_t& bytes_skipped, CefRefPtr callback) { bytes_skipped = -2; return false; diff --git a/include/cef_resource_request_handler.h b/include/cef_resource_request_handler.h index 01d667815..572065b77 100644 --- a/include/cef_resource_request_handler.h +++ b/include/cef_resource_request_handler.h @@ -187,7 +187,7 @@ class CefResourceRequestHandler : public virtual CefBaseRefCounted { CefRefPtr request, CefRefPtr response, URLRequestStatus status, - int64 received_content_length) {} + int64_t received_content_length) {} /// /// Called on the IO thread to handle requests for URLs with an unknown diff --git a/include/cef_server.h b/include/cef_server.h index 7a3b6e6da..b868581fa 100644 --- a/include/cef_server.h +++ b/include/cef_server.h @@ -74,7 +74,7 @@ class CefServer : public CefBaseRefCounted { /// /*--cef()--*/ static void CreateServer(const CefString& address, - uint16 port, + uint16_t port, int backlog, CefRefPtr handler); @@ -170,7 +170,7 @@ class CefServer : public CefBaseRefCounted { virtual void SendHttpResponse(int connection_id, int response_code, const CefString& content_type, - int64 content_length, + int64_t content_length, const HeaderMap& extra_headers) = 0; /// diff --git a/include/cef_stream.h b/include/cef_stream.h index a7279395d..22d4ef00e 100644 --- a/include/cef_stream.h +++ b/include/cef_stream.h @@ -58,13 +58,13 @@ class CefReadHandler : public virtual CefBaseRefCounted { /// failure. /// /*--cef()--*/ - virtual int Seek(int64 offset, int whence) = 0; + virtual int Seek(int64_t offset, int whence) = 0; /// /// Return the current offset position. /// /*--cef()--*/ - virtual int64 Tell() = 0; + virtual int64_t Tell() = 0; /// /// Return non-zero if at end of file. @@ -119,13 +119,13 @@ class CefStreamReader : public virtual CefBaseRefCounted { /// failure. /// /*--cef()--*/ - virtual int Seek(int64 offset, int whence) = 0; + virtual int Seek(int64_t offset, int whence) = 0; /// /// Return the current offset position. /// /*--cef()--*/ - virtual int64 Tell() = 0; + virtual int64_t Tell() = 0; /// /// Return non-zero if at end of file. @@ -161,13 +161,13 @@ class CefWriteHandler : public virtual CefBaseRefCounted { /// failure. /// /*--cef()--*/ - virtual int Seek(int64 offset, int whence) = 0; + virtual int Seek(int64_t offset, int whence) = 0; /// /// Return the current offset position. /// /*--cef()--*/ - virtual int64 Tell() = 0; + virtual int64_t Tell() = 0; /// /// Flush the stream. @@ -215,13 +215,13 @@ class CefStreamWriter : public virtual CefBaseRefCounted { /// failure. /// /*--cef()--*/ - virtual int Seek(int64 offset, int whence) = 0; + virtual int Seek(int64_t offset, int whence) = 0; /// /// Return the current offset position. /// /*--cef()--*/ - virtual int64 Tell() = 0; + virtual int64_t Tell() = 0; /// /// Flush the stream. diff --git a/include/cef_task.h b/include/cef_task.h index f7e414d84..2e5085ef1 100644 --- a/include/cef_task.h +++ b/include/cef_task.h @@ -118,7 +118,7 @@ class CefTaskRunner : public virtual CefBaseRefCounted { /// specified delay. /// /*--cef()--*/ - virtual bool PostDelayedTask(CefRefPtr task, int64 delay_ms) = 0; + virtual bool PostDelayedTask(CefRefPtr task, int64_t delay_ms) = 0; }; /// @@ -143,6 +143,6 @@ bool CefPostTask(CefThreadId threadId, CefRefPtr task); /*--cef()--*/ bool CefPostDelayedTask(CefThreadId threadId, CefRefPtr task, - int64 delay_ms); + int64_t delay_ms); #endif // CEF_INCLUDE_CEF_TASK_H_ diff --git a/include/cef_trace.h b/include/cef_trace.h index 20d1c2cf7..2fa71ee39 100644 --- a/include/cef_trace.h +++ b/include/cef_trace.h @@ -106,6 +106,6 @@ bool CefEndTracing(const CefString& tracing_file, /// information in trace events. /// /*--cef()--*/ -int64 CefNowFromSystemTraceTime(); +int64_t CefNowFromSystemTraceTime(); #endif // CEF_INCLUDE_CEF_TRACE_H_ diff --git a/include/cef_urlrequest.h b/include/cef_urlrequest.h index faebfe762..77a82a6f7 100644 --- a/include/cef_urlrequest.h +++ b/include/cef_urlrequest.h @@ -152,8 +152,8 @@ class CefURLRequestClient : public virtual CefBaseRefCounted { /// /*--cef()--*/ virtual void OnUploadProgress(CefRefPtr request, - int64 current, - int64 total) = 0; + int64_t current, + int64_t total) = 0; /// /// Notifies the client of download progress. |current| denotes the number of @@ -162,8 +162,8 @@ class CefURLRequestClient : public virtual CefBaseRefCounted { /// /*--cef()--*/ virtual void OnDownloadProgress(CefRefPtr request, - int64 current, - int64 total) = 0; + int64_t current, + int64_t total) = 0; /// /// Called when some part of the response is read. |data| contains the current diff --git a/include/cef_v8.h b/include/cef_v8.h index a8534da28..ab3861724 100644 --- a/include/cef_v8.h +++ b/include/cef_v8.h @@ -459,13 +459,13 @@ class CefV8Value : public virtual CefBaseRefCounted { /// Create a new CefV8Value object of type int. /// /*--cef()--*/ - static CefRefPtr CreateInt(int32 value); + static CefRefPtr CreateInt(int32_t value); /// /// Create a new CefV8Value object of type unsigned int. /// /*--cef()--*/ - static CefRefPtr CreateUInt(uint32 value); + static CefRefPtr CreateUInt(uint32_t value); /// /// Create a new CefV8Value object of type double. @@ -648,13 +648,13 @@ class CefV8Value : public virtual CefBaseRefCounted { /// Return an int value. /// /*--cef()--*/ - virtual int32 GetIntValue() = 0; + virtual int32_t GetIntValue() = 0; /// /// Return an unsigned int value. /// /*--cef()--*/ - virtual uint32 GetUIntValue() = 0; + virtual uint32_t GetUIntValue() = 0; /// /// Return a double value. diff --git a/include/cef_waitable_event.h b/include/cef_waitable_event.h index 96b469554..fa9a9385d 100644 --- a/include/cef_waitable_event.h +++ b/include/cef_waitable_event.h @@ -103,7 +103,7 @@ class CefWaitableEvent : public CefBaseRefCounted { /// called on the browser process UI or IO threads. /// /*--cef()--*/ - virtual bool TimedWait(int64 max_ms) = 0; + virtual bool TimedWait(int64_t max_ms) = 0; }; #endif // CEF_INCLUDE_CEF_WAITABLE_EVENT_H_ diff --git a/include/cef_zip_reader.h b/include/cef_zip_reader.h index 79bc82e9d..9aa5e9b0c 100644 --- a/include/cef_zip_reader.h +++ b/include/cef_zip_reader.h @@ -96,7 +96,7 @@ class CefZipReader : public virtual CefBaseRefCounted { /// Returns the uncompressed size of the file. /// /*--cef()--*/ - virtual int64 GetFileSize() = 0; + virtual int64_t GetFileSize() = 0; /// /// Returns the last modified timestamp for the file. @@ -128,7 +128,7 @@ class CefZipReader : public virtual CefBaseRefCounted { /// Returns the current offset in the uncompressed file contents. /// /*--cef()--*/ - virtual int64 Tell() = 0; + virtual int64_t Tell() = 0; /// /// Returns true if at end of the file contents. diff --git a/include/internal/cef_string.h b/include/internal/cef_string.h index 77c8ca3db..20df91a1f 100644 --- a/include/internal/cef_string.h +++ b/include/internal/cef_string.h @@ -74,7 +74,7 @@ typedef cef_string_userfree_utf8_t cef_string_userfree_t; #define cef_string_to_wide cef_string_utf8_to_wide #define cef_string_from_wide cef_string_wide_to_utf8 #elif defined(CEF_STRING_TYPE_UTF16) -typedef char16 cef_char_t; +typedef char16_t cef_char_t; typedef cef_string_userfree_utf16_t cef_string_userfree_t; typedef cef_string_utf16_t cef_string_t; #define cef_string_set cef_string_utf16_set diff --git a/include/internal/cef_string_types.h b/include/internal/cef_string_types.h index 00a16c708..5b65ecb2f 100644 --- a/include/internal/cef_string_types.h +++ b/include/internal/cef_string_types.h @@ -70,9 +70,9 @@ typedef struct _cef_string_utf8_t { } cef_string_utf8_t; typedef struct _cef_string_utf16_t { - char16* str; + char16_t* str; size_t length; - void (*dtor)(char16* str); + void (*dtor)(char16_t* str); } cef_string_utf16_t; /// @@ -89,7 +89,7 @@ CEF_EXPORT int cef_string_utf8_set(const char* src, size_t src_len, cef_string_utf8_t* output, int copy); -CEF_EXPORT int cef_string_utf16_set(const char16* src, +CEF_EXPORT int cef_string_utf16_set(const char16_t* src, size_t src_len, cef_string_utf16_t* output, int copy); @@ -141,14 +141,14 @@ CEF_EXPORT int cef_string_utf8_to_wide(const char* src, CEF_EXPORT int cef_string_wide_to_utf16(const wchar_t* src, size_t src_len, cef_string_utf16_t* output); -CEF_EXPORT int cef_string_utf16_to_wide(const char16* src, +CEF_EXPORT int cef_string_utf16_to_wide(const char16_t* src, size_t src_len, cef_string_wide_t* output); CEF_EXPORT int cef_string_utf8_to_utf16(const char* src, size_t src_len, cef_string_utf16_t* output); -CEF_EXPORT int cef_string_utf16_to_utf8(const char16* src, +CEF_EXPORT int cef_string_utf16_to_utf8(const char16_t* src, size_t src_len, cef_string_utf8_t* output); @@ -198,10 +198,10 @@ CEF_EXPORT void cef_string_userfree_utf16_free(cef_string_userfree_utf16_t str); /// may change the length of the string in some cases. /// -CEF_EXPORT int cef_string_utf16_to_lower(const char16* src, +CEF_EXPORT int cef_string_utf16_to_lower(const char16_t* src, size_t src_len, cef_string_utf16_t* output); -CEF_EXPORT int cef_string_utf16_to_upper(const char16* src, +CEF_EXPORT int cef_string_utf16_to_upper(const char16_t* src, size_t src_len, cef_string_utf16_t* output); diff --git a/include/internal/cef_string_wrappers.h b/include/internal/cef_string_wrappers.h index 44e453f6d..ee4f3bb92 100644 --- a/include/internal/cef_string_wrappers.h +++ b/include/internal/cef_string_wrappers.h @@ -115,7 +115,7 @@ struct CefStringTraitsWide { static inline bool from_string16(const std::u16string::value_type* data, size_t length, struct_type* s) { - return cef_string_utf16_to_wide(reinterpret_cast(data), + return cef_string_utf16_to_wide(reinterpret_cast(data), length, s) ? true : false; @@ -213,7 +213,7 @@ struct CefStringTraitsUTF8 { static inline bool from_string16(const std::u16string::value_type* data, size_t length, struct_type* s) { - return cef_string_utf16_to_utf8(reinterpret_cast(data), + return cef_string_utf16_to_utf8(reinterpret_cast(data), length, s) ? true : false; @@ -227,7 +227,7 @@ struct CefStringTraitsUTF8 { /// Traits implementation for utf16 character strings. /// struct CefStringTraitsUTF16 { - typedef char16 char_type; + typedef char16_t char_type; typedef cef_string_utf16_t struct_type; typedef cef_string_userfree_utf16_t userfree_struct_type; @@ -290,12 +290,15 @@ struct CefStringTraitsUTF16 { } #else // WCHAR_T_IS_UTF32 static inline std::wstring to_wstring(const struct_type* s) { - return std::wstring(s->str, s->length); + return std::wstring(reinterpret_cast(s->str), s->length); } static inline bool from_wstring(const std::wstring::value_type* data, size_t length, struct_type* s) { - return cef_string_utf16_set(data, length, s, true) ? true : false; + return cef_string_utf16_set(reinterpret_cast(data), length, + s, true) + ? true + : false; } #endif // WCHAR_T_IS_UTF32 static inline bool from_wstring(const std::wstring& str, struct_type* s) { @@ -308,7 +311,7 @@ struct CefStringTraitsUTF16 { static inline bool from_string16(const std::u16string::value_type* data, size_t length, struct_type* s) { - return cef_string_utf16_set(reinterpret_cast(data), length, + return cef_string_utf16_set(reinterpret_cast(data), length, s, true) ? true : false; @@ -412,15 +415,6 @@ class CefStringBase { FromString16(src, length); } } -#if defined(WCHAR_T_IS_UTF32) - CefStringBase(const char16* src, size_t length = 0) - : string_(NULL), owner_(false) { - if (src) { - FromString16(reinterpret_cast(src), - length); - } - } -#endif // WCHAR_T_IS_UTF32 /// /// Create a new string from an existing character array. If |copy| is true @@ -826,12 +820,6 @@ class CefStringBase { FromString16(str); return *this; } -#if defined(WCHAR_T_IS_UTF32) - CefStringBase& operator=(const char16* str) { - FromString16(reinterpret_cast(str)); - return *this; - } -#endif // WCHAR_T_IS_UTF32 #if defined(USING_CHROMIUM_INCLUDES) // The base::FilePath constructor is marked as explicit so provide the // conversion here for convenience. diff --git a/include/internal/cef_time.h b/include/internal/cef_time.h index 7d0b4cc73..365d421ad 100644 --- a/include/internal/cef_time.h +++ b/include/internal/cef_time.h @@ -35,7 +35,9 @@ extern "C" { #endif +#include #include + #include "include/base/cef_basictypes.h" #include "include/internal/cef_export.h" @@ -47,7 +49,7 @@ extern "C" { /// This is equivalent of Chromium `base::Time` (see base/time/time.h). /// typedef struct _cef_basetime_t { - int64 val; + int64_t val; } cef_basetime_t; /// diff --git a/include/internal/cef_trace_event_internal.h b/include/internal/cef_trace_event_internal.h index 82d72f271..3c726a86e 100644 --- a/include/internal/cef_trace_event_internal.h +++ b/include/internal/cef_trace_event_internal.h @@ -51,60 +51,60 @@ extern "C" { CEF_EXPORT void cef_trace_event_instant(const char* category, const char* name, const char* arg1_name, - uint64 arg1_val, + uint64_t arg1_val, const char* arg2_name, - uint64 arg2_val); + uint64_t arg2_val); CEF_EXPORT void cef_trace_event_begin(const char* category, const char* name, const char* arg1_name, - uint64 arg1_val, + uint64_t arg1_val, const char* arg2_name, - uint64 arg2_val); + uint64_t arg2_val); CEF_EXPORT void cef_trace_event_end(const char* category, const char* name, const char* arg1_name, - uint64 arg1_val, + uint64_t arg1_val, const char* arg2_name, - uint64 arg2_val); + uint64_t arg2_val); CEF_EXPORT void cef_trace_counter(const char* category, const char* name, const char* value1_name, - uint64 value1_val, + uint64_t value1_val, const char* value2_name, - uint64 value2_val); + uint64_t value2_val); CEF_EXPORT void cef_trace_counter_id(const char* category, const char* name, - uint64 id, + uint64_t id, const char* value1_name, - uint64 value1_val, + uint64_t value1_val, const char* value2_name, - uint64 value2_val); + uint64_t value2_val); CEF_EXPORT void cef_trace_event_async_begin(const char* category, const char* name, - uint64 id, + uint64_t id, const char* arg1_name, - uint64 arg1_val, + uint64_t arg1_val, const char* arg2_name, - uint64 arg2_val); + uint64_t arg2_val); CEF_EXPORT void cef_trace_event_async_step_into(const char* category, const char* name, - uint64 id, - uint64 step, + uint64_t id, + uint64_t step, const char* arg1_name, - uint64 arg1_val); + uint64_t arg1_val); CEF_EXPORT void cef_trace_event_async_step_past(const char* category, const char* name, - uint64 id, - uint64 step, + uint64_t id, + uint64_t step, const char* arg1_name, - uint64 arg1_val); + uint64_t arg1_val); CEF_EXPORT void cef_trace_event_async_end(const char* category, const char* name, - uint64 id, + uint64_t id, const char* arg1_name, - uint64 arg1_val, + uint64_t arg1_val, const char* arg2_name, - uint64 arg2_val); + uint64_t arg2_val); #ifdef __cplusplus } diff --git a/include/internal/cef_types.h b/include/internal/cef_types.h index 1dd364c7f..24f25d0d7 100644 --- a/include/internal/cef_types.h +++ b/include/internal/cef_types.h @@ -49,7 +49,7 @@ // 32-bit ARGB color value, not premultiplied. The color components are always // in a known order. Equivalent to the SkColor type. -typedef uint32 cef_color_t; +typedef uint32_t cef_color_t; // Return the alpha byte from a cef_color_t value. #define CefColorGetA(color) (((color) >> 24) & 0xFF) @@ -66,17 +66,18 @@ typedef uint32 cef_color_t; (static_cast(a) << 24) | (static_cast(r) << 16) | \ (static_cast(g) << 8) | (static_cast(b) << 0)) -// Return an int64 value with the specified low and high int32 component values. -#define CefInt64Set(int32_low, int32_high) \ - static_cast((static_cast(int32_low)) | \ - (static_cast(static_cast(int32_high))) \ - << 32) +// Return an int64_t value with the specified low and high int32_t component +// values. +#define CefInt64Set(int32_low, int32_high) \ + static_cast( \ + (static_cast(int32_low)) | \ + (static_cast(static_cast(int32_high))) << 32) -// Return the low int32 value from an int64 value. -#define CefInt64GetLow(int64_val) static_cast(int64_val) -// Return the high int32 value from an int64 value. +// Return the low int32_t value from an int64_t value. +#define CefInt64GetLow(int64_val) static_cast(int64_val) +// Return the high int32_t value from an int64_t value. #define CefInt64GetHigh(int64_val) \ - static_cast((static_cast(int64_val) >> 32) & 0xFFFFFFFFL) + static_cast((static_cast(int64_val) >> 32) & 0xFFFFFFFFL) #ifdef __cplusplus extern "C" { @@ -1779,7 +1780,7 @@ typedef struct _cef_mouse_event_t { /// Bit flags describing any pressed modifier keys. See /// cef_event_flags_t for values. /// - uint32 modifiers; + uint32_t modifiers; } cef_mouse_event_t; /// @@ -1857,7 +1858,7 @@ typedef struct _cef_touch_event_t { /// Bit flags describing any pressed modifier keys. See /// cef_event_flags_t for values. /// - uint32 modifiers; + uint32_t modifiers; /// /// The device type that caused the event. @@ -2070,7 +2071,7 @@ typedef struct _cef_key_event_t { /// Bit flags describing any pressed modifier keys. See /// cef_event_flags_t for values. /// - uint32 modifiers; + uint32_t modifiers; /// /// The Windows key code for the key event. This value is used by the DOM @@ -2095,13 +2096,13 @@ typedef struct _cef_key_event_t { /// /// The character generated by the keystroke. /// - char16 character; + char16_t character; /// /// Same as |character| but unmodified by any concurrently-held modifiers /// (except shift). This is useful for working out shortcut keys. /// - char16 unmodified_character; + char16_t unmodified_character; /// /// True if the focus is currently on an editable field on the page. This is @@ -3348,7 +3349,7 @@ typedef struct _cef_touch_handle_state_t { /// Combination of cef_touch_handle_state_flags_t values indicating what state /// is set. /// - uint32 flags; + uint32_t flags; /// /// Enabled state. Only set if |flags| contains CEF_THS_FLAG_ENABLED. diff --git a/include/test/cef_test_server.h b/include/test/cef_test_server.h index 37f7a739d..80a59e15e 100644 --- a/include/test/cef_test_server.h +++ b/include/test/cef_test_server.h @@ -86,7 +86,7 @@ class CefTestServer : public CefBaseRefCounted { /// /*--cef()--*/ static CefRefPtr CreateAndStart( - uint16 port, + uint16_t port, bool https_server, cef_test_cert_type_t https_cert_type, CefRefPtr handler); diff --git a/include/views/cef_display.h b/include/views/cef_display.h index 574410efd..4010cae96 100644 --- a/include/views/cef_display.h +++ b/include/views/cef_display.h @@ -123,7 +123,7 @@ class CefDisplay : public CefBaseRefCounted { /// Returns the unique identifier for this Display. /// /*--cef()--*/ - virtual int64 GetID() = 0; + virtual int64_t GetID() = 0; /// /// Returns this Display's device pixel scale factor. This specifies how much diff --git a/include/views/cef_window.h b/include/views/cef_window.h index e34e446bd..5cb3c4d66 100644 --- a/include/views/cef_window.h +++ b/include/views/cef_window.h @@ -300,7 +300,7 @@ class CefWindow : public CefPanel { /// primarily for testing purposes. /// /*--cef()--*/ - virtual void SendKeyPress(int key_code, uint32 event_flags) = 0; + virtual void SendKeyPress(int key_code, uint32_t event_flags) = 0; /// /// Simulate a mouse move. The mouse cursor will be moved to the specified diff --git a/include/wrapper/cef_byte_read_handler.h b/include/wrapper/cef_byte_read_handler.h index 4a1ba0b14..5dd041623 100644 --- a/include/wrapper/cef_byte_read_handler.h +++ b/include/wrapper/cef_byte_read_handler.h @@ -61,15 +61,15 @@ class CefByteReadHandler : public CefReadHandler { // CefReadHandler methods. virtual size_t Read(void* ptr, size_t size, size_t n) override; - virtual int Seek(int64 offset, int whence) override; - virtual int64 Tell() override; + virtual int Seek(int64_t offset, int whence) override; + virtual int64_t Tell() override; virtual int Eof() override; virtual bool MayBlock() override { return false; } private: const unsigned char* bytes_; - int64 size_; - int64 offset_; + int64_t size_; + int64_t offset_; CefRefPtr source_; base::Lock lock_; diff --git a/include/wrapper/cef_closure_task.h b/include/wrapper/cef_closure_task.h index 51f12aff0..95dde6a81 100644 --- a/include/wrapper/cef_closure_task.h +++ b/include/wrapper/cef_closure_task.h @@ -109,9 +109,9 @@ bool CefPostTask(CefThreadId threadId, const base::RepeatingClosure& closure); /// bool CefPostDelayedTask(CefThreadId threadId, base::OnceClosure closure, - int64 delay_ms); + int64_t delay_ms); bool CefPostDelayedTask(CefThreadId threadId, const base::RepeatingClosure& closure, - int64 delay_ms); + int64_t delay_ms); #endif // CEF_INCLUDE_WRAPPER_CEF_CLOSURE_TASK_H_ diff --git a/include/wrapper/cef_message_router.h b/include/wrapper/cef_message_router.h index 7ce06e419..ebbf1c2de 100644 --- a/include/wrapper/cef_message_router.h +++ b/include/wrapper/cef_message_router.h @@ -177,7 +177,7 @@ // 8. Handle the query in your Handler::OnQuery implementation and execute the // appropriate callback either immediately or asynchronously. // -// void MyHandler::OnQuery(int64 query_id, +// void MyHandler::OnQuery(int64_t query_id, // CefRefPtr browser, // CefRefPtr frame, // const CefString& request, @@ -269,7 +269,7 @@ class CefMessageRouterBrowserSide /// virtual bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) { @@ -287,7 +287,7 @@ class CefMessageRouterBrowserSide /// virtual void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) {} + int64_t query_id) {} virtual ~Handler() {} }; diff --git a/include/wrapper/cef_resource_manager.h b/include/wrapper/cef_resource_manager.h index 0ff51fc04..f524b714f 100644 --- a/include/wrapper/cef_resource_manager.h +++ b/include/wrapper/cef_resource_manager.h @@ -361,7 +361,7 @@ class CefResourceManager ProviderEntryList providers_; // Map of response ID to pending CefResourceHandler object. - using PendingHandlersMap = std::map>; + using PendingHandlersMap = std::map>; PendingHandlersMap pending_handlers_; UrlFilter url_filter_; diff --git a/include/wrapper/cef_stream_resource_handler.h b/include/wrapper/cef_stream_resource_handler.h index 20246d135..06690fc1c 100644 --- a/include/wrapper/cef_stream_resource_handler.h +++ b/include/wrapper/cef_stream_resource_handler.h @@ -68,7 +68,7 @@ class CefStreamResourceHandler : public CefResourceHandler { bool& handle_request, CefRefPtr callback) override; void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override; bool Read(void* data_out, int bytes_to_read, diff --git a/libcef/browser/browser_host_base.cc b/libcef/browser/browser_host_base.cc index c8c23f133..4c339772a 100644 --- a/libcef/browser/browser_host_base.cc +++ b/libcef/browser/browser_host_base.cc @@ -316,7 +316,7 @@ void CefBrowserHostBase::StartDownload(const CefString& url) { void CefBrowserHostBase::DownloadImage( const CefString& image_url, bool is_favicon, - uint32 max_image_size, + uint32_t max_image_size, bool bypass_cache, CefRefPtr callback) { if (!CEF_CURRENTLY_ON_UIT()) { @@ -346,7 +346,7 @@ void CefBrowserHostBase::DownloadImage( gurl, is_favicon, gfx::Size(max_image_size, max_image_size), max_image_size * scale, bypass_cache, base::BindOnce( - [](uint32 max_image_size, + [](uint32_t max_image_size, CefRefPtr callback, int id, int http_status_code, const GURL& image_url, const std::vector& bitmaps, @@ -765,7 +765,7 @@ CefRefPtr CefBrowserHostBase::GetFocusedFrame() { return GetFrame(CefFrameHostImpl::kFocusedFrameId); } -CefRefPtr CefBrowserHostBase::GetFrame(int64 identifier) { +CefRefPtr CefBrowserHostBase::GetFrame(int64_t identifier) { if (identifier == CefFrameHostImpl::kInvalidFrameId) { return nullptr; } else if (identifier == CefFrameHostImpl::kMainFrameId) { @@ -796,7 +796,8 @@ size_t CefBrowserHostBase::GetFrameCount() { return browser_info_->GetAllFrames().size(); } -void CefBrowserHostBase::GetFrameIdentifiers(std::vector& identifiers) { +void CefBrowserHostBase::GetFrameIdentifiers( + std::vector& identifiers) { if (identifiers.size() > 0) { identifiers.clear(); } diff --git a/libcef/browser/browser_host_base.h b/libcef/browser/browser_host_base.h index 982812932..faa81ad3d 100644 --- a/libcef/browser/browser_host_base.h +++ b/libcef/browser/browser_host_base.h @@ -179,7 +179,7 @@ class CefBrowserHostBase : public CefBrowserHost, void StartDownload(const CefString& url) override; void DownloadImage(const CefString& image_url, bool is_favicon, - uint32 max_image_size, + uint32_t max_image_size, bool bypass_cache, CefRefPtr callback) override; void Print() override; @@ -225,10 +225,10 @@ class CefBrowserHostBase : public CefBrowserHost, bool IsPopup() override; CefRefPtr GetMainFrame() override; CefRefPtr GetFocusedFrame() override; - CefRefPtr GetFrame(int64 identifier) override; + CefRefPtr GetFrame(int64_t identifier) override; CefRefPtr GetFrame(const CefString& name) override; size_t GetFrameCount() override; - void GetFrameIdentifiers(std::vector& identifiers) override; + void GetFrameIdentifiers(std::vector& identifiers) override; void GetFrameNames(std::vector& names) override; // CefBrowserContentsDelegate::Observer methods: diff --git a/libcef/browser/browser_platform_delegate.cc b/libcef/browser/browser_platform_delegate.cc index 536815f2b..d269b9d98 100644 --- a/libcef/browser/browser_platform_delegate.cc +++ b/libcef/browser/browser_platform_delegate.cc @@ -408,7 +408,7 @@ void CefBrowserPlatformDelegate::StopFinding(bool clearSelection) { // static int CefBrowserPlatformDelegate::TranslateWebEventModifiers( - uint32 cef_modifiers) { + uint32_t cef_modifiers) { int result = 0; // Set modifiers based on key state. if (cef_modifiers & EVENTFLAG_CAPS_LOCK_ON) { diff --git a/libcef/browser/browser_platform_delegate.h b/libcef/browser/browser_platform_delegate.h index b62e6ffc4..2543d6f5b 100644 --- a/libcef/browser/browser_platform_delegate.h +++ b/libcef/browser/browser_platform_delegate.h @@ -379,7 +379,7 @@ class CefBrowserPlatformDelegate { CefBrowserPlatformDelegate(); virtual ~CefBrowserPlatformDelegate(); - static int TranslateWebEventModifiers(uint32 cef_modifiers); + static int TranslateWebEventModifiers(uint32_t cef_modifiers); // Not owned by this object. content::WebContents* web_contents_ = nullptr; diff --git a/libcef/browser/download_item_impl.cc b/libcef/browser/download_item_impl.cc index f997f1b02..08e74af45 100644 --- a/libcef/browser/download_item_impl.cc +++ b/libcef/browser/download_item_impl.cc @@ -50,7 +50,7 @@ cef_download_interrupt_reason_t CefDownloadItemImpl::GetInterruptReason() { const_value().GetLastReason()); } -int64 CefDownloadItemImpl::GetCurrentSpeed() { +int64_t CefDownloadItemImpl::GetCurrentSpeed() { CEF_VALUE_VERIFY_RETURN(false, 0); return const_value().CurrentSpeed(); } @@ -60,12 +60,12 @@ int CefDownloadItemImpl::GetPercentComplete() { return const_value().PercentComplete(); } -int64 CefDownloadItemImpl::GetTotalBytes() { +int64_t CefDownloadItemImpl::GetTotalBytes() { CEF_VALUE_VERIFY_RETURN(false, 0); return const_value().GetTotalBytes(); } -int64 CefDownloadItemImpl::GetReceivedBytes() { +int64_t CefDownloadItemImpl::GetReceivedBytes() { CEF_VALUE_VERIFY_RETURN(false, 0); return const_value().GetReceivedBytes(); } @@ -85,7 +85,7 @@ CefString CefDownloadItemImpl::GetFullPath() { return const_value().GetFullPath().value(); } -uint32 CefDownloadItemImpl::GetId() { +uint32_t CefDownloadItemImpl::GetId() { CEF_VALUE_VERIFY_RETURN(false, 0); return const_value().GetId(); } diff --git a/libcef/browser/download_item_impl.h b/libcef/browser/download_item_impl.h index 0dbef9d61..231140146 100644 --- a/libcef/browser/download_item_impl.h +++ b/libcef/browser/download_item_impl.h @@ -29,14 +29,14 @@ class CefDownloadItemImpl bool IsCanceled() override; bool IsInterrupted() override; cef_download_interrupt_reason_t GetInterruptReason() override; - int64 GetCurrentSpeed() override; + int64_t GetCurrentSpeed() override; int GetPercentComplete() override; - int64 GetTotalBytes() override; - int64 GetReceivedBytes() override; + int64_t GetTotalBytes() override; + int64_t GetReceivedBytes() override; CefBaseTime GetStartTime() override; CefBaseTime GetEndTime() override; CefString GetFullPath() override; - uint32 GetId() override; + uint32_t GetId() override; CefString GetURL() override; CefString GetOriginalUrl() override; CefString GetSuggestedFileName() override; diff --git a/libcef/browser/download_manager_delegate.cc b/libcef/browser/download_manager_delegate.cc index 8543061c1..236067b64 100644 --- a/libcef/browser/download_manager_delegate.cc +++ b/libcef/browser/download_manager_delegate.cc @@ -45,7 +45,7 @@ CefRefPtr GetDownloadHandler( class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback { public: CefBeforeDownloadCallbackImpl(const base::WeakPtr& manager, - uint32 download_id, + uint32_t download_id, const base::FilePath& suggested_name, content::DownloadTargetCallback callback) : manager_(manager), @@ -81,7 +81,7 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback { private: static void GenerateFilename(base::WeakPtr manager, - uint32 download_id, + uint32_t download_id, const base::FilePath& suggested_name, const base::FilePath& download_path, bool show_dialog, @@ -117,7 +117,7 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback { } static void ChooseDownloadPath(base::WeakPtr manager, - uint32 download_id, + uint32_t download_id, const base::FilePath& suggested_path, bool show_dialog, content::DownloadTargetCallback callback) { @@ -188,7 +188,7 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback { } base::WeakPtr manager_; - uint32 download_id_; + uint32_t download_id_; base::FilePath suggested_name_; content::DownloadTargetCallback callback_; @@ -200,7 +200,7 @@ class CefDownloadItemCallbackImpl : public CefDownloadItemCallback { public: explicit CefDownloadItemCallbackImpl( const base::WeakPtr& manager, - uint32 download_id) + uint32_t download_id) : manager_(manager), download_id_(download_id) {} CefDownloadItemCallbackImpl(const CefDownloadItemCallbackImpl&) = delete; @@ -265,7 +265,7 @@ class CefDownloadItemCallbackImpl : public CefDownloadItemCallback { } base::WeakPtr manager_; - uint32 download_id_; + uint32_t download_id_; IMPLEMENT_REFCOUNTING(CefDownloadItemCallbackImpl); }; @@ -416,7 +416,7 @@ bool CefDownloadManagerDelegate::DetermineDownloadTarget( void CefDownloadManagerDelegate::GetNextId( content::DownloadIdCallback callback) { - static uint32 next_id = DownloadItem::kInvalidId + 1; + static uint32_t next_id = DownloadItem::kInvalidId + 1; std::move(callback).Run(next_id++); } diff --git a/libcef/browser/extensions/extension_function_details.cc b/libcef/browser/extensions/extension_function_details.cc index efed281fb..28351cac5 100644 --- a/libcef/browser/extensions/extension_function_details.cc +++ b/libcef/browser/extensions/extension_function_details.cc @@ -98,7 +98,7 @@ class CefGetExtensionLoadFileCallbackImpl // Move to the end of the stream. stream->Seek(0, SEEK_END); - const int64 size = stream->Tell(); + const int64_t size = stream->Tell(); if (size == 0) { LOG(WARNING) << "Extension resource " << file << " is empty."; return nullptr; @@ -111,7 +111,7 @@ class CefGetExtensionLoadFileCallbackImpl stream->Seek(0, SEEK_SET); // Read all stream contents into the string. - int64 read, offset = 0; + int64_t read, offset = 0; do { read = static_cast(stream->Read(&(*result)[offset], 1, size - offset)); diff --git a/libcef/browser/frame_host_impl.cc b/libcef/browser/frame_host_impl.cc index 0614bbc7f..b813bd2d3 100644 --- a/libcef/browser/frame_host_impl.cc +++ b/libcef/browser/frame_host_impl.cc @@ -193,13 +193,13 @@ CefString CefFrameHostImpl::GetName() { return name_; } -int64 CefFrameHostImpl::GetIdentifier() { +int64_t CefFrameHostImpl::GetIdentifier() { base::AutoLock lock_scope(state_lock_); return frame_id_; } CefRefPtr CefFrameHostImpl::GetParent() { - int64 parent_frame_id; + int64_t parent_frame_id; { base::AutoLock lock_scope(state_lock_); @@ -574,7 +574,7 @@ const ui::PageTransition CefFrameHostImpl::kPageTransitionExplicit = static_cast(ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); -int64 CefFrameHostImpl::GetFrameId() const { +int64_t CefFrameHostImpl::GetFrameId() const { base::AutoLock lock_scope(state_lock_); return is_main_frame_ ? kMainFrameId : frame_id_; } diff --git a/libcef/browser/frame_host_impl.h b/libcef/browser/frame_host_impl.h index 71b234d62..832f5a40b 100644 --- a/libcef/browser/frame_host_impl.h +++ b/libcef/browser/frame_host_impl.h @@ -65,7 +65,7 @@ class CefFrameHostImpl : public CefFrame, public cef::mojom::BrowserFrame { bool IsMain() override; bool IsFocused() override; CefString GetName() override; - int64 GetIdentifier() override; + int64_t GetIdentifier() override; CefRefPtr GetParent() override; CefString GetURL() override; CefRefPtr GetBrowser() override; @@ -156,7 +156,7 @@ class CefFrameHostImpl : public CefFrame, public cef::mojom::BrowserFrame { static const ui::PageTransition kPageTransitionExplicit; private: - int64 GetFrameId() const; + int64_t GetFrameId() const; scoped_refptr GetBrowserInfo() const; CefRefPtr GetBrowserHostBase() const; @@ -176,12 +176,12 @@ class CefFrameHostImpl : public CefFrame, public cef::mojom::BrowserFrame { // The following members may be read/modified from any thread. All access must // be protected by |state_lock_|. mutable base::Lock state_lock_; - int64 frame_id_; + int64_t frame_id_; scoped_refptr browser_info_; bool is_focused_; CefString url_; CefString name_; - int64 parent_frame_id_; + int64_t parent_frame_id_; // The following members are only accessed on the UI thread. content::RenderFrameHost* render_frame_host_ = nullptr; diff --git a/libcef/browser/native/browser_platform_delegate_native_aura.cc b/libcef/browser/native/browser_platform_delegate_native_aura.cc index 9e9e37f0d..83c127719 100644 --- a/libcef/browser/native/browser_platform_delegate_native_aura.cc +++ b/libcef/browser/native/browser_platform_delegate_native_aura.cc @@ -229,7 +229,7 @@ base::TimeTicks CefBrowserPlatformDelegateNativeAura::GetEventTimeStamp() { // static int CefBrowserPlatformDelegateNativeAura::TranslateUiEventModifiers( - uint32 cef_modifiers) { + uint32_t cef_modifiers) { int result = 0; // Set modifiers based on key state. if (cef_modifiers & EVENTFLAG_CAPS_LOCK_ON) { @@ -273,7 +273,7 @@ int CefBrowserPlatformDelegateNativeAura::TranslateUiEventModifiers( // static int CefBrowserPlatformDelegateNativeAura::TranslateUiChangedButtonFlags( - uint32 cef_modifiers) { + uint32_t cef_modifiers) { int result = 0; if (cef_modifiers & EVENTFLAG_LEFT_MOUSE_BUTTON) { result |= ui::EF_LEFT_MOUSE_BUTTON; diff --git a/libcef/browser/native/browser_platform_delegate_native_aura.h b/libcef/browser/native/browser_platform_delegate_native_aura.h index a3c61fb22..e547c5ac3 100644 --- a/libcef/browser/native/browser_platform_delegate_native_aura.h +++ b/libcef/browser/native/browser_platform_delegate_native_aura.h @@ -75,8 +75,8 @@ class CefBrowserPlatformDelegateNativeAura base::OnceClosure GetWidgetDeleteCallback(); static base::TimeTicks GetEventTimeStamp(); - static int TranslateUiEventModifiers(uint32 cef_modifiers); - static int TranslateUiChangedButtonFlags(uint32 cef_modifiers); + static int TranslateUiEventModifiers(uint32_t cef_modifiers); + static int TranslateUiChangedButtonFlags(uint32_t cef_modifiers); // Widget hosting the web contents. It will be deleted automatically when the // associated root window is destroyed. diff --git a/libcef/browser/native/browser_platform_delegate_native_mac.mm b/libcef/browser/native/browser_platform_delegate_native_mac.mm index 95f36f067..f734ec711 100644 --- a/libcef/browser/native/browser_platform_delegate_native_mac.mm +++ b/libcef/browser/native/browser_platform_delegate_native_mac.mm @@ -513,10 +513,12 @@ CefBrowserPlatformDelegateNativeMac::TranslateWebKeyEvent( } NSString* charactersIgnoringModifiers = - [[NSString alloc] initWithCharacters:&key_event.unmodified_character + [[NSString alloc] initWithCharacters:reinterpret_cast( + &key_event.unmodified_character) length:1]; - NSString* characters = - [[NSString alloc] initWithCharacters:&key_event.character length:1]; + NSString* characters = [[NSString alloc] + initWithCharacters:reinterpret_cast(&key_event.character) + length:1]; NSEvent* synthetic_event = [NSEvent keyEventWithType:event_type diff --git a/libcef/browser/net/internal_scheme_handler.cc b/libcef/browser/net/internal_scheme_handler.cc index fece6466f..5967810ee 100644 --- a/libcef/browser/net/internal_scheme_handler.cc +++ b/libcef/browser/net/internal_scheme_handler.cc @@ -70,7 +70,7 @@ class RedirectHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { response_length = 0; redirectUrl = url_.spec(); @@ -111,7 +111,7 @@ class InternalHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { response_length = size_; diff --git a/libcef/browser/net_service/browser_urlrequest_impl.cc b/libcef/browser/net_service/browser_urlrequest_impl.cc index 8719db25d..7433191a3 100644 --- a/libcef/browser/net_service/browser_urlrequest_impl.cc +++ b/libcef/browser/net_service/browser_urlrequest_impl.cc @@ -600,8 +600,8 @@ class CefBrowserURLRequest::Context CefURLRequest::Status status_ = UR_IO_PENDING; CefRefPtr response_; bool response_was_cached_ = false; - int64 upload_data_size_ = 0; - int64 download_data_size_ = -1; + int64_t upload_data_size_ = 0; + int64_t download_data_size_ = -1; bool got_upload_progress_complete_ = false; bool cleanup_immediately_ = false; diff --git a/libcef/browser/net_service/resource_handler_wrapper.cc b/libcef/browser/net_service/resource_handler_wrapper.cc index f1acc40cc..957a94cda 100644 --- a/libcef/browser/net_service/resource_handler_wrapper.cc +++ b/libcef/browser/net_service/resource_handler_wrapper.cc @@ -34,7 +34,7 @@ class SkipCallbackWrapper : public CefResourceSkipCallback { } } - void Continue(int64 bytes_skipped) override { + void Continue(int64_t bytes_skipped) override { if (!work_thread_task_runner_->RunsTasksInCurrentSequence()) { work_thread_task_runner_->PostTask( FROM_HERE, diff --git a/libcef/browser/net_service/resource_request_handler_wrapper.cc b/libcef/browser/net_service/resource_request_handler_wrapper.cc index f5ca9c59c..e1b377c9f 100644 --- a/libcef/browser/net_service/resource_request_handler_wrapper.cc +++ b/libcef/browser/net_service/resource_request_handler_wrapper.cc @@ -1278,7 +1278,7 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { static CefRefPtr MakeRequest( const network::ResourceRequest* request, - int64 request_id, + int64_t request_id, bool read_only) { CefRefPtr requestPtr = new CefRequestImpl(); requestPtr->Set(request, request_id); diff --git a/libcef/browser/server_impl.cc b/libcef/browser/server_impl.cc index c6054a596..4697d2e03 100644 --- a/libcef/browser/server_impl.cc +++ b/libcef/browser/server_impl.cc @@ -155,7 +155,7 @@ class AcceptWebSocketCallback : public CefCallback { // static void CefServer::CreateServer(const CefString& address, - uint16 port, + uint16_t port, int backlog, CefRefPtr handler) { CefRefPtr server(new CefServerImpl(handler)); @@ -178,7 +178,7 @@ CefServerImpl::CefServerImpl(CefRefPtr handler) } void CefServerImpl::Start(const std::string& address, - uint16 port, + uint16_t port, int backlog) { DCHECK(!address.empty()); CEF_POST_TASK(CEF_UIT, base::BindOnce(&CefServerImpl::StartOnUIThread, this, @@ -280,7 +280,7 @@ void CefServerImpl::SendHttp500Response(int connection_id, void CefServerImpl::SendHttpResponse(int connection_id, int response_code, const CefString& content_type, - int64 content_length, + int64_t content_length, const HeaderMap& extra_headers) { if (!CEF_CURRENTLY_ON_HT()) { CEF_POST_TASK_HT(base::BindOnce(&CefServerImpl::SendHttpResponse, this, @@ -540,7 +540,7 @@ void CefServerImpl::OnClose(int connection_id) { } void CefServerImpl::StartOnUIThread(const std::string& address, - uint16 port, + uint16_t port, int backlog) { CEF_REQUIRE_UIT(); DCHECK(!thread_); @@ -562,7 +562,7 @@ void CefServerImpl::StartOnUIThread(const std::string& address, } void CefServerImpl::StartOnHandlerThread(const std::string& address, - uint16 port, + uint16_t port, int backlog) { CEF_REQUIRE_HT(); diff --git a/libcef/browser/server_impl.h b/libcef/browser/server_impl.h index 59fb8260e..693ab7831 100644 --- a/libcef/browser/server_impl.h +++ b/libcef/browser/server_impl.h @@ -25,7 +25,7 @@ class CefServerImpl : public CefServer, net::HttpServer::Delegate { CefServerImpl(const CefServerImpl&) = delete; CefServerImpl& operator=(const CefServerImpl&) = delete; - void Start(const std::string& address, uint16 port, int backlog); + void Start(const std::string& address, uint16_t port, int backlog); // CefServer methods: CefRefPtr GetTaskRunner() override; @@ -44,7 +44,7 @@ class CefServerImpl : public CefServer, net::HttpServer::Delegate { void SendHttpResponse(int connection_id, int response_code, const CefString& content_type, - int64 content_length, + int64_t content_length, const HeaderMap& extra_headers) override; void SendRawData(int connection_id, const void* data, @@ -77,9 +77,9 @@ class CefServerImpl : public CefServer, net::HttpServer::Delegate { void OnWebSocketMessage(int connection_id, std::string data) override; void OnClose(int connection_id) override; - void StartOnUIThread(const std::string& address, uint16 port, int backlog); + void StartOnUIThread(const std::string& address, uint16_t port, int backlog); void StartOnHandlerThread(const std::string& address, - uint16 port, + uint16_t port, int backlog); void ShutdownOnHandlerThread(); diff --git a/libcef/browser/stream_impl.cc b/libcef/browser/stream_impl.cc index 1e4e40e69..0244a932d 100644 --- a/libcef/browser/stream_impl.cc +++ b/libcef/browser/stream_impl.cc @@ -88,7 +88,7 @@ size_t CefFileReader::Read(void* ptr, size_t size, size_t n) { return fread(ptr, size, n, file_); } -int CefFileReader::Seek(int64 offset, int whence) { +int CefFileReader::Seek(int64_t offset, int whence) { base::AutoLock lock_scope(lock_); #if BUILDFLAG(IS_WIN) return _fseeki64(file_, offset, whence); @@ -97,7 +97,7 @@ int CefFileReader::Seek(int64 offset, int whence) { #endif } -int64 CefFileReader::Tell() { +int64_t CefFileReader::Tell() { base::AutoLock lock_scope(lock_); #if BUILDFLAG(IS_WIN) return _ftelli64(file_); @@ -128,12 +128,12 @@ size_t CefFileWriter::Write(const void* ptr, size_t size, size_t n) { return (size_t)fwrite(ptr, size, n, file_); } -int CefFileWriter::Seek(int64 offset, int whence) { +int CefFileWriter::Seek(int64_t offset, int whence) { base::AutoLock lock_scope(lock_); return fseek(file_, offset, whence); } -int64 CefFileWriter::Tell() { +int64_t CefFileWriter::Tell() { base::AutoLock lock_scope(lock_); return ftell(file_); } @@ -145,7 +145,7 @@ int CefFileWriter::Flush() { // CefBytesReader -CefBytesReader::CefBytesReader(void* data, int64 datasize, bool copy) +CefBytesReader::CefBytesReader(void* data, int64_t datasize, bool copy) : data_(nullptr), datasize_(0), copy_(false), offset_(0) { SetData(data, datasize, copy); } @@ -163,7 +163,7 @@ size_t CefBytesReader::Read(void* ptr, size_t size, size_t n) { return ret; } -int CefBytesReader::Seek(int64 offset, int whence) { +int CefBytesReader::Seek(int64_t offset, int whence) { int rv = -1L; base::AutoLock lock_scope(lock_); switch (whence) { @@ -175,7 +175,7 @@ int CefBytesReader::Seek(int64 offset, int whence) { rv = 0; break; case SEEK_END: { - int64 offset_abs = std::abs(offset); + int64_t offset_abs = std::abs(offset); if (offset_abs > datasize_) { break; } @@ -195,7 +195,7 @@ int CefBytesReader::Seek(int64 offset, int whence) { return rv; } -int64 CefBytesReader::Tell() { +int64_t CefBytesReader::Tell() { base::AutoLock lock_scope(lock_); return offset_; } @@ -205,7 +205,7 @@ int CefBytesReader::Eof() { return (offset_ >= datasize_); } -void CefBytesReader::SetData(void* data, int64 datasize, bool copy) { +void CefBytesReader::SetData(void* data, int64_t datasize, bool copy) { base::AutoLock lock_scope(lock_); if (copy_) { free(data_); @@ -245,7 +245,7 @@ CefBytesWriter::~CefBytesWriter() { size_t CefBytesWriter::Write(const void* ptr, size_t size, size_t n) { base::AutoLock lock_scope(lock_); size_t rv; - if (offset_ + static_cast(size * n) >= datasize_ && + if (offset_ + static_cast(size * n) >= datasize_ && Grow(size * n) == 0) { rv = 0; } else { @@ -257,7 +257,7 @@ size_t CefBytesWriter::Write(const void* ptr, size_t size, size_t n) { return rv; } -int CefBytesWriter::Seek(int64 offset, int whence) { +int CefBytesWriter::Seek(int64_t offset, int whence) { int rv = -1L; base::AutoLock lock_scope(lock_); switch (whence) { @@ -269,7 +269,7 @@ int CefBytesWriter::Seek(int64 offset, int whence) { rv = 0; break; case SEEK_END: { - int64 offset_abs = std::abs(offset); + int64_t offset_abs = std::abs(offset); if (offset_abs > datasize_) { break; } @@ -289,7 +289,7 @@ int CefBytesWriter::Seek(int64 offset, int whence) { return rv; } -int64 CefBytesWriter::Tell() { +int64_t CefBytesWriter::Tell() { base::AutoLock lock_scope(lock_); return offset_; } diff --git a/libcef/browser/stream_impl.h b/libcef/browser/stream_impl.h index dde3d6027..d2a11cec2 100644 --- a/libcef/browser/stream_impl.h +++ b/libcef/browser/stream_impl.h @@ -20,8 +20,8 @@ class CefFileReader : public CefStreamReader { ~CefFileReader() override; size_t Read(void* ptr, size_t size, size_t n) override; - int Seek(int64 offset, int whence) override; - int64 Tell() override; + int Seek(int64_t offset, int whence) override; + int64_t Tell() override; int Eof() override; bool MayBlock() override { return true; } @@ -41,8 +41,8 @@ class CefFileWriter : public CefStreamWriter { ~CefFileWriter() override; size_t Write(const void* ptr, size_t size, size_t n) override; - int Seek(int64 offset, int whence) override; - int64 Tell() override; + int Seek(int64_t offset, int whence) override; + int64_t Tell() override; int Flush() override; bool MayBlock() override { return true; } @@ -58,25 +58,25 @@ class CefFileWriter : public CefStreamWriter { // Implementation of CefStreamReader for byte buffers. class CefBytesReader : public CefStreamReader { public: - CefBytesReader(void* data, int64 datasize, bool copy); + CefBytesReader(void* data, int64_t datasize, bool copy); ~CefBytesReader() override; size_t Read(void* ptr, size_t size, size_t n) override; - int Seek(int64 offset, int whence) override; - int64 Tell() override; + int Seek(int64_t offset, int whence) override; + int64_t Tell() override; int Eof() override; bool MayBlock() override { return false; } - void SetData(void* data, int64 datasize, bool copy); + void SetData(void* data, int64_t datasize, bool copy); void* GetData() { return data_; } size_t GetDataSize() { return offset_; } protected: void* data_; - int64 datasize_; + int64_t datasize_; bool copy_; - int64 offset_; + int64_t offset_; base::Lock lock_; @@ -90,13 +90,13 @@ class CefBytesWriter : public CefStreamWriter { ~CefBytesWriter() override; size_t Write(const void* ptr, size_t size, size_t n) override; - int Seek(int64 offset, int whence) override; - int64 Tell() override; + int Seek(int64_t offset, int whence) override; + int64_t Tell() override; int Flush() override; bool MayBlock() override { return false; } void* GetData() { return data_; } - int64 GetDataSize() { return offset_; } + int64_t GetDataSize() { return offset_; } std::string GetDataString(); protected: @@ -104,8 +104,8 @@ class CefBytesWriter : public CefStreamWriter { size_t grow_; void* data_; - int64 datasize_; - int64 offset_; + int64_t datasize_; + int64_t offset_; base::Lock lock_; @@ -121,10 +121,10 @@ class CefHandlerReader : public CefStreamReader { size_t Read(void* ptr, size_t size, size_t n) override { return handler_->Read(ptr, size, n); } - int Seek(int64 offset, int whence) override { + int Seek(int64_t offset, int whence) override { return handler_->Seek(offset, whence); } - int64 Tell() override { return handler_->Tell(); } + int64_t Tell() override { return handler_->Tell(); } int Eof() override { return handler_->Eof(); } bool MayBlock() override { return handler_->MayBlock(); } @@ -143,10 +143,10 @@ class CefHandlerWriter : public CefStreamWriter { size_t Write(const void* ptr, size_t size, size_t n) override { return handler_->Write(ptr, size, n); } - int Seek(int64 offset, int whence) override { + int Seek(int64_t offset, int whence) override { return handler_->Seek(offset, whence); } - int64 Tell() override { return handler_->Tell(); } + int64_t Tell() override { return handler_->Tell(); } int Flush() override { return handler_->Flush(); } bool MayBlock() override { return handler_->MayBlock(); } diff --git a/libcef/browser/test/test_server_impl.cc b/libcef/browser/test/test_server_impl.cc index 73719625e..7a10f4ede 100644 --- a/libcef/browser/test/test_server_impl.cc +++ b/libcef/browser/test/test_server_impl.cc @@ -175,7 +175,7 @@ class CefTestServerImpl::Context { DCHECK(!test_server_); } - bool Start(uint16 port, + bool Start(uint16_t port, bool https_server, cef_test_cert_type_t https_cert_type) { DCHECK(thread_checker_.CalledOnValidThread()); @@ -252,7 +252,7 @@ class CefTestServerImpl::Context { EmbeddedTestServerHandle test_server_handle_; }; -bool CefTestServerImpl::Start(uint16 port, +bool CefTestServerImpl::Start(uint16_t port, bool https_server, cef_test_cert_type_t https_cert_type, CefRefPtr handler) { @@ -281,7 +281,7 @@ CefString CefTestServerImpl::GetOrigin() { // static CefRefPtr CefTestServer::CreateAndStart( - uint16 port, + uint16_t port, bool https_server, cef_test_cert_type_t https_cert_type, CefRefPtr handler) { diff --git a/libcef/browser/test/test_server_impl.h b/libcef/browser/test/test_server_impl.h index 53a4598ca..353860109 100644 --- a/libcef/browser/test/test_server_impl.h +++ b/libcef/browser/test/test_server_impl.h @@ -17,7 +17,7 @@ class CefTestServerImpl : public CefTestServer { CefTestServerImpl(const CefTestServerImpl&) = delete; CefTestServerImpl& operator=(const CefTestServerImpl&) = delete; - bool Start(uint16 port, + bool Start(uint16_t port, bool https_server, cef_test_cert_type_t https_cert_type, CefRefPtr handler); diff --git a/libcef/browser/trace_impl.cc b/libcef/browser/trace_impl.cc index 52fd1fa02..105710413 100644 --- a/libcef/browser/trace_impl.cc +++ b/libcef/browser/trace_impl.cc @@ -49,6 +49,6 @@ bool CefEndTracing(const CefString& tracing_file, return subscriber->EndTracing(base::FilePath(tracing_file), callback); } -int64 CefNowFromSystemTraceTime() { +int64_t CefNowFromSystemTraceTime() { return base::TimeTicks::Now().ToInternalValue(); } diff --git a/libcef/browser/views/display_impl.cc b/libcef/browser/views/display_impl.cc index 6c95c786b..43e5fda0f 100644 --- a/libcef/browser/views/display_impl.cc +++ b/libcef/browser/views/display_impl.cc @@ -111,7 +111,7 @@ CefDisplayImpl::~CefDisplayImpl() { CEF_REQUIRE_UIT(); } -int64 CefDisplayImpl::GetID() { +int64_t CefDisplayImpl::GetID() { CEF_REQUIRE_UIT_RETURN(-1); return display_.id(); } diff --git a/libcef/browser/views/display_impl.h b/libcef/browser/views/display_impl.h index 41fce2c0f..984e5803c 100644 --- a/libcef/browser/views/display_impl.h +++ b/libcef/browser/views/display_impl.h @@ -21,7 +21,7 @@ class CefDisplayImpl : public CefDisplay { ~CefDisplayImpl() override; // CefDisplay methods: - int64 GetID() override; + int64_t GetID() override; float GetDeviceScaleFactor() override; void ConvertPointToPixels(CefPoint& point) override; void ConvertPointFromPixels(CefPoint& point) override; diff --git a/libcef/browser/views/window_impl.cc b/libcef/browser/views/window_impl.cc index 9d853626c..e8b36d22a 100644 --- a/libcef/browser/views/window_impl.cc +++ b/libcef/browser/views/window_impl.cc @@ -554,7 +554,7 @@ CefWindowHandle CefWindowImpl::GetWindowHandle() { return view_util::GetWindowHandle(widget_); } -void CefWindowImpl::SendKeyPress(int key_code, uint32 event_flags) { +void CefWindowImpl::SendKeyPress(int key_code, uint32_t event_flags) { CEF_REQUIRE_VALID_RETURN_VOID(); InitializeUITesting(); diff --git a/libcef/browser/views/window_impl.h b/libcef/browser/views/window_impl.h index a226d0f88..2ddf03917 100644 --- a/libcef/browser/views/window_impl.h +++ b/libcef/browser/views/window_impl.h @@ -75,7 +75,7 @@ class CefWindowImpl void SetDraggableRegions( const std::vector& regions) override; CefWindowHandle GetWindowHandle() override; - void SendKeyPress(int key_code, uint32 event_flags) override; + void SendKeyPress(int key_code, uint32_t event_flags) override; void SendMouseMove(int screen_x, int screen_y) override; void SendMouseEvents(cef_mouse_button_type_t button, bool mouse_down, diff --git a/libcef/browser/zip_reader_impl.cc b/libcef/browser/zip_reader_impl.cc index e265e9feb..32a59a786 100644 --- a/libcef/browser/zip_reader_impl.cc +++ b/libcef/browser/zip_reader_impl.cc @@ -185,7 +185,7 @@ CefString CefZipReaderImpl::GetFileName() { return filename_; } -int64 CefZipReaderImpl::GetFileSize() { +int64_t CefZipReaderImpl::GetFileSize() { if (!VerifyContext() || !GetFileInfo()) { return -1; } @@ -244,7 +244,7 @@ int CefZipReaderImpl::ReadFile(void* buffer, size_t bufferSize) { return unzReadCurrentFile(reader_, buffer, bufferSize); } -int64 CefZipReaderImpl::Tell() { +int64_t CefZipReaderImpl::Tell() { if (!VerifyContext() || !has_fileopen_) { return -1; } diff --git a/libcef/browser/zip_reader_impl.h b/libcef/browser/zip_reader_impl.h index 3b623a236..a50959d08 100644 --- a/libcef/browser/zip_reader_impl.h +++ b/libcef/browser/zip_reader_impl.h @@ -26,12 +26,12 @@ class CefZipReaderImpl : public CefZipReader { bool MoveToFile(const CefString& fileName, bool caseSensitive) override; bool Close() override; CefString GetFileName() override; - int64 GetFileSize() override; + int64_t GetFileSize() override; CefBaseTime GetFileLastModified() override; bool OpenFile(const CefString& password) override; bool CloseFile() override; int ReadFile(void* buffer, size_t bufferSize) override; - int64 Tell() override; + int64_t Tell() override; bool Eof() override; bool GetFileInfo(); @@ -46,7 +46,7 @@ class CefZipReaderImpl : public CefZipReader { bool has_fileopen_; bool has_fileinfo_; CefString filename_; - int64 filesize_; + int64_t filesize_; time_t filemodified_; IMPLEMENT_REFCOUNTING(CefZipReaderImpl); diff --git a/libcef/common/base_impl.cc b/libcef/common/base_impl.cc index 52993c836..9a4333e9e 100644 --- a/libcef/common/base_impl.cc +++ b/libcef/common/base_impl.cc @@ -21,9 +21,9 @@ constexpr const char kCategory[] = "cef.client"; CEF_EXPORT void cef_trace_event_instant(const char* /* category */, const char* name, const char* arg1_name, - uint64 arg1_val, + uint64_t arg1_val, const char* arg2_name, - uint64 arg2_val) { + uint64_t arg2_val) { DCHECK(name); if (!name) { return; @@ -43,9 +43,9 @@ CEF_EXPORT void cef_trace_event_instant(const char* /* category */, CEF_EXPORT void cef_trace_event_begin(const char* /* category */, const char* name, const char* arg1_name, - uint64 arg1_val, + uint64_t arg1_val, const char* arg2_name, - uint64 arg2_val) { + uint64_t arg2_val) { DCHECK(name); if (!name) { return; @@ -64,9 +64,9 @@ CEF_EXPORT void cef_trace_event_begin(const char* /* category */, CEF_EXPORT void cef_trace_event_end(const char* /* category */, const char* name, const char* arg1_name, - uint64 arg1_val, + uint64_t arg1_val, const char* arg2_name, - uint64 arg2_val) { + uint64_t arg2_val) { DCHECK(name); if (!name) { return; @@ -84,9 +84,9 @@ CEF_EXPORT void cef_trace_event_end(const char* /* category */, CEF_EXPORT void cef_trace_counter(const char* /* category */, const char* name, const char* value1_name, - uint64 value1_val, + uint64_t value1_val, const char* value2_name, - uint64 value2_val) { + uint64_t value2_val) { DCHECK(name); if (!name) { return; @@ -102,11 +102,11 @@ CEF_EXPORT void cef_trace_counter(const char* /* category */, CEF_EXPORT void cef_trace_counter_id(const char* /* category */, const char* name, - uint64 id, + uint64_t id, const char* value1_name, - uint64 value1_val, + uint64_t value1_val, const char* value2_name, - uint64 value2_val) { + uint64_t value2_val) { DCHECK(name); if (!name) { return; @@ -122,11 +122,11 @@ CEF_EXPORT void cef_trace_counter_id(const char* /* category */, CEF_EXPORT void cef_trace_event_async_begin(const char* /* category */, const char* name, - uint64 id, + uint64_t id, const char* arg1_name, - uint64 arg1_val, + uint64_t arg1_val, const char* arg2_name, - uint64 arg2_val) { + uint64_t arg2_val) { DCHECK(name); if (!name) { return; @@ -144,10 +144,10 @@ CEF_EXPORT void cef_trace_event_async_begin(const char* /* category */, CEF_EXPORT void cef_trace_event_async_step_into(const char* /* category */, const char* name, - uint64 id, - uint64 step, + uint64_t id, + uint64_t step, const char* arg1_name, - uint64 arg1_val) { + uint64_t arg1_val) { DCHECK(name); if (!name) { return; @@ -163,10 +163,10 @@ CEF_EXPORT void cef_trace_event_async_step_into(const char* /* category */, CEF_EXPORT void cef_trace_event_async_step_past(const char* /* category */, const char* name, - uint64 id, - uint64 step, + uint64_t id, + uint64_t step, const char* arg1_name, - uint64 arg1_val) { + uint64_t arg1_val) { DCHECK(name); if (!name) { return; @@ -182,11 +182,11 @@ CEF_EXPORT void cef_trace_event_async_step_past(const char* /* category */, CEF_EXPORT void cef_trace_event_async_end(const char* /* category */, const char* name, - uint64 id, + uint64_t id, const char* arg1_name, - uint64 arg1_val, + uint64_t arg1_val, const char* arg2_name, - uint64 arg2_val) { + uint64_t arg2_val) { DCHECK(name); if (!name) { return; diff --git a/libcef/common/request_impl.cc b/libcef/common/request_impl.cc index d9b2026ce..ad0445d8d 100644 --- a/libcef/common/request_impl.cc +++ b/libcef/common/request_impl.cc @@ -389,13 +389,13 @@ CefRequestImpl::TransitionType CefRequestImpl::GetTransitionType() { return transition_type_; } -uint64 CefRequestImpl::GetIdentifier() { +uint64_t CefRequestImpl::GetIdentifier() { base::AutoLock lock_scope(lock_); return identifier_; } void CefRequestImpl::Set(const network::ResourceRequest* request, - uint64 identifier) { + uint64_t identifier) { base::AutoLock lock_scope(lock_); CHECK_READONLY_RETURN_VOID(); diff --git a/libcef/common/request_impl.h b/libcef/common/request_impl.h index 9ef13f2bb..dadbfdef2 100644 --- a/libcef/common/request_impl.h +++ b/libcef/common/request_impl.h @@ -80,10 +80,10 @@ class CefRequestImpl : public CefRequest { void SetFirstPartyForCookies(const CefString& url) override; ResourceType GetResourceType() override; TransitionType GetTransitionType() override; - uint64 GetIdentifier() override; + uint64_t GetIdentifier() override; // Populate this object from the ResourceRequest object. - void Set(const network::ResourceRequest* request, uint64 identifier); + void Set(const network::ResourceRequest* request, uint64_t identifier); // Populate the ResourceRequest object from this object. // If |changed_only| is true then only the changed fields will be updated. @@ -145,7 +145,7 @@ class CefRequestImpl : public CefRequest { HeaderMap headermap_; ResourceType resource_type_; TransitionType transition_type_; - uint64 identifier_; + uint64_t identifier_; // The below members are used by CefURLRequest. int flags_; diff --git a/libcef/common/string_types_impl.cc b/libcef/common/string_types_impl.cc index 84cc81314..aed3f6db5 100644 --- a/libcef/common/string_types_impl.cc +++ b/libcef/common/string_types_impl.cc @@ -21,7 +21,7 @@ void string_utf8_dtor(char* str) { delete[] str; } -void string_utf16_dtor(char16* str) { +void string_utf16_dtor(char16_t* str) { delete[] str; } @@ -84,7 +84,7 @@ CEF_EXPORT int cef_string_utf8_set(const char* src, return 1; } -CEF_EXPORT int cef_string_utf16_set(const char16* src, +CEF_EXPORT int cef_string_utf16_set(const char16_t* src, size_t src_len, cef_string_utf16_t* output, int copy) { @@ -92,18 +92,18 @@ CEF_EXPORT int cef_string_utf16_set(const char16* src, if (copy) { if (src && src_len > 0) { - output->str = new char16[src_len + 1]; + output->str = new char16_t[src_len + 1]; if (!output->str) { return 0; } - memcpy(output->str, src, src_len * sizeof(char16)); + memcpy(output->str, src, src_len * sizeof(char16_t)); output->str[src_len] = 0; output->length = src_len; output->dtor = string_utf16_dtor; } } else { - output->str = const_cast(src); + output->str = const_cast(src); output->length = src_len; output->dtor = nullptr; } @@ -186,7 +186,9 @@ CEF_EXPORT int cef_string_utf16_cmp(const cef_string_utf16_t* str1, reinterpret_cast(str2->str), std::min(str1->length, str2->length)); #else - int r = wcsncmp(str1->str, str2->str, std::min(str1->length, str2->length)); + int r = wcsncmp(reinterpret_cast(str1->str), + reinterpret_cast(str2->str), + std::min(str1->length, str2->length)); #endif if (r == 0) { if (str1->length > str2->length) { @@ -225,14 +227,14 @@ CEF_EXPORT int cef_string_wide_to_utf16(const wchar_t* src, cef_string_utf16_t* output) { std::u16string str; bool ret = base::WideToUTF16(src, src_len, &str); - if (!cef_string_utf16_set(reinterpret_cast(str.c_str()), + if (!cef_string_utf16_set(reinterpret_cast(str.c_str()), str.length(), output, true)) { return false; } return ret; } -CEF_EXPORT int cef_string_utf16_to_wide(const char16* src, +CEF_EXPORT int cef_string_utf16_to_wide(const char16_t* src, size_t src_len, cef_string_wide_t* output) { std::wstring str; @@ -249,14 +251,14 @@ CEF_EXPORT int cef_string_utf8_to_utf16(const char* src, cef_string_utf16_t* output) { std::u16string str; bool ret = base::UTF8ToUTF16(src, src_len, &str); - if (!cef_string_utf16_set(reinterpret_cast(str.c_str()), + if (!cef_string_utf16_set(reinterpret_cast(str.c_str()), str.length(), output, true)) { return false; } return ret; } -CEF_EXPORT int cef_string_utf16_to_utf8(const char16* src, +CEF_EXPORT int cef_string_utf16_to_utf8(const char16_t* src, size_t src_len, cef_string_utf8_t* output) { std::string str; @@ -279,7 +281,7 @@ CEF_EXPORT int cef_string_ascii_to_utf16(const char* src, size_t src_len, cef_string_utf16_t* output) { const std::u16string& str = base::ASCIIToUTF16(std::string(src, src_len)); - return cef_string_utf16_set(reinterpret_cast(str.c_str()), + return cef_string_utf16_set(reinterpret_cast(str.c_str()), str.length(), output, true); } @@ -317,20 +319,20 @@ CEF_EXPORT void cef_string_userfree_utf16_free( delete str; } -CEF_EXPORT int cef_string_utf16_to_lower(const char16* src, +CEF_EXPORT int cef_string_utf16_to_lower(const char16_t* src, size_t src_len, cef_string_utf16_t* output) { const std::u16string& str = base::i18n::ToLower(std::u16string( reinterpret_cast(src), src_len)); - return cef_string_utf16_set(reinterpret_cast(str.c_str()), + return cef_string_utf16_set(reinterpret_cast(str.c_str()), str.length(), output, true); } -CEF_EXPORT int cef_string_utf16_to_upper(const char16* src, +CEF_EXPORT int cef_string_utf16_to_upper(const char16_t* src, size_t src_len, cef_string_utf16_t* output) { const std::u16string& str = base::i18n::ToUpper(std::u16string( reinterpret_cast(src), src_len)); - return cef_string_utf16_set(reinterpret_cast(str.c_str()), + return cef_string_utf16_set(reinterpret_cast(str.c_str()), str.length(), output, true); } diff --git a/libcef/common/task_impl.cc b/libcef/common/task_impl.cc index 6e3bc0874..a709c4b33 100644 --- a/libcef/common/task_impl.cc +++ b/libcef/common/task_impl.cc @@ -35,7 +35,7 @@ bool CefPostTask(CefThreadId threadId, CefRefPtr task) { bool CefPostDelayedTask(CefThreadId threadId, CefRefPtr task, - int64 delay_ms) { + int64_t delay_ms) { scoped_refptr task_runner = CefTaskRunnerImpl::GetTaskRunner(threadId); if (task_runner.get()) { diff --git a/libcef/common/task_runner_impl.cc b/libcef/common/task_runner_impl.cc index 39590e97f..46f274487 100644 --- a/libcef/common/task_runner_impl.cc +++ b/libcef/common/task_runner_impl.cc @@ -139,7 +139,7 @@ bool CefTaskRunnerImpl::PostTask(CefRefPtr task) { } bool CefTaskRunnerImpl::PostDelayedTask(CefRefPtr task, - int64 delay_ms) { + int64_t delay_ms) { return task_runner_->PostDelayedTask( FROM_HERE, base::BindOnce(&CefTask::Execute, task.get()), base::Milliseconds(delay_ms)); diff --git a/libcef/common/task_runner_impl.h b/libcef/common/task_runner_impl.h index de3d8307f..8afbfab69 100644 --- a/libcef/common/task_runner_impl.h +++ b/libcef/common/task_runner_impl.h @@ -29,7 +29,7 @@ class CefTaskRunnerImpl : public CefTaskRunner { bool BelongsToCurrentThread() override; bool BelongsToThread(CefThreadId threadId) override; bool PostTask(CefRefPtr task) override; - bool PostDelayedTask(CefRefPtr task, int64 delay_ms) override; + bool PostDelayedTask(CefRefPtr task, int64_t delay_ms) override; private: scoped_refptr task_runner_; diff --git a/libcef/common/waitable_event_impl.cc b/libcef/common/waitable_event_impl.cc index 3e9745b0a..2ead5e086 100644 --- a/libcef/common/waitable_event_impl.cc +++ b/libcef/common/waitable_event_impl.cc @@ -55,7 +55,7 @@ void CefWaitableEventImpl::Wait() { event_.Wait(); } -bool CefWaitableEventImpl::TimedWait(int64 max_ms) { +bool CefWaitableEventImpl::TimedWait(int64_t max_ms) { if (!AllowWait()) { return false; } diff --git a/libcef/common/waitable_event_impl.h b/libcef/common/waitable_event_impl.h index ce6495e41..13b6b0e91 100644 --- a/libcef/common/waitable_event_impl.h +++ b/libcef/common/waitable_event_impl.h @@ -22,7 +22,7 @@ class CefWaitableEventImpl : public CefWaitableEvent { void Signal() override; bool IsSignaled() override; void Wait() override; - bool TimedWait(int64 max_ms) override; + bool TimedWait(int64_t max_ms) override; private: base::WaitableEvent event_; diff --git a/libcef/renderer/browser_impl.cc b/libcef/renderer/browser_impl.cc index 1626c0115..94cbb0e1c 100644 --- a/libcef/renderer/browser_impl.cc +++ b/libcef/renderer/browser_impl.cc @@ -180,7 +180,7 @@ CefRefPtr CefBrowserImpl::GetFocusedFrame() { return nullptr; } -CefRefPtr CefBrowserImpl::GetFrame(int64 identifier) { +CefRefPtr CefBrowserImpl::GetFrame(int64_t identifier) { CEF_REQUIRE_RT_RETURN(nullptr); return GetWebFrameImpl(identifier).get(); @@ -234,7 +234,7 @@ size_t CefBrowserImpl::GetFrameCount() { return count; } -void CefBrowserImpl::GetFrameIdentifiers(std::vector& identifiers) { +void CefBrowserImpl::GetFrameIdentifiers(std::vector& identifiers) { CEF_REQUIRE_RT_RETURN_VOID(); if (identifiers.size() > 0) { diff --git a/libcef/renderer/browser_impl.h b/libcef/renderer/browser_impl.h index 0733bd40b..b0da154e4 100644 --- a/libcef/renderer/browser_impl.h +++ b/libcef/renderer/browser_impl.h @@ -57,10 +57,10 @@ class CefBrowserImpl : public CefBrowser, public blink::WebViewObserver { bool HasDocument() override; CefRefPtr GetMainFrame() override; CefRefPtr GetFocusedFrame() override; - CefRefPtr GetFrame(int64 identifier) override; + CefRefPtr GetFrame(int64_t identifier) override; CefRefPtr GetFrame(const CefString& name) override; size_t GetFrameCount() override; - void GetFrameIdentifiers(std::vector& identifiers) override; + void GetFrameIdentifiers(std::vector& identifiers) override; void GetFrameNames(std::vector& names) override; CefBrowserImpl(blink::WebView* web_view, @@ -100,7 +100,7 @@ class CefBrowserImpl : public CefBrowser, public blink::WebViewObserver { bool is_windowless_; // Map of unique frame ids to CefFrameImpl references. - using FrameMap = std::map>; + using FrameMap = std::map>; FrameMap frames_; // True if the browser was in the BFCache. @@ -108,7 +108,7 @@ class CefBrowserImpl : public CefBrowser, public blink::WebViewObserver { // Map of unique frame ids to CefTrackManager objects that need to be cleaned // up when the frame is deleted. - using FrameObjectMap = std::map>; + using FrameObjectMap = std::map>; FrameObjectMap frame_objects_; struct LoadingState { diff --git a/libcef/renderer/frame_impl.cc b/libcef/renderer/frame_impl.cc index cb37ab38e..b5b12f7c5 100644 --- a/libcef/renderer/frame_impl.cc +++ b/libcef/renderer/frame_impl.cc @@ -185,7 +185,7 @@ CefString CefFrameImpl::GetName() { return name; } -int64 CefFrameImpl::GetIdentifier() { +int64_t CefFrameImpl::GetIdentifier() { CEF_REQUIRE_RT_RETURN(0); return frame_id_; diff --git a/libcef/renderer/frame_impl.h b/libcef/renderer/frame_impl.h index 01d6a9319..c9406a882 100644 --- a/libcef/renderer/frame_impl.h +++ b/libcef/renderer/frame_impl.h @@ -70,7 +70,7 @@ class CefFrameImpl bool IsMain() override; bool IsFocused() override; CefString GetName() override; - int64 GetIdentifier() override; + int64_t GetIdentifier() override; CefRefPtr GetParent() override; CefString GetURL() override; CefRefPtr GetBrowser() override; @@ -166,7 +166,7 @@ class CefFrameImpl CefBrowserImpl* browser_; blink::WebLocalFrame* frame_; - const int64 frame_id_; + const int64_t frame_id_; bool did_commit_provisional_load_ = false; bool did_initialize_script_context_ = false; diff --git a/libcef/renderer/v8_impl.cc b/libcef/renderer/v8_impl.cc index e4d8146f8..100adf57f 100644 --- a/libcef/renderer/v8_impl.cc +++ b/libcef/renderer/v8_impl.cc @@ -444,7 +444,7 @@ v8::Local GetV8String(v8::Isolate* isolate, const CefString& str) { } #if defined(CEF_STRING_TYPE_UTF16) -void v8impl_string_dtor(char16* str) { +void v8impl_string_dtor(char16_t* str) { delete[] str; } #elif defined(CEF_STRING_TYPE_UTF8) @@ -481,7 +481,7 @@ void GetCefString(v8::Isolate* isolate, if (len == 0) { return; } - char16* buf = new char16[len + 1]; + char16_t* buf = new char16_t[len + 1]; str->Write(isolate, reinterpret_cast(buf), 0, len + 1); #else // Allocate enough space for a worst-case conversion. @@ -1274,7 +1274,7 @@ CefRefPtr CefV8Value::CreateBool(bool value) { } // static -CefRefPtr CefV8Value::CreateInt(int32 value) { +CefRefPtr CefV8Value::CreateInt(int32_t value) { CEF_V8_REQUIRE_ISOLATE_RETURN(nullptr); v8::Isolate* isolate = CefV8IsolateManager::Get()->isolate(); CefRefPtr impl = new CefV8ValueImpl(isolate); @@ -1283,7 +1283,7 @@ CefRefPtr CefV8Value::CreateInt(int32 value) { } // static -CefRefPtr CefV8Value::CreateUInt(uint32 value) { +CefRefPtr CefV8Value::CreateUInt(uint32_t value) { CEF_V8_REQUIRE_ISOLATE_RETURN(nullptr); v8::Isolate* isolate = CefV8IsolateManager::Get()->isolate(); CefRefPtr impl = new CefV8ValueImpl(isolate); @@ -1597,13 +1597,13 @@ void CefV8ValueImpl::InitBool(bool value) { bool_value_ = value; } -void CefV8ValueImpl::InitInt(int32 value) { +void CefV8ValueImpl::InitInt(int32_t value) { DCHECK_EQ(type_, TYPE_INVALID); type_ = TYPE_INT; int_value_ = value; } -void CefV8ValueImpl::InitUInt(uint32 value) { +void CefV8ValueImpl::InitUInt(uint32_t value) { DCHECK_EQ(type_, TYPE_INVALID); type_ = TYPE_UINT; uint_value_ = value; @@ -1814,7 +1814,7 @@ bool CefV8ValueImpl::GetBoolValue() { return false; } -int32 CefV8ValueImpl::GetIntValue() { +int32_t CefV8ValueImpl::GetIntValue() { CEF_V8_REQUIRE_ISOLATE_RETURN(0); if (type_ == TYPE_INT || type_ == TYPE_UINT) { return int_value_; @@ -1822,7 +1822,7 @@ int32 CefV8ValueImpl::GetIntValue() { return 0; } -uint32 CefV8ValueImpl::GetUIntValue() { +uint32_t CefV8ValueImpl::GetUIntValue() { CEF_V8_REQUIRE_ISOLATE_RETURN(0); if (type_ == TYPE_INT || type_ == TYPE_UINT) { return uint_value_; diff --git a/libcef/renderer/v8_impl.h b/libcef/renderer/v8_impl.h index af18e9c64..ef5177b9c 100644 --- a/libcef/renderer/v8_impl.h +++ b/libcef/renderer/v8_impl.h @@ -214,8 +214,8 @@ class CefV8ValueImpl : public CefV8Value { void InitUndefined(); void InitNull(); void InitBool(bool value); - void InitInt(int32 value); - void InitUInt(uint32 value); + void InitInt(int32_t value); + void InitUInt(uint32_t value); void InitDouble(double value); void InitDate(CefBaseTime value); void InitString(CefString& value); @@ -241,8 +241,8 @@ class CefV8ValueImpl : public CefV8Value { bool IsPromise() override; bool IsSame(CefRefPtr value) override; bool GetBoolValue() override; - int32 GetIntValue() override; - uint32 GetUIntValue() override; + int32_t GetIntValue() override; + uint32_t GetUIntValue() override; double GetDoubleValue() override; CefBaseTime GetDateValue() override; CefString GetStringValue() override; @@ -348,8 +348,8 @@ class CefV8ValueImpl : public CefV8Value { union { bool bool_value_; - int32 int_value_; - uint32 uint_value_; + int32_t int_value_; + uint32_t uint_value_; double double_value_; cef_basetime_t date_value_; cef_string_t string_value_; diff --git a/libcef_dll/base/cef_logging.cc b/libcef_dll/base/cef_logging.cc index 0d935507a..f8a766856 100644 --- a/libcef_dll/base/cef_logging.cc +++ b/libcef_dll/base/cef_logging.cc @@ -256,12 +256,25 @@ ErrnoLogMessage::~ErrnoLogMessage() { } // namespace cef std::ostream& operator<<(std::ostream& out, const wchar_t* wstr) { - std::wstring tmp_str(wstr); - if (!tmp_str.empty()) { + const auto length = wstr ? std::char_traits::length(wstr) : 0U; + if (length > 0) { cef_string_utf8_t str = {0}; - cef_string_wide_to_utf8(wstr, tmp_str.size(), &str); + cef_string_wide_to_utf8(wstr, length, &str); out << str.str; cef_string_utf8_clear(&str); } return out; } + +#if defined(WCHAR_T_IS_UTF32) +std::ostream& operator<<(std::ostream& out, const char16_t* wstr) { + const auto length = wstr ? std::char_traits::length(wstr) : 0U; + if (length > 0) { + cef_string_utf8_t str = {0}; + cef_string_utf16_to_utf8(wstr, length, &str); + out << str.str; + cef_string_utf8_clear(&str); + } + return out; +} +#endif diff --git a/tests/cefclient/browser/binding_test.cc b/tests/cefclient/browser/binding_test.cc index 0dfdc7752..792975cbb 100644 --- a/tests/cefclient/browser/binding_test.cc +++ b/tests/cefclient/browser/binding_test.cc @@ -25,7 +25,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { // Called due to cefQuery execution in binding.html. virtual bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/cefclient/browser/browser_window_osr_mac.mm b/tests/cefclient/browser/browser_window_osr_mac.mm index d72f0a9fe..92a6fb4ad 100644 --- a/tests/cefclient/browser/browser_window_osr_mac.mm +++ b/tests/cefclient/browser/browser_window_osr_mac.mm @@ -654,7 +654,7 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) { mouseEvent.x = client::DeviceToLogical(point.x, device_scale_factor); mouseEvent.y = client::DeviceToLogical(point.y, device_scale_factor); - mouseEvent.modifiers = static_cast([NSEvent modifierFlags]); + mouseEvent.modifiers = static_cast([NSEvent modifierFlags]); } - (int)getModifiersForEvent:(NSEvent*)event { @@ -1023,7 +1023,7 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) { CefRefPtr writer = CefStreamWriter::CreateForHandler(handler.get()); current_drag_data_->GetFileContents(writer); - DCHECK_EQ(handler->GetDataSize(), static_cast(size)); + DCHECK_EQ(handler->GetDataSize(), static_cast(size)); [pboard setData:[NSData dataWithBytes:handler->GetData() length:handler->GetDataSize()] diff --git a/tests/cefclient/browser/bytes_write_handler.cc b/tests/cefclient/browser/bytes_write_handler.cc index b05d6934f..d53b61aef 100644 --- a/tests/cefclient/browser/bytes_write_handler.cc +++ b/tests/cefclient/browser/bytes_write_handler.cc @@ -27,7 +27,7 @@ BytesWriteHandler::~BytesWriteHandler() { size_t BytesWriteHandler::Write(const void* ptr, size_t size, size_t n) { base::AutoLock lock_scope(lock_); size_t rv; - if (offset_ + static_cast(size * n) >= datasize_ && + if (offset_ + static_cast(size * n) >= datasize_ && Grow(size * n) == 0) { rv = 0; } else { @@ -39,7 +39,7 @@ size_t BytesWriteHandler::Write(const void* ptr, size_t size, size_t n) { return rv; } -int BytesWriteHandler::Seek(int64 offset, int whence) { +int BytesWriteHandler::Seek(int64_t offset, int whence) { int rv = -1L; base::AutoLock lock_scope(lock_); switch (whence) { @@ -51,7 +51,7 @@ int BytesWriteHandler::Seek(int64 offset, int whence) { rv = 0; break; case SEEK_END: { - int64 offset_abs = std::abs(offset); + int64_t offset_abs = std::abs(offset); if (offset_abs > datasize_) { break; } @@ -71,7 +71,7 @@ int BytesWriteHandler::Seek(int64 offset, int whence) { return rv; } -int64 BytesWriteHandler::Tell() { +int64_t BytesWriteHandler::Tell() { base::AutoLock lock_scope(lock_); return offset_; } diff --git a/tests/cefclient/browser/bytes_write_handler.h b/tests/cefclient/browser/bytes_write_handler.h index 6907675a7..b71d8fb94 100644 --- a/tests/cefclient/browser/bytes_write_handler.h +++ b/tests/cefclient/browser/bytes_write_handler.h @@ -17,21 +17,21 @@ class BytesWriteHandler : public CefWriteHandler { ~BytesWriteHandler(); size_t Write(const void* ptr, size_t size, size_t n) override; - int Seek(int64 offset, int whence) override; - int64 Tell() override; + int Seek(int64_t offset, int whence) override; + int64_t Tell() override; int Flush() override; bool MayBlock() override { return false; } void* GetData() { return data_; } - int64 GetDataSize() { return offset_; } + int64_t GetDataSize() { return offset_; } private: size_t Grow(size_t size); size_t grow_; void* data_; - int64 datasize_; - int64 offset_; + int64_t datasize_; + int64_t offset_; base::Lock lock_; diff --git a/tests/cefclient/browser/client_handler.cc b/tests/cefclient/browser/client_handler.cc index 012cd0b85..46019bef8 100644 --- a/tests/cefclient/browser/client_handler.cc +++ b/tests/cefclient/browser/client_handler.cc @@ -1057,7 +1057,7 @@ bool ClientHandler::OnRequestMediaAccessPermission( CefRefPtr browser, CefRefPtr frame, const CefString& requesting_origin, - uint32 requested_permissions, + uint32_t requested_permissions, CefRefPtr callback) { callback->Continue(media_handling_disabled_ ? CEF_MEDIA_PERMISSION_NONE : requested_permissions); diff --git a/tests/cefclient/browser/client_handler.h b/tests/cefclient/browser/client_handler.h index 72fa115ba..b1458c6ba 100644 --- a/tests/cefclient/browser/client_handler.h +++ b/tests/cefclient/browser/client_handler.h @@ -244,7 +244,7 @@ class ClientHandler : public CefClient, CefRefPtr browser, CefRefPtr frame, const CefString& requesting_origin, - uint32 requested_permissions, + uint32_t requested_permissions, CefRefPtr callback) override; // CefRequestHandler methods diff --git a/tests/cefclient/browser/dialog_test.cc b/tests/cefclient/browser/dialog_test.cc index 78d23d835..7fbc81479 100644 --- a/tests/cefclient/browser/dialog_test.cc +++ b/tests/cefclient/browser/dialog_test.cc @@ -93,7 +93,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { // Called due to cefQuery execution in dialogs.html. virtual bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/cefclient/browser/media_router_test.cc b/tests/cefclient/browser/media_router_test.cc index 94b394419..36cbe926e 100644 --- a/tests/cefclient/browser/media_router_test.cc +++ b/tests/cefclient/browser/media_router_test.cc @@ -383,7 +383,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { // Called due to cefQuery execution in media_router.html. bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -497,7 +497,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) override { + int64_t query_id) override { CEF_REQUIRE_UI_THREAD(); RemoveSubscription(browser->GetIdentifier(), query_id); } @@ -535,13 +535,13 @@ class Handler : public CefMessageRouterBrowserSide::Handler { // Subscription state associated with a single browser. struct SubscriptionState { - int64 query_id; + int64_t query_id; CefRefPtr observer; CefRefPtr registration; }; bool CreateSubscription(CefRefPtr browser, - int64 query_id, + int64_t query_id, CefRefPtr callback) { const int browser_id = browser->GetIdentifier(); if (subscription_state_map_.find(browser_id) != @@ -566,7 +566,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { return true; } - void RemoveSubscription(int browser_id, int64 query_id) { + void RemoveSubscription(int browser_id, int64_t query_id) { SubscriptionStateMap::iterator it = subscription_state_map_.find(browser_id); if (it != subscription_state_map_.end() && diff --git a/tests/cefclient/browser/osr_dragdrop_win.cc b/tests/cefclient/browser/osr_dragdrop_win.cc index 04d699486..512134fe5 100644 --- a/tests/cefclient/browser/osr_dragdrop_win.cc +++ b/tests/cefclient/browser/osr_dragdrop_win.cc @@ -262,7 +262,7 @@ bool DragDataToDataObject(CefRefPtr drag_data, CefRefPtr writer = CefStreamWriter::CreateForHandler(handler.get()); drag_data->GetFileContents(writer); - DCHECK_EQ(handler->GetDataSize(), static_cast(bufferSize)); + DCHECK_EQ(handler->GetDataSize(), static_cast(bufferSize)); CefString fileName = drag_data->GetFileName(); GetStorageForFileDescriptor(&stgmeds[curr_index], fileName.ToWString()); fmtetc.cfFormat = file_desc_format; diff --git a/tests/cefclient/browser/osr_ime_handler_win.cc b/tests/cefclient/browser/osr_ime_handler_win.cc index 1571cd4a7..115c2fe15 100644 --- a/tests/cefclient/browser/osr_ime_handler_win.cc +++ b/tests/cefclient/browser/osr_ime_handler_win.cc @@ -70,7 +70,7 @@ void GetCompositionUnderlines( uint32_t target_end, std::vector& underlines) { int clause_size = ::ImmGetCompositionString(imc, GCS_COMPCLAUSE, nullptr, 0); - int clause_length = clause_size / sizeof(uint32); + int clause_length = clause_size / sizeof(uint32_t); if (clause_length) { std::vector clause_data(clause_length); diff --git a/tests/cefclient/browser/osr_render_handler_win.cc b/tests/cefclient/browser/osr_render_handler_win.cc index b81a9021a..525b7a253 100644 --- a/tests/cefclient/browser/osr_render_handler_win.cc +++ b/tests/cefclient/browser/osr_render_handler_win.cc @@ -71,7 +71,7 @@ void OsrRenderHandlerWin::TriggerBeginFrame(uint64_t last_time_us, CefPostDelayedTask(TID_UI, base::BindOnce(&OsrRenderHandlerWin::TriggerBeginFrame, weak_factory_.GetWeakPtr(), now, delay_us), - int64(offset / 1000.0)); + static_cast(offset / 1000.0)); if (settings_.external_begin_frame_enabled && browser_) { // We're running the BeginFrame timer. Trigger rendering via diff --git a/tests/cefclient/browser/preferences_test.cc b/tests/cefclient/browser/preferences_test.cc index 496e3ef91..f3b69ba43 100644 --- a/tests/cefclient/browser/preferences_test.cc +++ b/tests/cefclient/browser/preferences_test.cc @@ -46,7 +46,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { // Called due to cefQuery execution in preferences.html. bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/cefclient/browser/scheme_test.cc b/tests/cefclient/browser/scheme_test.cc index 0a781fd55..8233130b7 100644 --- a/tests/cefclient/browser/scheme_test.cc +++ b/tests/cefclient/browser/scheme_test.cc @@ -78,7 +78,7 @@ class ClientSchemeHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { CEF_REQUIRE_IO_THREAD(); diff --git a/tests/cefclient/browser/server_test.cc b/tests/cefclient/browser/server_test.cc index 967605491..849976642 100644 --- a/tests/cefclient/browser/server_test.cc +++ b/tests/cefclient/browser/server_test.cc @@ -180,7 +180,7 @@ class ServerHandler : public CefServerHandler { CefResponse::HeaderMap extra_headers) { // Determine the stream size. stream->Seek(0, SEEK_END); - int64 content_length = stream->Tell(); + int64_t content_length = stream->Tell(); stream->Seek(0, SEEK_SET); // Send response headers. @@ -226,7 +226,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { // Called due to cefQuery execution in server.html. virtual bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/cefclient/browser/test_runner.cc b/tests/cefclient/browser/test_runner.cc index e000b84d8..e9ad8548c 100644 --- a/tests/cefclient/browser/test_runner.cc +++ b/tests/cefclient/browser/test_runner.cc @@ -167,7 +167,7 @@ class PromptHandler : public CefMessageRouterBrowserSide::Handler { // Called due to cefQuery execution. virtual bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/cefclient/browser/urlrequest_test.cc b/tests/cefclient/browser/urlrequest_test.cc index a84976bb7..135d57b1d 100644 --- a/tests/cefclient/browser/urlrequest_test.cc +++ b/tests/cefclient/browser/urlrequest_test.cc @@ -50,12 +50,12 @@ class RequestClient : public CefURLRequestClient { } void OnUploadProgress(CefRefPtr request, - int64 current, - int64 total) override {} + int64_t current, + int64_t total) override {} void OnDownloadProgress(CefRefPtr request, - int64 current, - int64 total) override {} + int64_t current, + int64_t total) override {} void OnDownloadData(CefRefPtr request, const void* data, @@ -91,7 +91,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { // Called due to cefQuery execution in urlrequest.html. bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/cefclient/browser/views_menu_bar.cc b/tests/cefclient/browser/views_menu_bar.cc index f8746a2b1..e2363993c 100644 --- a/tests/cefclient/browser/views_menu_bar.cc +++ b/tests/cefclient/browser/views_menu_bar.cc @@ -20,7 +20,7 @@ const int kMenuBarGroupId = 100; // If the mnemonic is capital I and the UI language is Turkish, lowercasing it // results in 'small dotless i', which is different from a 'dotted i'. Similar // issues may exist for az and lt locales. -char16 ToLower(char16 c) { +char16_t ToLower(char16_t c) { CefStringUTF16 str16; cef_string_utf16_to_lower(&c, 1, str16.GetWritableStruct()); return str16.length() > 0 ? str16.c_str()[0] : 0; @@ -28,7 +28,7 @@ char16 ToLower(char16 c) { // Extract the mnemonic character from |title|. For example, if |title| is // "&Test" then the mnemonic character is 'T'. -char16 GetMnemonic(const std::u16string& title) { +char16_t GetMnemonic(const std::u16string& title) { size_t index = 0; do { index = title.find('&', index); @@ -92,7 +92,7 @@ CefRefPtr ViewsMenuBar::CreateMenuModel(const CefString& label, panel_->AddChildView(button); // Extract the mnemonic that triggers the menu, if any. - char16 mnemonic = GetMnemonic(label); + char16_t mnemonic = GetMnemonic(label); if (mnemonic != 0) { mnemonics_.insert(std::make_pair(mnemonic, new_menu_id)); } diff --git a/tests/cefclient/browser/views_menu_bar.h b/tests/cefclient/browser/views_menu_bar.h index 656fd3b18..736fb9ac0 100644 --- a/tests/cefclient/browser/views_menu_bar.h +++ b/tests/cefclient/browser/views_menu_bar.h @@ -112,7 +112,7 @@ class ViewsMenuBar : public CefMenuButtonDelegate, public CefMenuModelDelegate { bool last_nav_with_keyboard_; // Map of mnemonic to MenuButton ID. - typedef std::map MnemonicMap; + typedef std::map MnemonicMap; MnemonicMap mnemonics_; IMPLEMENT_REFCOUNTING(ViewsMenuBar); diff --git a/tests/cefclient/browser/window_test.cc b/tests/cefclient/browser/window_test.cc index 316f6147e..eb781b35e 100644 --- a/tests/cefclient/browser/window_test.cc +++ b/tests/cefclient/browser/window_test.cc @@ -87,7 +87,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { // Called due to cefBroadcast execution in window.html. virtual bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/cefclient/renderer/performance_test.cc b/tests/cefclient/renderer/performance_test.cc index 9946a683c..8904191c4 100644 --- a/tests/cefclient/renderer/performance_test.cc +++ b/tests/cefclient/renderer/performance_test.cc @@ -45,9 +45,9 @@ class V8Handler : public CefV8Handler { for (int i = 0; i < kPerfTestsCount; ++i) { if (test == kPerfTests[i].name) { // Execute the test. - int64 delta = kPerfTests[i].test(kPerfTests[i].iterations); + int64_t delta = kPerfTests[i].test(kPerfTests[i].iterations); - retval = CefV8Value::CreateInt(static_cast(delta)); + retval = CefV8Value::CreateInt(static_cast(delta)); found = true; break; } @@ -74,7 +74,7 @@ class V8Handler : public CefV8Handler { if (arguments.size() == 0) { retval = CefV8Value::CreateInt(1); } else if (arguments.size() == 1 && arguments[0]->IsInt()) { - int32 type = arguments[0]->GetIntValue(); + int32_t type = arguments[0]->GetIntValue(); switch (type) { case 0: retval = CefV8Value::CreateUndefined(); diff --git a/tests/cefclient/renderer/performance_test_setup.h b/tests/cefclient/renderer/performance_test_setup.h index 7427a5558..5ed34b30b 100644 --- a/tests/cefclient/renderer/performance_test_setup.h +++ b/tests/cefclient/renderer/performance_test_setup.h @@ -24,7 +24,7 @@ extern const int kDefaultIterations; #define PERF_TEST_ENTRY(name) PERF_TEST_ENTRY_EX(name, kDefaultIterations) // Test function declaration. -#define PERF_TEST_RESULT int64 +#define PERF_TEST_RESULT int64_t #define PERF_TEST_PARAM_ITERATIONS iterations #define PERF_TEST_PARAMS int PERF_TEST_PARAM_ITERATIONS #define PERF_TEST_FUNC(name) \ @@ -51,7 +51,7 @@ class CefTimer { running_ = false; } - int64 Delta() { + int64_t Delta() { DCHECK(!running_); return start_.Delta(stop_); } @@ -78,7 +78,7 @@ class CefTimer { // Perform test iterations and return the timing result. #define PERF_ITERATIONS_START() \ - int64 _result = 0; \ + int64_t _result = 0; \ PERF_ITERATIONS_START_EX() #define PERF_ITERATIONS_END() \ diff --git a/tests/ceftests/audio_output_unittest.cc b/tests/ceftests/audio_output_unittest.cc index ff44d6895..3bd57970d 100644 --- a/tests/ceftests/audio_output_unittest.cc +++ b/tests/ceftests/audio_output_unittest.cc @@ -916,7 +916,7 @@ class AudioTestHandler : public TestHandler, public CefAudioHandler { void OnAudioStreamPacket(CefRefPtr browser, const float** data, int frames, - int64 pts) override { + int64_t pts) override { EXPECT_TRUE(got_on_audio_stream_started_); EXPECT_TRUE(browser_->IsSame(browser)); EXPECT_EQ(frames, kFramesPerBuffer); @@ -971,7 +971,7 @@ class AudioOutputTestHandler : public AudioTestHandler { void OnAudioStreamPacket(CefRefPtr browser, const float** data, int frames, - int64 pts) override { + int64_t pts) override { if (!got_on_audio_stream_packet_.isSet()) { browser->GetMainFrame()->ExecuteJavaScript( "var ifr = document.getElementById(\"audio_output_frame\"); " @@ -1002,7 +1002,7 @@ class AudioCloseBrowserTest : public AudioTestHandler { void OnAudioStreamPacket(CefRefPtr browser, const float** data, int frames, - int64 pts) override { + int64_t pts) override { if (!got_on_audio_stream_packet_.isSet()) { CloseBrowser(browser, true); } diff --git a/tests/ceftests/cookie_unittest.cc b/tests/ceftests/cookie_unittest.cc index 8f2a8ef41..235e01362 100644 --- a/tests/ceftests/cookie_unittest.cc +++ b/tests/ceftests/cookie_unittest.cc @@ -762,7 +762,7 @@ class CookieTestSchemeHandler : public TestHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { response_length = content_.size(); @@ -1153,7 +1153,7 @@ class CookieAccessSchemeHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { EXPECT_IO_THREAD(); @@ -1637,7 +1637,7 @@ class CookieAccessTestHandler : public RoutingTestHandler, bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -2114,7 +2114,7 @@ class CookieRestartTestHandler : public RoutingTestHandler, bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/ceftests/cors_unittest.cc b/tests/ceftests/cors_unittest.cc index ec9778201..dbdb1cb3b 100644 --- a/tests/ceftests/cors_unittest.cc +++ b/tests/ceftests/cors_unittest.cc @@ -457,7 +457,7 @@ class CorsTestHandler : public RoutingTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/ceftests/display_unittest.cc b/tests/ceftests/display_unittest.cc index 091a37897..e867d3c59 100644 --- a/tests/ceftests/display_unittest.cc +++ b/tests/ceftests/display_unittest.cc @@ -214,7 +214,7 @@ class AutoResizeTestHandler : public RoutingTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/ceftests/download_unittest.cc b/tests/ceftests/download_unittest.cc index a5a6735ec..cfa85c2a9 100644 --- a/tests/ceftests/download_unittest.cc +++ b/tests/ceftests/download_unittest.cc @@ -64,7 +64,7 @@ class DownloadSchemeHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { response_length = content_.size(); @@ -373,7 +373,7 @@ class DownloadTestHandler : public TestHandler { EXPECT_FALSE(download_item->IsInterrupted()); EXPECT_EQ(CEF_DOWNLOAD_INTERRUPT_REASON_NONE, download_item->GetInterruptReason()); - EXPECT_EQ(static_cast(sizeof(kTestContent) - 1), + EXPECT_EQ(static_cast(sizeof(kTestContent) - 1), download_item->GetTotalBytes()); EXPECT_EQ(0UL, download_item->GetFullPath().length()); EXPECT_STREQ(kTestDownloadUrl, download_item->GetURL().ToString().c_str()); @@ -438,9 +438,9 @@ class DownloadTestHandler : public TestHandler { EXPECT_FALSE(download_item->IsInProgress()); EXPECT_EQ(100, download_item->GetPercentComplete()); - EXPECT_EQ(static_cast(sizeof(kTestContent) - 1), + EXPECT_EQ(static_cast(sizeof(kTestContent) - 1), download_item->GetReceivedBytes()); - EXPECT_EQ(static_cast(sizeof(kTestContent) - 1), + EXPECT_EQ(static_cast(sizeof(kTestContent) - 1), download_item->GetTotalBytes()); DestroyTest(); @@ -564,7 +564,7 @@ class DownloadTestHandler : public TestHandler { std::string download_url_; CefScopedTempDir temp_dir_; std::string test_path_; - uint32 download_id_; + uint32_t download_id_; bool verified_results_; bool destroyed_ = false; diff --git a/tests/ceftests/extensions/extension_test_handler.cc b/tests/ceftests/extensions/extension_test_handler.cc index 22259c226..0aaef516d 100644 --- a/tests/ceftests/extensions/extension_test_handler.cc +++ b/tests/ceftests/extensions/extension_test_handler.cc @@ -131,7 +131,7 @@ void ExtensionTestHandler::OnExtensionLoadFailed(cef_errorcode_t result) { // CefMessageRouterBrowserSide::Handler methods: bool ExtensionTestHandler::OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) { diff --git a/tests/ceftests/extensions/extension_test_handler.h b/tests/ceftests/extensions/extension_test_handler.h index 6e916e353..3e3eeb39f 100644 --- a/tests/ceftests/extensions/extension_test_handler.h +++ b/tests/ceftests/extensions/extension_test_handler.h @@ -56,7 +56,7 @@ class ExtensionTestHandler : public RoutingTestHandler, // CefMessageRouterBrowserSide::Handler methods: bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override; diff --git a/tests/ceftests/frame_handler_unittest.cc b/tests/ceftests/frame_handler_unittest.cc index 198703a5f..42ee79d7f 100644 --- a/tests/ceftests/frame_handler_unittest.cc +++ b/tests/ceftests/frame_handler_unittest.cc @@ -86,7 +86,7 @@ struct FrameStatus { // Specific formulation of the frame ID is an implementation detail that // should generally not be relied upon, but this decomposed format makes the // debug logging easier to follow. - uint64 frame_id = frame->GetIdentifier(); + uint64_t frame_id = frame->GetIdentifier(); uint32_t process_id = frame_id >> 32; uint32_t routing_id = std::numeric_limits::max() & frame_id; std::stringstream ss; @@ -100,7 +100,7 @@ struct FrameStatus { is_main_(frame->IsMain()), ident_str_(GetFrameDebugString(frame)) {} - int64 frame_id() const { return frame_id_; } + int64_t frame_id() const { return frame_id_; } bool is_main() const { return is_main_; } bool AllQueriesDelivered(std::string* msg = nullptr) const { @@ -486,7 +486,7 @@ struct FrameStatus { } } - const int64 frame_id_; + const int64_t frame_id_; const bool is_main_; const std::string ident_str_; @@ -576,7 +576,7 @@ class OrderMainTestHandler : public RoutingTestHandler, public CefFrameHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -900,7 +900,7 @@ class FrameStatusMap { EXPECT_LT(size(), expected_frame_ct_); - const int64 id = frame->GetIdentifier(); + const int64_t id = frame->GetIdentifier(); EXPECT_NE(kInvalidFrameId, id); EXPECT_EQ(frame_map_.find(id), frame_map_.end()); @@ -912,7 +912,7 @@ class FrameStatusMap { FrameStatus* GetFrameStatus(CefRefPtr frame) const { EXPECT_UI_THREAD(); - const int64 id = frame->GetIdentifier(); + const int64_t id = frame->GetIdentifier(); EXPECT_NE(kInvalidFrameId, id); Map::const_iterator it = frame_map_.find(id); EXPECT_NE(it, frame_map_.end()); @@ -920,7 +920,7 @@ class FrameStatusMap { } void RemoveFrameStatus(CefRefPtr frame) { - const int64 id = frame->GetIdentifier(); + const int64_t id = frame->GetIdentifier(); Map::iterator it = frame_map_.find(id); EXPECT_NE(it, frame_map_.end()); frame_map_.erase(it); @@ -1017,7 +1017,7 @@ class FrameStatusMap { size_t size() const { return frame_map_.size(); } private: - using Map = std::map; + using Map = std::map; Map frame_map_; // The expected number of sub-frames. @@ -1063,7 +1063,7 @@ class OrderSubTestHandler : public NavigateOrderMainTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -1590,7 +1590,7 @@ class PopupOrderMainTestHandler : public OrderMainTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/ceftests/frame_unittest.cc b/tests/ceftests/frame_unittest.cc index 94f5b879c..3513d2a0d 100644 --- a/tests/ceftests/frame_unittest.cc +++ b/tests/ceftests/frame_unittest.cc @@ -353,7 +353,7 @@ class FrameNavRendererTest : public ClientAppRenderer::Delegate, EXPECT_TRUE(args->SetInt(0, nav_)); EXPECT_TRUE(args->SetBool(1, result)); - const int64 frame_id = frame->GetIdentifier(); + const int64_t frame_id = frame->GetIdentifier(); EXPECT_TRUE(args->SetInt(2, CefInt64GetLow(frame_id))); EXPECT_TRUE(args->SetInt(3, CefInt64GetHigh(frame_id))); @@ -491,7 +491,7 @@ class FrameNavTestHandler : public TestHandler { << "nav = " << nav_; // Test that browser and render process frame IDs match. - const int64 frame_id = CefInt64Set(args->GetInt(2), args->GetInt(3)); + const int64_t frame_id = CefInt64Set(args->GetInt(2), args->GetInt(3)); EXPECT_EQ(frame->GetIdentifier(), frame_id); return true; @@ -842,7 +842,7 @@ bool VerifySingleBrowserFrame(CefRefPtr browser, V_DECLARE(); V_EXPECT_TRUE(frame.get()); V_EXPECT_TRUE(frame->IsValid()); - const int64 frame_id = frame->GetIdentifier(); + const int64_t frame_id = frame->GetIdentifier(); V_EXPECT_TRUE(frame_id > 0) << frame_id; V_EXPECT_TRUE(frame->IsValid()); V_EXPECT_TRUE(frame->IsMain()); @@ -879,7 +879,7 @@ bool VerifySingleBrowserFrames(CefRefPtr browser, size_t frame_count = browser->GetFrameCount(); V_EXPECT_TRUE(frame_count == 1U); - std::vector identifiers; + std::vector identifiers; browser->GetFrameIdentifiers(identifiers); V_EXPECT_TRUE(identifiers.size() == 1U); if (identifiers.size() == 1U) { @@ -1626,7 +1626,7 @@ bool VerifyBrowserIframe(CefRefPtr browser, // frame0 contains frame1 contains frame2, contains frame3. CefRefPtr frame0, frame1, frame2, frame3; CefRefPtr frame0b, frame1b, frame2b, frame3b; - int64 frame0id, frame1id, frame2id, frame3id; + int64_t frame0id, frame1id, frame2id, frame3id; std::string frame0url, frame1url, frame2url, frame3url; // Verify the GetFrameNames result. @@ -1751,9 +1751,9 @@ bool VerifyBrowserIframe(CefRefPtr browser, V_EXPECT_TRUE(frame_count == 4U) << " actual: " << frame_count; // Verify the GetFrameIdentifiers result. - std::set expected_idents = {frame0id, frame1id, frame2id, frame3id}; + std::set expected_idents = {frame0id, frame1id, frame2id, frame3id}; - std::vector idents; + std::vector idents; browser->GetFrameIdentifiers(idents); V_EXPECT_TRUE(idents.size() == expected_idents.size()) << "expected: " << expected_idents.size() << " actual: " << idents.size(); diff --git a/tests/ceftests/life_span_unittest.cc b/tests/ceftests/life_span_unittest.cc index 80ad799d2..772b3f73d 100644 --- a/tests/ceftests/life_span_unittest.cc +++ b/tests/ceftests/life_span_unittest.cc @@ -135,7 +135,7 @@ class LifeSpanTestHandler : public RoutingTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/ceftests/media_access_unittest.cc b/tests/ceftests/media_access_unittest.cc index 7215383c6..1dd6a86bb 100644 --- a/tests/ceftests/media_access_unittest.cc +++ b/tests/ceftests/media_access_unittest.cc @@ -84,7 +84,7 @@ class TestSetup { class MediaAccessTestHandler : public TestHandler, public CefPermissionHandler { public: - MediaAccessTestHandler(TestSetup* tr, uint32 request, uint32 response) + MediaAccessTestHandler(TestSetup* tr, uint32_t request, uint32_t response) : test_setup_(tr), request_(request), response_(response) {} cef_return_value_t OnBeforeResourceLoad( @@ -217,7 +217,7 @@ class MediaAccessTestHandler : public TestHandler, public CefPermissionHandler { CefRefPtr browser, CefRefPtr frame, const CefString& requesting_origin, - uint32 requested_permissions, + uint32_t requested_permissions, CefRefPtr callback) override { EXPECT_UI_THREAD(); EXPECT_TRUE(frame->IsMain()); @@ -315,8 +315,8 @@ class MediaAccessTestHandler : public TestHandler, public CefPermissionHandler { } TestSetup* const test_setup_; - const uint32 request_; - const uint32 response_; + const uint32_t request_; + const uint32_t response_; CefRefPtr callback_; diff --git a/tests/ceftests/message_router_multi_query_unittest.cc b/tests/ceftests/message_router_multi_query_unittest.cc index b3a66dee4..1bb39c18e 100644 --- a/tests/ceftests/message_router_multi_query_unittest.cc +++ b/tests/ceftests/message_router_multi_query_unittest.cc @@ -284,7 +284,7 @@ class MultiQueryManager : public CefMessageRouterBrowserSide::Handler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -359,7 +359,7 @@ class MultiQueryManager : public CefMessageRouterBrowserSide::Handler { void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) override { + int64_t query_id) override { EXPECT_TRUE(finalized_); EXPECT_UI_THREAD(); @@ -490,11 +490,11 @@ class MultiQueryManager : public CefMessageRouterBrowserSide::Handler { // Set in OnQuery and verified in OnNotify or OnQueryCanceled. int browser_id; - int64 frame_id; + int64_t frame_id; bool is_main_frame; // Used when a query is canceled. - int64 query_id; + int64_t query_id; CefRefPtr callback; TrackCallback got_query; @@ -922,7 +922,7 @@ class MultiQuerySingleFrameTestHandler : public SingleLoadTestHandler, bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -935,7 +935,7 @@ class MultiQuerySingleFrameTestHandler : public SingleLoadTestHandler, void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) override { + int64_t query_id) override { AssertMainBrowser(browser); AssertMainFrame(frame); @@ -1110,7 +1110,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler, bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -1150,7 +1150,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler, void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) override { + int64_t query_id) override { // Verify that the correct handler is called for cancellation. EXPECT_EQ(query_id_, query_id); @@ -1171,7 +1171,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler, private: MultiQueryMultiHandlerTestHandler* test_handler_; const int index_; - int64 query_id_; + int64_t query_id_; }; MultiQueryMultiHandlerTestHandler(bool synchronous, @@ -1203,7 +1203,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler, bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -1216,7 +1216,7 @@ class MultiQueryMultiHandlerTestHandler : public SingleLoadTestHandler, void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) override { + int64_t query_id) override { AssertMainBrowser(browser); AssertMainFrame(frame); @@ -1413,7 +1413,7 @@ class MultiQueryManagerMap : public CefMessageRouterBrowserSide::Handler, bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -1429,7 +1429,7 @@ class MultiQueryManagerMap : public CefMessageRouterBrowserSide::Handler, void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) override { + int64_t query_id) override { EXPECT_TRUE(finalized_); if (!running_) { running_ = true; @@ -1532,9 +1532,9 @@ class MultiQueryManagerMap : public CefMessageRouterBrowserSide::Handler, const int browser_id = browser->GetIdentifier(); // Always use the same ID for the main frame. - const int64 frame_id = frame->IsMain() ? -1 : frame->GetIdentifier(); + const int64_t frame_id = frame->IsMain() ? -1 : frame->GetIdentifier(); - const std::pair& id = std::make_pair(browser_id, frame_id); + const std::pair& id = std::make_pair(browser_id, frame_id); // Remove the currently active manager, if any. ManagerMap::iterator it2 = manager_map_.find(id); @@ -1550,7 +1550,7 @@ class MultiQueryManagerMap : public CefMessageRouterBrowserSide::Handler, CefRefPtr frame) const { const int browser_id = browser->GetIdentifier(); // Always use the same ID for the main frame. - const int64 frame_id = frame->IsMain() ? -1 : frame->GetIdentifier(); + const int64_t frame_id = frame->IsMain() ? -1 : frame->GetIdentifier(); // Find the manager in the active map. ManagerMap::const_iterator it = @@ -1584,7 +1584,7 @@ class MultiQueryManagerMap : public CefMessageRouterBrowserSide::Handler, private: typedef std::vector ManagerList; // Map of (browser ID, frame ID) to manager. - typedef std::map, MultiQueryManager*> ManagerMap; + typedef std::map, MultiQueryManager*> ManagerMap; // All managers that have been created. ManagerList all_managers_; @@ -1649,7 +1649,7 @@ class MultiQueryMultiFrameTestHandler : public SingleLoadTestHandler, bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -1662,7 +1662,7 @@ class MultiQueryMultiFrameTestHandler : public SingleLoadTestHandler, void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) override { + int64_t query_id) override { AssertMainBrowser(browser); EXPECT_FALSE(frame->IsMain()); @@ -1790,7 +1790,7 @@ class MultiQueryMultiLoadTestHandler bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -1800,7 +1800,7 @@ class MultiQueryMultiLoadTestHandler void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) override { + int64_t query_id) override { manager_map_.OnQueryCanceled(browser, frame, query_id); } diff --git a/tests/ceftests/message_router_single_query_unittest.cc b/tests/ceftests/message_router_single_query_unittest.cc index bb5373a0b..3612a8371 100644 --- a/tests/ceftests/message_router_single_query_unittest.cc +++ b/tests/ceftests/message_router_single_query_unittest.cc @@ -136,7 +136,7 @@ class SingleQueryTestHandler : public SingleLoadTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -166,7 +166,7 @@ class SingleQueryTestHandler : public SingleLoadTestHandler { void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) override { + int64_t query_id) override { AssertMainBrowser(browser); AssertMainFrame(frame); EXPECT_EQ(test_type_, CANCEL); @@ -210,7 +210,7 @@ class SingleQueryTestHandler : public SingleLoadTestHandler { const TestType test_type_; const bool sync_callback_; - int64 query_id_; + int64_t query_id_; CefRefPtr callback_; TrackCallback got_on_query_; @@ -388,7 +388,7 @@ class SinglePersistentQueryTestHandler : public SingleLoadTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -422,7 +422,7 @@ class SinglePersistentQueryTestHandler : public SingleLoadTestHandler { void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) override { + int64_t query_id) override { AssertMainBrowser(browser); AssertMainFrame(frame); EXPECT_EQ(query_id_, query_id); @@ -468,7 +468,7 @@ class SinglePersistentQueryTestHandler : public SingleLoadTestHandler { const TestType test_type_; const bool sync_callback_; - int64 query_id_; + int64_t query_id_; CefRefPtr callback_; TrackCallback got_on_query_; @@ -585,7 +585,7 @@ class SingleUnhandledQueryTestHandler : public SingleLoadTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -602,7 +602,7 @@ class SingleUnhandledQueryTestHandler : public SingleLoadTestHandler { void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) override { + int64_t query_id) override { EXPECT_FALSE(true); // Not reached. } diff --git a/tests/ceftests/message_router_threshold_unittest.cc b/tests/ceftests/message_router_threshold_unittest.cc index 0c17a91d4..1170ea525 100644 --- a/tests/ceftests/message_router_threshold_unittest.cc +++ b/tests/ceftests/message_router_threshold_unittest.cc @@ -100,7 +100,7 @@ class ThresholdTestHandler final : public SingleLoadTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/ceftests/navigation_unittest.cc b/tests/ceftests/navigation_unittest.cc index a6646207f..42d81b9fc 100644 --- a/tests/ceftests/navigation_unittest.cc +++ b/tests/ceftests/navigation_unittest.cc @@ -833,7 +833,7 @@ class RedirectSchemeHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { EXPECT_TRUE(CefCurrentlyOn(TID_IO)); @@ -3022,7 +3022,7 @@ class UnstartedSchemeHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { response->SetStatus(200); response->SetMimeType("text/html"); @@ -3242,7 +3242,7 @@ class StalledSchemeHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { response->SetStatus(200); response->SetMimeType("text/html"); diff --git a/tests/ceftests/os_rendering_unittest.cc b/tests/ceftests/os_rendering_unittest.cc index e8c566e72..6de23a1de 100644 --- a/tests/ceftests/os_rendering_unittest.cc +++ b/tests/ceftests/os_rendering_unittest.cc @@ -523,7 +523,7 @@ class OSRTestHandler : public RoutingTestHandler, bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -666,7 +666,7 @@ class OSRTestHandler : public RoutingTestHandler, bool handleBoundsQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) { @@ -854,7 +854,7 @@ class OSRTestHandler : public RoutingTestHandler, // start test only when painting something else then background if (IsBackgroundInBuffer( - reinterpret_cast(buffer), width * height, + reinterpret_cast(buffer), width * height, test_type_ == OSR_TEST_TRANSPARENCY ? 0x00000000 : 0xFFFFFFFF)) { return; } @@ -867,7 +867,7 @@ class OSRTestHandler : public RoutingTestHandler, EXPECT_EQ(dirtyRects.size(), 1U); EXPECT_TRUE(IsFullRepaint(dirtyRects[0], GetScaledInt(kOsrWidth), GetScaledInt(kOsrHeight))); - EXPECT_EQ(0xffff7f7fU, *(reinterpret_cast(buffer))); + EXPECT_EQ(0xffff7f7fU, *(reinterpret_cast(buffer))); DestroySucceededTestSoon(); } break; @@ -877,7 +877,7 @@ class OSRTestHandler : public RoutingTestHandler, EXPECT_EQ(dirtyRects.size(), 1U); EXPECT_TRUE(IsFullRepaint(dirtyRects[0], GetScaledInt(kOsrWidth), GetScaledInt(kOsrHeight))); - EXPECT_EQ(0x80800000U, *(reinterpret_cast(buffer))); + EXPECT_EQ(0x80800000U, *(reinterpret_cast(buffer))); DestroySucceededTestSoon(); } break; @@ -988,9 +988,9 @@ class OSRTestHandler : public RoutingTestHandler, // Unselected option background color is cyan. // Go down 100 pixels to skip the selected option and over 5 pixels // to avoid hitting the border. - const uint32 offset = dirtyRects[0].width * 100 + 5; + const uint32_t offset = dirtyRects[0].width * 100 + 5; EXPECT_EQ(0xff00ffff, - *(reinterpret_cast(buffer) + offset)); + *(reinterpret_cast(buffer) + offset)); if (ExpectComputedPopupSize()) { EXPECT_EQ(expanded_select_rect.width, width); @@ -1505,9 +1505,9 @@ class OSRTestHandler : public RoutingTestHandler, return rc.width == width && rc.height == height; } - static bool IsBackgroundInBuffer(const uint32* buffer, + static bool IsBackgroundInBuffer(const uint32_t* buffer, size_t size, - uint32 rgba) { + uint32_t rgba) { for (size_t i = 0; i < size; i++) { if (buffer[i] != rgba) { return false; diff --git a/tests/ceftests/osr_display_unittest.cc b/tests/ceftests/osr_display_unittest.cc index 05a6a04ab..3648b441a 100644 --- a/tests/ceftests/osr_display_unittest.cc +++ b/tests/ceftests/osr_display_unittest.cc @@ -69,7 +69,7 @@ class DisplayTestHandler : public RoutingTestHandler, public CefRenderHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/ceftests/pdf_viewer_unittest.cc b/tests/ceftests/pdf_viewer_unittest.cc index af3d7ff5b..f8cd6056f 100644 --- a/tests/ceftests/pdf_viewer_unittest.cc +++ b/tests/ceftests/pdf_viewer_unittest.cc @@ -20,9 +20,9 @@ const char kPdfDirectUrl[] = "https://tests/pdf.pdf"; // Delay waiting for iframe tests to load the PDF file. #if defined(OS_LINUX) -const int64 kPdfLoadDelayMs = 7000; +const int64_t kPdfLoadDelayMs = 7000; #else -const int64 kPdfLoadDelayMs = 5000; +const int64_t kPdfLoadDelayMs = 5000; #endif // Browser-side test handler. diff --git a/tests/ceftests/permission_prompt_unittest.cc b/tests/ceftests/permission_prompt_unittest.cc index 71cdfa0a2..3a1374b90 100644 --- a/tests/ceftests/permission_prompt_unittest.cc +++ b/tests/ceftests/permission_prompt_unittest.cc @@ -67,7 +67,7 @@ class PermissionPromptTestHandler : public TestHandler, public CefPermissionHandler { public: PermissionPromptTestHandler(TestSetup* tr, - uint32 request, + uint32_t request, cef_permission_request_result_t result) : test_setup_(tr), request_(request), result_(result) {} @@ -200,9 +200,9 @@ class PermissionPromptTestHandler : public TestHandler, bool OnShowPermissionPrompt( CefRefPtr browser, - uint64 prompt_id, + uint64_t prompt_id, const CefString& requesting_origin, - uint32 requested_permissions, + uint32_t requested_permissions, CefRefPtr callback) override { EXPECT_UI_THREAD(); @@ -236,7 +236,7 @@ class PermissionPromptTestHandler : public TestHandler, void OnDismissPermissionPrompt( CefRefPtr browser, - uint64 prompt_id, + uint64_t prompt_id, cef_permission_request_result_t result) override { EXPECT_UI_THREAD(); EXPECT_EQ(prompt_id_, prompt_id); @@ -282,9 +282,9 @@ class PermissionPromptTestHandler : public TestHandler, } TestSetup* const test_setup_; - const uint32 request_; + const uint32_t request_; const cef_permission_request_result_t result_; - uint64 prompt_id_ = 0U; + uint64_t prompt_id_ = 0U; IMPLEMENT_REFCOUNTING(PermissionPromptTestHandler); }; diff --git a/tests/ceftests/request_handler_unittest.cc b/tests/ceftests/request_handler_unittest.cc index bc68dbaee..2bd1b567b 100644 --- a/tests/ceftests/request_handler_unittest.cc +++ b/tests/ceftests/request_handler_unittest.cc @@ -61,7 +61,7 @@ class NetNotifyTestHandler : public TestHandler { "" "Nav1" ""; - response_length1_ = static_cast(resource1.size()); + response_length1_ = static_cast(resource1.size()); AddResource(url1_, resource1, "text/html"); const std::string& resource2 = @@ -69,7 +69,7 @@ class NetNotifyTestHandler : public TestHandler { "" "Nav2" ""; - response_length2_ = static_cast(resource2.size()); + response_length2_ = static_cast(resource2.size()); AddResource(url2_, resource2, "text/html"); // Create the request context that will use an in-memory cache. @@ -143,7 +143,7 @@ class NetNotifyTestHandler : public TestHandler { CefRefPtr request, CefRefPtr response, URLRequestStatus status, - int64 received_content_length) override { + int64_t received_content_length) override { EXPECT_TRUE(CefCurrentlyOn(TID_IO)); const std::string& url = request->GetURL(); @@ -393,8 +393,8 @@ class NetNotifyTestHandler : public TestHandler { TrackCallback got_before_browse2_delayed_; int got_process_terminated_ct_ = 0; - int64 response_length1_; - int64 response_length2_; + int64_t response_length1_; + int64_t response_length2_; IMPLEMENT_REFCOUNTING(NetNotifyTestHandler); }; diff --git a/tests/ceftests/request_unittest.cc b/tests/ceftests/request_unittest.cc index 0f1cc75ac..b218352a2 100644 --- a/tests/ceftests/request_unittest.cc +++ b/tests/ceftests/request_unittest.cc @@ -225,7 +225,7 @@ class RequestSendRecvTestHandler : public TestHandler { CreateRequest(request_); const std::string& resource = "SendRecv Test"; - response_length_ = static_cast(resource.size()); + response_length_ = static_cast(resource.size()); AddResource(kTestUrl, resource, "text/html"); // Create the browser. @@ -311,7 +311,7 @@ class RequestSendRecvTestHandler : public TestHandler { CefRefPtr request, CefRefPtr response, URLRequestStatus status, - int64 received_content_length) override { + int64_t received_content_length) override { EXPECT_IO_THREAD(); if (IsChromeRuntimeEnabled() && request->GetResourceType() == RT_FAVICON) { @@ -356,8 +356,8 @@ class RequestSendRecvTestHandler : public TestHandler { } CefRefPtr request_; - int64 response_length_; - uint64 request_id_; + int64_t response_length_; + uint64_t request_id_; TrackCallback got_before_resource_load_; TrackCallback got_resource_handler_; diff --git a/tests/ceftests/resource_manager_unittest.cc b/tests/ceftests/resource_manager_unittest.cc index f5fda2a70..be682690d 100644 --- a/tests/ceftests/resource_manager_unittest.cc +++ b/tests/ceftests/resource_manager_unittest.cc @@ -119,7 +119,7 @@ class ResourceManagerTestHandler : public RoutingTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/ceftests/resource_request_handler_unittest.cc b/tests/ceftests/resource_request_handler_unittest.cc index 4ad9ad8f6..72ccb885a 100644 --- a/tests/ceftests/resource_request_handler_unittest.cc +++ b/tests/ceftests/resource_request_handler_unittest.cc @@ -129,7 +129,7 @@ class CallbackResourceHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { response->SetStatus(status_code_); response->SetStatusText(status_text_); @@ -263,7 +263,7 @@ class IncompleteResourceHandlerOld : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { EXPECT_IO_THREAD(); EXPECT_EQ(test_mode_, BLOCK_READ_RESPONSE); @@ -366,7 +366,7 @@ class IncompleteResourceHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { EXPECT_IO_THREAD(); EXPECT_EQ(test_mode_, BLOCK_READ); @@ -792,7 +792,7 @@ class BasicResponseTest : public TestHandler { CefRefPtr request, CefRefPtr response, URLRequestStatus status, - int64 received_content_length) override { + int64_t received_content_length) override { EXPECT_IO_THREAD(); if (IsChromeRuntimeEnabled() && request->GetResourceType() == RT_FAVICON) { @@ -810,7 +810,7 @@ class BasicResponseTest : public TestHandler { EXPECT_EQ(0, received_content_length); } else { EXPECT_EQ(UR_SUCCESS, status); - EXPECT_EQ(static_cast(GetResponseBody().length()), + EXPECT_EQ(static_cast(GetResponseBody().length()), received_content_length); } @@ -1379,7 +1379,7 @@ class BasicResponseTest : public TestHandler { const bool unhandled_; int browser_id_ = 0; - uint64 request_id_ = 0U; + uint64_t request_id_ = 0U; int resource_handler_created_ct_ = 0; @@ -1903,7 +1903,7 @@ class SubresourceResponseTest : public RoutingTestHandler { CefRefPtr request, CefRefPtr response, URLRequestStatus status, - int64 received_content_length) override { + int64_t received_content_length) override { EXPECT_IO_THREAD(); if (IsChromeRuntimeEnabled() && request->GetResourceType() == RT_FAVICON) { @@ -1916,13 +1916,13 @@ class SubresourceResponseTest : public RoutingTestHandler { if (IsMainURL(request->GetURL())) { EXPECT_TRUE(frame->IsMain()); EXPECT_EQ(UR_SUCCESS, status); - EXPECT_EQ(static_cast(GetMainResponseBody().length()), + EXPECT_EQ(static_cast(GetMainResponseBody().length()), received_content_length); return; } else if (IsSubURL(request->GetURL())) { EXPECT_FALSE(frame->IsMain()); EXPECT_EQ(UR_SUCCESS, status); - EXPECT_EQ(static_cast(GetSubResponseBody().length()), + EXPECT_EQ(static_cast(GetSubResponseBody().length()), received_content_length); EXPECT_TRUE(subframe_); return; @@ -1937,7 +1937,7 @@ class SubresourceResponseTest : public RoutingTestHandler { EXPECT_EQ(0, received_content_length); } else { EXPECT_EQ(UR_SUCCESS, status); - EXPECT_EQ(static_cast(GetResponseBody().length()), + EXPECT_EQ(static_cast(GetResponseBody().length()), received_content_length); } @@ -1988,7 +1988,7 @@ class SubresourceResponseTest : public RoutingTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { @@ -2590,8 +2590,8 @@ class SubresourceResponseTest : public RoutingTestHandler { const bool subframe_; int browser_id_ = 0; - int64 frame_id_ = 0; - uint64 request_id_ = 0U; + int64_t frame_id_ = 0; + uint64_t request_id_ = 0U; int resource_handler_created_ct_ = 0; @@ -2866,7 +2866,7 @@ class RedirectResponseTest : public TestHandler { CefRefPtr request, CefRefPtr response, URLRequestStatus status, - int64 received_content_length) { + int64_t received_content_length) { EXPECT_TRUE(CheckUrl(request->GetURL())); // Verify the response returned by GetResourceHandler. @@ -3185,7 +3185,7 @@ class RedirectResponseTest : public TestHandler { CefRefPtr request, CefRefPtr response, URLRequestStatus status, - int64 received_content_length) override { + int64_t received_content_length) override { EXPECT_IO_THREAD(); if (IsChromeRuntimeEnabled() && @@ -3213,8 +3213,8 @@ class RedirectResponseTest : public TestHandler { private: RedirectResponseTest* const test_; - uint64 main_request_id_ = 0U; - uint64 sub_request_id_ = 0U; + uint64_t main_request_id_ = 0U; + uint64_t sub_request_id_ = 0U; IMPLEMENT_REFCOUNTING(ResourceRequestHandler); DISALLOW_COPY_AND_ASSIGN(ResourceRequestHandler); @@ -3557,7 +3557,7 @@ class ResponseFilterTestBase : public CefResponseFilter { // Verify the output from the filter. virtual void VerifyOutput(cef_urlrequest_status_t status, - int64 received_content_length, + int64_t received_content_length, const std::string& received_content) { EXPECT_TRUE(got_init_filter_); EXPECT_GT(filter_count_, 0U); @@ -3608,7 +3608,7 @@ class ResponseFilterPassThru : public ResponseFilterTestBase { } void VerifyOutput(cef_urlrequest_status_t status, - int64 received_content_length, + int64_t received_content_length, const std::string& received_content) override { ResponseFilterTestBase::VerifyOutput(status, received_content_length, received_content); @@ -3741,7 +3741,7 @@ class ResponseFilterNeedMore : public ResponseFilterTestBase { } void VerifyOutput(cef_urlrequest_status_t status, - int64 received_content_length, + int64_t received_content_length, const std::string& received_content) override { ResponseFilterTestBase::VerifyOutput(status, received_content_length, received_content); @@ -3829,7 +3829,7 @@ class ResponseFilterError : public ResponseFilterTestBase { } void VerifyOutput(cef_urlrequest_status_t status, - int64 received_content_length, + int64_t received_content_length, const std::string& received_content) override { ResponseFilterTestBase::VerifyOutput(status, received_content_length, received_content); @@ -3883,7 +3883,7 @@ class ResponseFilterTestHandler : public TestHandler { CefRefPtr request, CefRefPtr response, URLRequestStatus status, - int64 received_content_length) override { + int64_t received_content_length) override { EXPECT_IO_THREAD(); if (IsChromeRuntimeEnabled() && request->GetResourceType() == RT_FAVICON) { @@ -3959,7 +3959,7 @@ class ResponseFilterTestHandler : public TestHandler { TrackCallback got_load_end_; URLRequestStatus status_; - int64 received_content_length_; + int64_t received_content_length_; IMPLEMENT_REFCOUNTING(ResponseFilterTestHandler); }; diff --git a/tests/ceftests/run_all_unittests.cc b/tests/ceftests/run_all_unittests.cc index 392f1f84c..99f52df41 100644 --- a/tests/ceftests/run_all_unittests.cc +++ b/tests/ceftests/run_all_unittests.cc @@ -59,7 +59,7 @@ void QuitMessageLoop() { } } -void sleep(int64 ms) { +void sleep(int64_t ms) { #if defined(OS_WIN) Sleep(ms); #elif defined(OS_POSIX) diff --git a/tests/ceftests/scheme_handler_unittest.cc b/tests/ceftests/scheme_handler_unittest.cc index 486a4f5c2..c4b198cff 100644 --- a/tests/ceftests/scheme_handler_unittest.cc +++ b/tests/ceftests/scheme_handler_unittest.cc @@ -309,7 +309,7 @@ class ClientSchemeHandlerOld : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { CefResponse::HeaderMap headers; @@ -511,7 +511,7 @@ class ClientSchemeHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { CefResponse::HeaderMap headers; diff --git a/tests/ceftests/server_unittest.cc b/tests/ceftests/server_unittest.cc index c558e564b..96642e05e 100644 --- a/tests/ceftests/server_unittest.cc +++ b/tests/ceftests/server_unittest.cc @@ -22,7 +22,7 @@ namespace { // Must use a different port than test_server.cc. const char kTestServerAddress[] = "127.0.0.1"; -const uint16 kTestServerPort = 8099; +const uint16_t kTestServerPort = 8099; const int kTestTimeout = 5000; std::string GetTestServerOrigin(bool is_websocket) { @@ -740,7 +740,7 @@ void SendHttpServerResponse(CefRefPtr server, connection_id, response.response_code, response.content_type, response.no_content_length ? -1 - : static_cast(response.content.size()), + : static_cast(response.content.size()), response.extra_headers); if (!response.content.empty()) { server->SendRawData(connection_id, response.content.data(), @@ -905,12 +905,12 @@ class StaticHttpURLRequestClient : public CefURLRequestClient { } void OnUploadProgress(CefRefPtr request, - int64 current, - int64 total) override {} + int64_t current, + int64_t total) override {} void OnDownloadProgress(CefRefPtr request, - int64 current, - int64 total) override {} + int64_t current, + int64_t total) override {} void OnDownloadData(CefRefPtr request, const void* data, @@ -1203,7 +1203,7 @@ class WebSocketTestHandler : public RoutingTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/ceftests/stream_resource_handler_unittest.cc b/tests/ceftests/stream_resource_handler_unittest.cc index 247eceba8..874519391 100644 --- a/tests/ceftests/stream_resource_handler_unittest.cc +++ b/tests/ceftests/stream_resource_handler_unittest.cc @@ -58,12 +58,12 @@ class ReadHandler : public CefReadHandler { return read_bytes; } - int Seek(int64 offset, int whence) override { + int Seek(int64_t offset, int whence) override { EXPECT_TRUE(false); // Not reached. return 0; } - int64 Tell() override { + int64_t Tell() override { EXPECT_TRUE(false); // Not reached. return 0; } @@ -117,7 +117,7 @@ class ReadTestHandler : public RoutingTestHandler { bool OnQuery(CefRefPtr browser, CefRefPtr frame, - int64 query_id, + int64_t query_id, const CefString& request, bool persistent, CefRefPtr callback) override { diff --git a/tests/ceftests/stream_unittest.cc b/tests/ceftests/stream_unittest.cc index 89c7df9ed..a996b2eab 100644 --- a/tests/ceftests/stream_unittest.cc +++ b/tests/ceftests/stream_unittest.cc @@ -181,14 +181,14 @@ class ReadHandlerTester : public CefReadHandler { return 10; } - int Seek(int64 offset, int whence) override { + int Seek(int64_t offset, int whence) override { seek_called_ = true; seek_offset_ = offset; seek_whence_ = whence; return 10; } - int64 Tell() override { + int64_t Tell() override { tell_called_ = true; return 10; } @@ -206,7 +206,7 @@ class ReadHandlerTester : public CefReadHandler { size_t read_n_; bool seek_called_; - int64 seek_offset_; + int64_t seek_offset_; int seek_whence_; bool tell_called_; @@ -237,7 +237,7 @@ TEST(StreamTest, ReadHandler) { ASSERT_EQ(read_n, handler->read_n_); // CefReadHandler Seek - int64 seek_offset = 10; + int64_t seek_offset = 10; int seek_whence = SEEK_CUR; int seek_res = stream->Seek(seek_offset, seek_whence); ASSERT_TRUE(handler->seek_called_); @@ -246,7 +246,7 @@ TEST(StreamTest, ReadHandler) { ASSERT_EQ(seek_whence, handler->seek_whence_); // CefReadHandler Tell - int64 tell_res = stream->Tell(); + int64_t tell_res = stream->Tell(); ASSERT_TRUE(handler->tell_called_); ASSERT_EQ(10, tell_res); @@ -286,14 +286,14 @@ class WriteHandlerTester : public CefWriteHandler { return 10; } - int Seek(int64 offset, int whence) override { + int Seek(int64_t offset, int whence) override { seek_called_ = true; seek_offset_ = offset; seek_whence_ = whence; return 10; } - int64 Tell() override { + int64_t Tell() override { tell_called_ = true; return 10; } @@ -311,7 +311,7 @@ class WriteHandlerTester : public CefWriteHandler { size_t write_n_; bool seek_called_; - int64 seek_offset_; + int64_t seek_offset_; int seek_whence_; bool tell_called_; @@ -341,7 +341,7 @@ TEST(StreamTest, WriteHandler) { ASSERT_EQ(write_n, handler->write_n_); // CefWriteHandler Seek - int64 seek_offset = 10; + int64_t seek_offset = 10; int seek_whence = SEEK_CUR; int seek_res = stream->Seek(seek_offset, seek_whence); ASSERT_TRUE(handler->seek_called_); @@ -350,7 +350,7 @@ TEST(StreamTest, WriteHandler) { ASSERT_EQ(seek_whence, handler->seek_whence_); // CefWriteHandler Tell - int64 tell_res = stream->Tell(); + int64_t tell_res = stream->Tell(); ASSERT_TRUE(handler->tell_called_); ASSERT_EQ(10, tell_res); diff --git a/tests/ceftests/test_request.cc b/tests/ceftests/test_request.cc index 440137e50..344fa58b8 100644 --- a/tests/ceftests/test_request.cc +++ b/tests/ceftests/test_request.cc @@ -32,15 +32,15 @@ class RequestClient : public CefURLRequestClient, public State { } void OnUploadProgress(CefRefPtr request, - int64 current, - int64 total) override { + int64_t current, + int64_t total) override { upload_progress_ct_++; upload_total_ = total; } void OnDownloadProgress(CefRefPtr request, - int64 current, - int64 total) override { + int64_t current, + int64_t total) override { response_ = request->GetResponse(); DCHECK(response_.get()); DCHECK(response_->IsReadOnly()); diff --git a/tests/ceftests/test_request.h b/tests/ceftests/test_request.h index ff17c894b..904a00df8 100644 --- a/tests/ceftests/test_request.h +++ b/tests/ceftests/test_request.h @@ -29,10 +29,10 @@ struct State { int request_complete_ct_ = 0; // From OnUploadProgress. - int64 upload_total_ = 0; + int64_t upload_total_ = 0; // From OnDownloadProgress. - int64 download_total_ = 0; + int64_t download_total_ = 0; // From OnDownloadData. std::string download_data_; diff --git a/tests/ceftests/test_server.cc b/tests/ceftests/test_server.cc index 855e2cf6c..f92d0fc2d 100644 --- a/tests/ceftests/test_server.cc +++ b/tests/ceftests/test_server.cc @@ -12,7 +12,7 @@ namespace test_server { // Must use a different port than server_unittest.cc. const char kHttpServerAddress[] = "127.0.0.1"; -const uint16 kHttpServerPort = 8098; +const uint16_t kHttpServerPort = 8098; const char kIncompleteDoNotSendData[] = "DO NOT SEND"; diff --git a/tests/ceftests/test_server.h b/tests/ceftests/test_server.h index 4a1c1e531..79d0c817f 100644 --- a/tests/ceftests/test_server.h +++ b/tests/ceftests/test_server.h @@ -18,7 +18,7 @@ namespace test_server { // Use of these values is deprecated. Instead use GetOrigin/GetHost in the // browser process after server initialization. extern const char kHttpServerAddress[]; -extern const uint16 kHttpServerPort; +extern const uint16_t kHttpServerPort; // Used with incomplete tests for data that should not be sent. extern const char kIncompleteDoNotSendData[]; diff --git a/tests/ceftests/test_server_runner_normal.cc b/tests/ceftests/test_server_runner_normal.cc index c261af0c4..a376bcbb6 100644 --- a/tests/ceftests/test_server_runner_normal.cc +++ b/tests/ceftests/test_server_runner_normal.cc @@ -134,7 +134,7 @@ class ServerHandler : public CefServerHandler { } const CefString& content_type = response->GetMimeType(); - int64 content_length = static_cast(response_data.size()); + int64_t content_length = static_cast(response_data.size()); CefResponse::HeaderMap extra_headers; response->GetHeaderMap(extra_headers); diff --git a/tests/ceftests/test_server_runner_test.cc b/tests/ceftests/test_server_runner_test.cc index b80229692..f88788fee 100644 --- a/tests/ceftests/test_server_runner_test.cc +++ b/tests/ceftests/test_server_runner_test.cc @@ -31,7 +31,7 @@ class ServerHandler : public CefTestServerHandler { // Use any available port number for HTTPS and the legacy port number for // HTTP. - const uint16 port = https_server_ ? 0 : kHttpServerPort; + const uint16_t port = https_server_ ? 0 : kHttpServerPort; // Use a "localhost" domain certificate instead of IP address. This is // required for HSTS tests (see https://crbug.com/456712). diff --git a/tests/ceftests/test_server_unittest.cc b/tests/ceftests/test_server_unittest.cc index d81a51517..e2343ac73 100644 --- a/tests/ceftests/test_server_unittest.cc +++ b/tests/ceftests/test_server_unittest.cc @@ -607,12 +607,12 @@ class StaticHttpURLRequestClient : public CefURLRequestClient { } void OnUploadProgress(CefRefPtr request, - int64 current, - int64 total) override {} + int64_t current, + int64_t total) override {} void OnDownloadProgress(CefRefPtr request, - int64 current, - int64 total) override {} + int64_t current, + int64_t total) override {} void OnDownloadData(CefRefPtr request, const void* data, diff --git a/tests/ceftests/thread_helper.cc b/tests/ceftests/thread_helper.cc index 326c95dc6..64bd17f10 100644 --- a/tests/ceftests/thread_helper.cc +++ b/tests/ceftests/thread_helper.cc @@ -12,14 +12,14 @@ void SignalEvent(CefRefPtr event) { event->Signal(); } -void WaitForThread(CefThreadId thread_id, int64 delay_ms) { +void WaitForThread(CefThreadId thread_id, int64_t delay_ms) { CefRefPtr event = CefWaitableEvent::CreateWaitableEvent(true, false); CefPostDelayedTask(thread_id, base::BindOnce(SignalEvent, event), delay_ms); event->Wait(); } -void WaitForThread(CefRefPtr task_runner, int64 delay_ms) { +void WaitForThread(CefRefPtr task_runner, int64_t delay_ms) { CefRefPtr event = CefWaitableEvent::CreateWaitableEvent(true, false); task_runner->PostDelayedTask( diff --git a/tests/ceftests/thread_helper.h b/tests/ceftests/thread_helper.h index e68ecd417..3222598e1 100644 --- a/tests/ceftests/thread_helper.h +++ b/tests/ceftests/thread_helper.h @@ -15,8 +15,8 @@ void SignalEvent(CefRefPtr event); // Post a task to the specified thread and wait for the task to execute as // indication that all previously pending tasks on that thread have completed. -void WaitForThread(CefThreadId thread_id, int64 delay_ms = 0); -void WaitForThread(CefRefPtr task_runner, int64 delay_ms = 0); +void WaitForThread(CefThreadId thread_id, int64_t delay_ms = 0); +void WaitForThread(CefRefPtr task_runner, int64_t delay_ms = 0); #define WaitForIOThread() WaitForThread(TID_IO) #define WaitForUIThread() WaitForThread(TID_UI) diff --git a/tests/ceftests/tracing_unittest.cc b/tests/ceftests/tracing_unittest.cc index 25af4323d..347d95160 100644 --- a/tests/ceftests/tracing_unittest.cc +++ b/tests/ceftests/tracing_unittest.cc @@ -272,6 +272,6 @@ TRACING_TEST(TraceEventAsyncEnd1, TT_TRACE_EVENT_ASYNC_END1) TRACING_TEST(TraceEventAsyncEnd2, TT_TRACE_EVENT_ASYNC_END2) TEST(TracingTest, NowFromSystemTraceTime) { - int64 val = CefNowFromSystemTraceTime(); + int64_t val = CefNowFromSystemTraceTime(); EXPECT_NE(val, 0); } diff --git a/tests/ceftests/urlrequest_unittest.cc b/tests/ceftests/urlrequest_unittest.cc index e469ce667..f4d76a753 100644 --- a/tests/ceftests/urlrequest_unittest.cc +++ b/tests/ceftests/urlrequest_unittest.cc @@ -65,7 +65,7 @@ const char kRequestHostCustom[] = "test"; // Server backend. const char* kRequestAddressServer = test_server::kHttpServerAddress; -const uint16 kRequestPortServer = test_server::kHttpServerPort; +const uint16_t kRequestPortServer = test_server::kHttpServerPort; const char kRequestSchemeServer[] = "http"; const char kRequestSendCookieName[] = "urcookie_send"; @@ -591,7 +591,7 @@ class RequestSchemeHandlerOld : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { EXPECT_IO_THREAD(); GetNormalResponse(settings_, response); @@ -675,20 +675,20 @@ class RequestSchemeHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { EXPECT_IO_THREAD(); GetNormalResponse(settings_, response); response_length = response_data_.length() - offset_; } - bool Skip(int64 bytes_to_skip, - int64& bytes_skipped, + bool Skip(int64_t bytes_to_skip, + int64_t& bytes_skipped, CefRefPtr callback) override { size_t size = response_data_.length(); if (offset_ < size) { bytes_skipped = - std::min(bytes_to_skip, static_cast(size - offset_)); + std::min(bytes_to_skip, static_cast(size - offset_)); offset_ += bytes_skipped; } else { bytes_skipped = ERR_FAILED; @@ -777,7 +777,7 @@ class RequestRedirectSchemeHandlerOld : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { EXPECT_IO_THREAD(); @@ -851,7 +851,7 @@ class RequestRedirectSchemeHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { EXPECT_IO_THREAD(); @@ -943,7 +943,7 @@ class IncompleteSchemeHandlerOld : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { EXPECT_IO_THREAD(); EXPECT_EQ(settings_->incomplete_type, @@ -959,7 +959,7 @@ class IncompleteSchemeHandlerOld : public CefResourceHandler { settings_->response->GetHeaderMap(headerMap); settings_->response->SetHeaderMap(headerMap); - response_length = static_cast(settings_->response_data.size()); + response_length = static_cast(settings_->response_data.size()); } bool ReadResponse(void* data_out, @@ -1047,7 +1047,7 @@ class IncompleteSchemeHandler : public CefResourceHandler { } void GetResponseHeaders(CefRefPtr response, - int64& response_length, + int64_t& response_length, CefString& redirectUrl) override { EXPECT_IO_THREAD(); EXPECT_EQ(settings_->incomplete_type, @@ -1063,7 +1063,7 @@ class IncompleteSchemeHandler : public CefResourceHandler { settings_->response->GetHeaderMap(headerMap); settings_->response->SetHeaderMap(headerMap); - response_length = static_cast(settings_->response_data.size()); + response_length = static_cast(settings_->response_data.size()); } bool Read(void* data_out, @@ -2350,7 +2350,7 @@ class RequestTestRunner : public base::RefCountedThreadSafe { std::string upload_data; GetUploadData(expected_request, upload_data); - EXPECT_EQ((int64)upload_data.size(), client->upload_total_); + EXPECT_EQ((int64_t)upload_data.size(), client->upload_total_); } else { EXPECT_EQ(0, client->upload_progress_ct_); EXPECT_EQ(0, client->upload_total_); @@ -2358,8 +2358,8 @@ class RequestTestRunner : public base::RefCountedThreadSafe { if (settings_.expect_download_progress) { EXPECT_LE(1, client->download_progress_ct_); - EXPECT_EQ((int64)(settings_.response_data.size() - - settings_.expected_download_offset), + EXPECT_EQ((int64_t)(settings_.response_data.size() - + settings_.expected_download_offset), client->download_total_); } else { EXPECT_EQ(0, client->download_progress_ct_); @@ -3074,14 +3074,14 @@ class InvalidURLTestClient : public CefURLRequestClient { } void OnUploadProgress(CefRefPtr request, - int64 current, - int64 total) override { + int64_t current, + int64_t total) override { EXPECT_TRUE(false); // Not reached. } void OnDownloadProgress(CefRefPtr request, - int64 current, - int64 total) override { + int64_t current, + int64_t total) override { EXPECT_TRUE(false); // Not reached. } diff --git a/tests/ceftests/v8_unittest.cc b/tests/ceftests/v8_unittest.cc index 868c98685..a84d55a98 100644 --- a/tests/ceftests/v8_unittest.cc +++ b/tests/ceftests/v8_unittest.cc @@ -331,7 +331,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, EXPECT_TRUE(value->IsUInt()); EXPECT_TRUE(value->IsDouble()); EXPECT_EQ(12, value->GetIntValue()); - EXPECT_EQ((uint32)12, value->GetUIntValue()); + EXPECT_EQ((uint32_t)12, value->GetUIntValue()); EXPECT_EQ(12, value->GetDoubleValue()); EXPECT_FALSE(value->IsUndefined()); @@ -354,7 +354,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, EXPECT_TRUE(value->IsUInt()); EXPECT_TRUE(value->IsDouble()); EXPECT_EQ(12, value->GetIntValue()); - EXPECT_EQ((uint32)12, value->GetUIntValue()); + EXPECT_EQ((uint32_t)12, value->GetUIntValue()); EXPECT_EQ(12, value->GetDoubleValue()); EXPECT_FALSE(value->IsUndefined()); @@ -1022,7 +1022,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, static const char* kName3 = "val3"; static const int kValue1 = 20; - static const uint32 kValue2 = 30u; + static const uint32_t kValue2 = 30u; static const char* kValue3 = "40"; static const int kArray[] = {50, 60, 70}; diff --git a/tests/ceftests/views/textfield_unittest.cc b/tests/ceftests/views/textfield_unittest.cc index 07181d60e..aba91188a 100644 --- a/tests/ceftests/views/textfield_unittest.cc +++ b/tests/ceftests/views/textfield_unittest.cc @@ -195,7 +195,7 @@ const int kTextfieldID = 1; // Contents need to be supported by the TranslateKey function. const char kTestInputMessage[] = "Test Message"; -void TranslateKey(int c, int* keycode, uint32* modifiers) { +void TranslateKey(int c, int* keycode, uint32_t* modifiers) { *keycode = VKEY_UNKNOWN; *modifiers = 0; @@ -228,7 +228,7 @@ class TestTextfieldDelegate : public CefTextfieldDelegate { if (event.type == KEYEVENT_CHAR) { int keycode; - uint32 modifiers; + uint32_t modifiers; TranslateKey(kTestInputMessage[index_++], &keycode, &modifiers); EXPECT_EQ(keycode, event.windows_key_code); @@ -288,7 +288,7 @@ void RunTextfieldKeyEvent(CefRefPtr window) { // Send the contents of |kTestInputMessage| to the textfield. for (size_t i = 0; i < sizeof(kTestInputMessage) - 1; ++i) { int keycode; - uint32 modifiers; + uint32_t modifiers; TranslateKey(kTestInputMessage[i], &keycode, &modifiers); window->SendKeyPress(keycode, modifiers); } diff --git a/tests/shared/browser/client_app_browser.cc b/tests/shared/browser/client_app_browser.cc index f0a5dd48f..242d0cbbf 100644 --- a/tests/shared/browser/client_app_browser.cc +++ b/tests/shared/browser/client_app_browser.cc @@ -107,7 +107,7 @@ void ClientAppBrowser::OnBeforeChildProcessLaunch( } } -void ClientAppBrowser::OnScheduleMessagePumpWork(int64 delay) { +void ClientAppBrowser::OnScheduleMessagePumpWork(int64_t delay) { // Only used when `--external-message-pump` is passed via the command-line. MainMessageLoopExternalPump* message_pump = MainMessageLoopExternalPump::Get(); diff --git a/tests/shared/browser/client_app_browser.h b/tests/shared/browser/client_app_browser.h index fc743096c..469d18bc8 100644 --- a/tests/shared/browser/client_app_browser.h +++ b/tests/shared/browser/client_app_browser.h @@ -75,7 +75,7 @@ class ClientAppBrowser : public ClientApp, public CefBrowserProcessHandler { void OnContextInitialized() override; void OnBeforeChildProcessLaunch( CefRefPtr command_line) override; - void OnScheduleMessagePumpWork(int64 delay) override; + void OnScheduleMessagePumpWork(int64_t delay) override; CefRefPtr GetDefaultClient() override; // Set of supported Delegates. diff --git a/tests/shared/browser/main_message_loop_external_pump.cc b/tests/shared/browser/main_message_loop_external_pump.cc index 6579e87bd..fa16774a1 100644 --- a/tests/shared/browser/main_message_loop_external_pump.cc +++ b/tests/shared/browser/main_message_loop_external_pump.cc @@ -16,11 +16,11 @@ namespace { // Special timer delay placeholder value. Intentionally 32-bit for Windows and // OS X platform API compatibility. -const int32 kTimerDelayPlaceholder = INT_MAX; +const int32_t kTimerDelayPlaceholder = INT_MAX; // The maximum number of milliseconds we're willing to wait between calls to // DoWork(). -const int64 kMaxTimerDelay = 1000 / 30; // 30fps +const int64_t kMaxTimerDelay = 1000 / 30; // 30fps client::MainMessageLoopExternalPump* g_external_message_pump = nullptr; @@ -40,7 +40,7 @@ MainMessageLoopExternalPump* MainMessageLoopExternalPump::Get() { return g_external_message_pump; } -void MainMessageLoopExternalPump::OnScheduleWork(int64 delay_ms) { +void MainMessageLoopExternalPump::OnScheduleWork(int64_t delay_ms) { REQUIRE_MAIN_THREAD(); if (delay_ms == kTimerDelayPlaceholder && IsTimerPending()) { diff --git a/tests/shared/browser/main_message_loop_external_pump.h b/tests/shared/browser/main_message_loop_external_pump.h index fa3236ea2..c64a5c427 100644 --- a/tests/shared/browser/main_message_loop_external_pump.h +++ b/tests/shared/browser/main_message_loop_external_pump.h @@ -32,7 +32,7 @@ class MainMessageLoopExternalPump : public MainMessageLoopStd { // Called from CefBrowserProcessHandler::OnScheduleMessagePumpWork() on any // thread. The platform subclass must implement this method and schedule a // call to OnScheduleWork() on the main application thread. - virtual void OnScheduleMessagePumpWork(int64 delay_ms) = 0; + virtual void OnScheduleMessagePumpWork(int64_t delay_ms) = 0; protected: // Only allow deletion via std::unique_ptr. @@ -44,7 +44,7 @@ class MainMessageLoopExternalPump : public MainMessageLoopStd { // The platform subclass calls this method on the main application thread in // response to the OnScheduleMessagePumpWork() call. - void OnScheduleWork(int64 delay_ms); + void OnScheduleWork(int64_t delay_ms); // The platform subclass calls this method on the main application thread when // the pending work timer times out. @@ -52,7 +52,7 @@ class MainMessageLoopExternalPump : public MainMessageLoopStd { // Control the pending work timer in the platform subclass. Only called on // the main application thread. - virtual void SetTimer(int64 delay_ms) = 0; + virtual void SetTimer(int64_t delay_ms) = 0; virtual void KillTimer() = 0; virtual bool IsTimerPending() = 0; diff --git a/tests/shared/browser/main_message_loop_external_pump_linux.cc b/tests/shared/browser/main_message_loop_external_pump_linux.cc index 5f94afc3a..332b5020e 100644 --- a/tests/shared/browser/main_message_loop_external_pump_linux.cc +++ b/tests/shared/browser/main_message_loop_external_pump_linux.cc @@ -62,7 +62,7 @@ class MainMessageLoopExternalPumpLinux : public MainMessageLoopExternalPump { int Run() override; // MainMessageLoopExternalPump methods: - void OnScheduleMessagePumpWork(int64 delay_ms) override; + void OnScheduleMessagePumpWork(int64_t delay_ms) override; // Internal methods used for processing the pump callbacks. They are public // for simplicity but should not be used directly. HandlePrepare is called @@ -76,7 +76,7 @@ class MainMessageLoopExternalPumpLinux : public MainMessageLoopExternalPump { protected: // MainMessageLoopExternalPump methods: - void SetTimer(int64 delay_ms) override; + void SetTimer(int64_t delay_ms) override; void KillTimer() override; bool IsTimerPending() override; @@ -226,12 +226,12 @@ int MainMessageLoopExternalPumpLinux::Run() { } void MainMessageLoopExternalPumpLinux::OnScheduleMessagePumpWork( - int64 delay_ms) { + int64_t delay_ms) { // This can be called on any thread, so we don't want to touch any state // variables as we would then need locks all over. This ensures that if we // are sleeping in a poll that we will wake up. - if (HANDLE_EINTR(write(wakeup_pipe_write_, &delay_ms, sizeof(int64))) != - sizeof(int64)) { + if (HANDLE_EINTR(write(wakeup_pipe_write_, &delay_ms, sizeof(int64_t))) != + sizeof(int64_t)) { NOTREACHED() << "Could not write to the UI message loop wakeup pipe!"; } } @@ -250,16 +250,16 @@ bool MainMessageLoopExternalPumpLinux::HandleCheck() { // The glib poll will tell us whether there was data, so this read shouldn't // block. if (wakeup_gpollfd_->revents & G_IO_IN) { - int64 delay_ms[2]; + int64_t delay_ms[2]; const size_t num_bytes = - HANDLE_EINTR(read(wakeup_pipe_read_, delay_ms, sizeof(int64) * 2)); - if (num_bytes < sizeof(int64)) { + HANDLE_EINTR(read(wakeup_pipe_read_, delay_ms, sizeof(int64_t) * 2)); + if (num_bytes < sizeof(int64_t)) { NOTREACHED() << "Error reading from the wakeup pipe."; } - if (num_bytes == sizeof(int64)) { + if (num_bytes == sizeof(int64_t)) { OnScheduleWork(delay_ms[0]); } - if (num_bytes == sizeof(int64) * 2) { + if (num_bytes == sizeof(int64_t) * 2) { OnScheduleWork(delay_ms[1]); } } @@ -277,7 +277,7 @@ void MainMessageLoopExternalPumpLinux::HandleDispatch() { OnTimerTimeout(); } -void MainMessageLoopExternalPumpLinux::SetTimer(int64 delay_ms) { +void MainMessageLoopExternalPumpLinux::SetTimer(int64_t delay_ms) { DCHECK_GT(delay_ms, 0); CefTime now; diff --git a/tests/shared/browser/main_message_loop_external_pump_mac.mm b/tests/shared/browser/main_message_loop_external_pump_mac.mm index 323997fe8..c896b6188 100644 --- a/tests/shared/browser/main_message_loop_external_pump_mac.mm +++ b/tests/shared/browser/main_message_loop_external_pump_mac.mm @@ -25,16 +25,16 @@ class MainMessageLoopExternalPumpMac : public MainMessageLoopExternalPump { int Run() override; // MainMessageLoopExternalPump methods: - void OnScheduleMessagePumpWork(int64 delay_ms) override; + void OnScheduleMessagePumpWork(int64_t delay_ms) override; // Internal methods used for processing the event callbacks. They are public // for simplicity but should not be used directly. - void HandleScheduleWork(int64 delay_ms); + void HandleScheduleWork(int64_t delay_ms); void HandleTimerTimeout(); protected: // MainMessageLoopExternalPump methods: - void SetTimer(int64 delay_ms) override; + void SetTimer(int64_t delay_ms) override; void KillTimer() override; bool IsTimerPending() override { return timer_ != nil; } @@ -127,7 +127,8 @@ int MainMessageLoopExternalPumpMac::Run() { return 0; } -void MainMessageLoopExternalPumpMac::OnScheduleMessagePumpWork(int64 delay_ms) { +void MainMessageLoopExternalPumpMac::OnScheduleMessagePumpWork( + int64_t delay_ms) { // This method may be called on any thread. NSNumber* number = [NSNumber numberWithInt:static_cast(delay_ms)]; [event_handler_ performSelector:@selector(scheduleWork:) @@ -136,7 +137,7 @@ void MainMessageLoopExternalPumpMac::OnScheduleMessagePumpWork(int64 delay_ms) { waitUntilDone:NO]; } -void MainMessageLoopExternalPumpMac::HandleScheduleWork(int64 delay_ms) { +void MainMessageLoopExternalPumpMac::HandleScheduleWork(int64_t delay_ms) { OnScheduleWork(delay_ms); } @@ -144,7 +145,7 @@ void MainMessageLoopExternalPumpMac::HandleTimerTimeout() { OnTimerTimeout(); } -void MainMessageLoopExternalPumpMac::SetTimer(int64 delay_ms) { +void MainMessageLoopExternalPumpMac::SetTimer(int64_t delay_ms) { DCHECK_GT(delay_ms, 0); DCHECK(!timer_); diff --git a/tests/shared/browser/main_message_loop_external_pump_win.cc b/tests/shared/browser/main_message_loop_external_pump_win.cc index 36fca5036..9063ac746 100644 --- a/tests/shared/browser/main_message_loop_external_pump_win.cc +++ b/tests/shared/browser/main_message_loop_external_pump_win.cc @@ -29,11 +29,11 @@ class MainMessageLoopExternalPumpWin : public MainMessageLoopExternalPump { int Run() override; // MainMessageLoopExternalPump methods: - void OnScheduleMessagePumpWork(int64 delay_ms) override; + void OnScheduleMessagePumpWork(int64_t delay_ms) override; protected: // MainMessageLoopExternalPump methods: - void SetTimer(int64 delay_ms) override; + void SetTimer(int64_t delay_ms) override; void KillTimer() override; bool IsTimerPending() override { return timer_pending_; } @@ -104,13 +104,14 @@ int MainMessageLoopExternalPumpWin::Run() { return 0; } -void MainMessageLoopExternalPumpWin::OnScheduleMessagePumpWork(int64 delay_ms) { +void MainMessageLoopExternalPumpWin::OnScheduleMessagePumpWork( + int64_t delay_ms) { // This method may be called on any thread. PostMessage(main_thread_target_, kMsgHaveWork, 0, static_cast(delay_ms)); } -void MainMessageLoopExternalPumpWin::SetTimer(int64 delay_ms) { +void MainMessageLoopExternalPumpWin::SetTimer(int64_t delay_ms) { DCHECK(!timer_pending_); DCHECK_GT(delay_ms, 0); timer_pending_ = true; @@ -134,7 +135,7 @@ LRESULT CALLBACK MainMessageLoopExternalPumpWin::WndProc(HWND hwnd, GetUserDataPtr(hwnd); if (msg == kMsgHaveWork) { // OnScheduleMessagePumpWork() request. - const int64 delay_ms = static_cast(lparam); + const int64_t delay_ms = static_cast(lparam); message_loop->OnScheduleWork(delay_ms); } else { // Timer timed out. diff --git a/tools/cef_parser.py b/tools/cef_parser.py index 57abf78d1..3e0e219dd 100644 --- a/tools/cef_parser.py +++ b/tools/cef_parser.py @@ -361,12 +361,12 @@ _simpletypes = { 'void': ['void', ''], 'void*': ['void*', 'NULL'], 'int': ['int', '0'], - 'int16': ['int16', '0'], - 'uint16': ['uint16', '0'], - 'int32': ['int32', '0'], - 'uint32': ['uint32', '0'], - 'int64': ['int64', '0'], - 'uint64': ['uint64', '0'], + 'int16_t': ['int16_t', '0'], + 'uint16_t': ['uint16_t', '0'], + 'int32_t': ['int32_t', '0'], + 'uint32_t': ['uint32_t', '0'], + 'int64_t': ['int64_t', '0'], + 'uint64_t': ['uint64_t', '0'], 'double': ['double', '0'], 'float': ['float', '0'], 'float*': ['float*', 'NULL'], @@ -571,8 +571,12 @@ class obj_header: filename = os.path.relpath(filepath, self.root_directory) filename = filename.replace('\\', '/') - # read the input file into memory - self.add_data(filename, read_file(filepath)) + try: + # read the input file into memory + self.add_data(filename, read_file(filepath)) + except Exception: + print('Exception while parsing %s' % filepath) + raise def add_data(self, filename, data): """ Add header file contents. """