bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update generated files for int/char typedef removal (see #3507)

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-06-01 17:07:20 +03:00
parent 5042d71408
commit b854992ae6
102 changed files with 377 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libcef_dll/wrapper/cef_byte_read_handler.cc
View File

@@ -22,7 +22,7 @@ size_t CefByteReadHandler::Read(void* ptr, size_t size, size_t n) {
return ret;
}
int CefByteReadHandler::Seek(int64 offset, int whence) {
int CefByteReadHandler::Seek(int64_t offset, int whence) {
int rv = -1L;
base::AutoLock lock_scope(lock_);
switch (whence) {
@@ -35,9 +35,9 @@ int CefByteReadHandler::Seek(int64 offset, int whence) {
break;
case SEEK_END: {
#if defined(OS_WIN)
int64 offset_abs = _abs64(offset);
int64_t offset_abs = _abs64(offset);
#else
int64 offset_abs = std::abs(offset);
int64_t offset_abs = std::abs(offset);
#endif
if (offset_abs > size_) {
break;
@@ -58,7 +58,7 @@ int CefByteReadHandler::Seek(int64 offset, int whence) {
return rv;
}
int64 CefByteReadHandler::Tell() {
int64_t CefByteReadHandler::Tell() {
base::AutoLock lock_scope(lock_);
return offset_;
}

4
libcef_dll/wrapper/cef_closure_task.cc
View File

@@ -67,14 +67,14 @@ bool CefPostTask(CefThreadId threadId, const base::RepeatingClosure& closure) {
bool CefPostDelayedTask(CefThreadId threadId,
base::OnceClosure closure,
int64 delay_ms) {
int64_t delay_ms) {
return CefPostDelayedTask(
threadId, new CefOnceClosureTask(std::move(closure)), delay_ms);
}
bool CefPostDelayedTask(CefThreadId threadId,
const base::RepeatingClosure& closure,
int64 delay_ms) {
int64_t delay_ms) {
return CefPostDelayedTask(threadId, new CefRepeatingClosureTask(closure),
delay_ms);
}

18
libcef_dll/wrapper/cef_message_router.cc
View File

@@ -193,7 +193,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
public:
CallbackImpl(CefRefPtr<CefMessageRouterBrowserSideImpl> router,
int browser_id,
int64 query_id,
int64_t query_id,
bool persistent)
: router_(router),
browser_id_(browser_id),
@@ -259,7 +259,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
private:
CefRefPtr<CefMessageRouterBrowserSideImpl> router_;
const int browser_id_;
const int64 query_id_;
const int64_t query_id_;
const bool persistent_;
IMPLEMENT_REFCOUNTING(CallbackImpl);
@@ -393,7 +393,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
}
const int browser_id = browser->GetIdentifier();
const int64 query_id = query_id_generator_.GetNextId();
const int64_t query_id = query_id_generator_.GetNextId();
CefRefPtr<CallbackImpl> callback(
new CallbackImpl(this, browser_id, query_id, persistent));
@@ -484,7 +484,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
// if the query is non-persistent. If |removed| is true the caller is
// responsible for deleting the returned QueryInfo object.
QueryInfo* GetQueryInfo(int browser_id,
int64 query_id,
int64_t query_id,
bool always_remove,
bool* removed) {
class Visitor : public BrowserQueryInfoMap::Visitor {
@@ -518,7 +518,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
// Called by CallbackImpl on success.
void OnCallbackSuccess(int browser_id,
int64 query_id,
int64_t query_id,
const CefString& response) {
CEF_REQUIRE_UI_THREAD();
@@ -534,7 +534,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
// Called by CallbackImpl on failure.
void OnCallbackFailure(int browser_id,
int64 query_id,
int64_t query_id,
int error_code,
const CefString& error_message) {
CEF_REQUIRE_UI_THREAD();
@@ -599,7 +599,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
}
// Cancel a query that has already been sent to a handler.
void CancelQuery(int64 query_id, QueryInfo* info, bool notify_renderer) {
void CancelQuery(int64_t query_id, QueryInfo* info, bool notify_renderer) {
if (notify_renderer) {
SendQueryFailure(info, kCanceledErrorCode, kCanceledErrorMessage);
}
@@ -707,7 +707,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
const std::string query_message_name_;
const std::string cancel_message_name_;
IdGenerator<int64> query_id_generator_;
IdGenerator<int64_t> query_id_generator_;
// Set of currently registered handlers. An entry is added when a handler is
// registered and removed when a handler is unregistered.
@@ -718,7 +718,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
// indicates that it will handle the query and removed when either the query
// is completed via the Callback, the query is explicitly canceled from the
// renderer process, or the associated context is (or will be) released.
using BrowserQueryInfoMap = CefBrowserInfoMap<int64, QueryInfo*>;
using BrowserQueryInfoMap = CefBrowserInfoMap<int64_t, QueryInfo*>;
BrowserQueryInfoMap browser_query_info_map_;
};

2
libcef_dll/wrapper/cef_stream_resource_handler.cc
View File

@@ -46,7 +46,7 @@ bool CefStreamResourceHandler::Open(CefRefPtr<CefRequest> request,
void CefStreamResourceHandler::GetResponseHeaders(
CefRefPtr<CefResponse> response,
int64& response_length,
int64_t& response_length,
CefString& redirectUrl) {
CEF_REQUIRE_IO_THREAD();

70
libcef_dll/wrapper/libcef_dll_dylib.cc
View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=b974b66c129de2b11c6b3fe38a60f695e7d67edd$
// $hash=bcad216e5fef8b9c10a895524f8b1201608138f9$
//
#include <dlfcn.h>
@@ -811,7 +811,7 @@ int cef_post_task(cef_thread_id_t threadId, struct _cef_task_t* task) {
NO_SANITIZE("cfi-icall")
int cef_post_delayed_task(cef_thread_id_t threadId,
struct _cef_task_t* task,
int64 delay_ms) {
int64_t delay_ms) {
return g_libcef_pointers.cef_post_delayed_task(threadId, task, delay_ms);
}
@@ -827,7 +827,7 @@ int cef_end_tracing(const cef_string_t* tracing_file,
return g_libcef_pointers.cef_end_tracing(tracing_file, callback);
}
NO_SANITIZE("cfi-icall") int64 cef_now_from_system_trace_time() {
NO_SANITIZE("cfi-icall") int64_t cef_now_from_system_trace_time() {
return g_libcef_pointers.cef_now_from_system_trace_time();
}
@@ -971,7 +971,7 @@ NO_SANITIZE("cfi-icall") struct _cef_response_t* cef_response_create() {
NO_SANITIZE("cfi-icall")
void cef_server_create(const cef_string_t* address,
uint16 port,
uint16_t port,
int backlog,
struct _cef_server_handler_t* handler) {
g_libcef_pointers.cef_server_create(address, port, backlog, handler);
@@ -1074,12 +1074,12 @@ struct _cef_v8value_t* cef_v8value_create_bool(int value) {
}
NO_SANITIZE("cfi-icall")
struct _cef_v8value_t* cef_v8value_create_int(int32 value) {
struct _cef_v8value_t* cef_v8value_create_int(int32_t value) {
return g_libcef_pointers.cef_v8value_create_int(value);
}
NO_SANITIZE("cfi-icall")
struct _cef_v8value_t* cef_v8value_create_uint(uint32 value) {
struct _cef_v8value_t* cef_v8value_create_uint(uint32_t value) {
return g_libcef_pointers.cef_v8value_create_uint(value);
}
@@ -1178,7 +1178,7 @@ struct _cef_zip_reader_t* cef_zip_reader_create(
NO_SANITIZE("cfi-icall")
struct _cef_test_server_t* cef_test_server_create_and_start(
uint16 port,
uint16_t port,
int https_server,
cef_test_cert_type_t https_cert_type,
struct _cef_test_server_handler_t* handler) {
@@ -1511,7 +1511,7 @@ int cef_string_utf8_set(const char* src,
}
NO_SANITIZE("cfi-icall")
int cef_string_utf16_set(const char16* src,
int cef_string_utf16_set(const char16_t* src,
size_t src_len,
cef_string_utf16_t* output,
int copy) {
@@ -1570,7 +1570,7 @@ int cef_string_wide_to_utf16(const wchar_t* src,
}
NO_SANITIZE("cfi-icall")
int cef_string_utf16_to_wide(const char16* src,
int cef_string_utf16_to_wide(const char16_t* src,
size_t src_len,
cef_string_wide_t* output) {
return g_libcef_pointers.cef_string_utf16_to_wide(src, src_len, output);
@@ -1584,7 +1584,7 @@ int cef_string_utf8_to_utf16(const char* src,
}
NO_SANITIZE("cfi-icall")
int cef_string_utf16_to_utf8(const char16* src,
int cef_string_utf16_to_utf8(const char16_t* src,
size_t src_len,
cef_string_utf8_t* output) {
return g_libcef_pointers.cef_string_utf16_to_utf8(src, src_len, output);
@@ -1635,14 +1635,14 @@ void cef_string_userfree_utf16_free(cef_string_userfree_utf16_t str) {
}
NO_SANITIZE("cfi-icall")
int cef_string_utf16_to_lower(const char16* src,
int cef_string_utf16_to_lower(const char16_t* src,
size_t src_len,
cef_string_utf16_t* output) {
return g_libcef_pointers.cef_string_utf16_to_lower(src, src_len, output);
}
NO_SANITIZE("cfi-icall")
int cef_string_utf16_to_upper(const char16* src,
int cef_string_utf16_to_upper(const char16_t* src,
size_t src_len,
cef_string_utf16_t* output) {
return g_libcef_pointers.cef_string_utf16_to_upper(src, src_len, output);
@@ -1707,9 +1707,9 @@ NO_SANITIZE("cfi-icall")
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) {
g_libcef_pointers.cef_trace_event_instant(category, name, arg1_name, arg1_val,
arg2_name, arg2_val);
}
@@ -1718,9 +1718,9 @@ NO_SANITIZE("cfi-icall")
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) {
g_libcef_pointers.cef_trace_event_begin(category, name, arg1_name, arg1_val,
arg2_name, arg2_val);
}
@@ -1729,9 +1729,9 @@ NO_SANITIZE("cfi-icall")
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) {
g_libcef_pointers.cef_trace_event_end(category, name, arg1_name, arg1_val,
arg2_name, arg2_val);
}
@@ -1740,9 +1740,9 @@ NO_SANITIZE("cfi-icall")
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) {
g_libcef_pointers.cef_trace_counter(category, name, value1_name, value1_val,
value2_name, value2_val);
}
@@ -1750,11 +1750,11 @@ void cef_trace_counter(const char* category,
NO_SANITIZE("cfi-icall")
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) {
g_libcef_pointers.cef_trace_counter_id(category, name, id, value1_name,
value1_val, value2_name, value2_val);
}
@@ -1762,11 +1762,11 @@ void cef_trace_counter_id(const char* category,
NO_SANITIZE("cfi-icall")
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) {
g_libcef_pointers.cef_trace_event_async_begin(category, name, id, arg1_name,
arg1_val, arg2_name, arg2_val);
}
@@ -1774,10 +1774,10 @@ void cef_trace_event_async_begin(const char* category,
NO_SANITIZE("cfi-icall")
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) {
g_libcef_pointers.cef_trace_event_async_step_into(category, name, id, step,
arg1_name, arg1_val);
}
@@ -1785,10 +1785,10 @@ void cef_trace_event_async_step_into(const char* category,
NO_SANITIZE("cfi-icall")
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) {
g_libcef_pointers.cef_trace_event_async_step_past(category, name, id, step,
arg1_name, arg1_val);
}
@@ -1796,11 +1796,11 @@ void cef_trace_event_async_step_past(const char* category,
NO_SANITIZE("cfi-icall")
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) {
g_libcef_pointers.cef_trace_event_async_end(category, name, id, arg1_name,
arg1_val, arg2_name, arg2_val);
}

8
libcef_dll/wrapper/libcef_dll_wrapper.cc
View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=e07503ba9fccaa021319d3857d437b4441947070$
// $hash=231eb074788457c6fa690d3c82731c5334f322b2$
//
#include "include/capi/cef_app_capi.h"
@@ -760,7 +760,7 @@ CEF_GLOBAL bool CefPostTask(CefThreadId threadId, CefRefPtr<CefTask> task) {
NO_SANITIZE("cfi-icall")
CEF_GLOBAL bool CefPostDelayedTask(CefThreadId threadId,
CefRefPtr<CefTask> task,
int64 delay_ms) {
int64_t delay_ms) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: task; type: refptr_diff
@@ -807,11 +807,11 @@ CEF_GLOBAL bool CefEndTracing(const CefString& tracing_file,
return _retval ? true : false;
}
NO_SANITIZE("cfi-icall") CEF_GLOBAL int64 CefNowFromSystemTraceTime() {
NO_SANITIZE("cfi-icall") CEF_GLOBAL int64_t CefNowFromSystemTraceTime() {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int64 _retval = cef_now_from_system_trace_time();
int64_t _retval = cef_now_from_system_trace_time();
// Return type: simple
return _retval;