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 to Chromium version 121.0.6167.0 (#1233107)

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-12-06 15:16:15 -05:00
parent 2f0b00f8f5
commit 80c65f25a3
122 changed files with 1044 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/internal/cef_string_wrappers.h
View File

@ -99,7 +99,7 @@ struct CefStringTraitsWide {
static inline bool from_wstring(const std::wstring& str, struct_type* s) {
return from_wstring(str.data(), str.length(), s);
}
#if defined(WCHAR_T_IS_UTF32)
#if defined(WCHAR_T_IS_32_BIT)
static inline std::u16string to_string16(const struct_type* s) {
cef_string_utf16_t cstr;
memset(&cstr, 0, sizeof(cstr));
@ -120,7 +120,7 @@ struct CefStringTraitsWide {
? true
: false;
}
#else // WCHAR_T_IS_UTF32
#elif defined(WCHAR_T_IS_16_BIT)
static inline std::u16string to_string16(const struct_type* s) {
return std::u16string(
reinterpret_cast<const std::u16string::value_type*>(s->str), s->length);
@ -133,7 +133,7 @@ struct CefStringTraitsWide {
? true
: false;
}
#endif // WCHAR_T_IS_UTF32
#endif // WCHAR_T_IS_16_BIT
static inline bool from_string16(const std::u16string& str, struct_type* s) {
return from_string16(str.data(), str.length(), s);
}
@ -271,7 +271,7 @@ struct CefStringTraitsUTF16 {
static inline bool from_string(const std::string& str, struct_type* s) {
return from_string(str.data(), str.length(), s);
}
#if defined(WCHAR_T_IS_UTF32)
#if defined(WCHAR_T_IS_32_BIT)
static inline std::wstring to_wstring(const struct_type* s) {
cef_string_wide_t cstr;
memset(&cstr, 0, sizeof(cstr));
@ -288,7 +288,7 @@ struct CefStringTraitsUTF16 {
struct_type* s) {
return cef_string_wide_to_utf16(data, length, s) ? true : false;
}
#else // WCHAR_T_IS_UTF32
#elif defined(WCHAR_T_IS_16_BIT)
static inline std::wstring to_wstring(const struct_type* s) {
return std::wstring(reinterpret_cast<wchar_t*>(s->str), s->length);
}
@ -300,7 +300,7 @@ struct CefStringTraitsUTF16 {
? true
: false;
}
#endif // WCHAR_T_IS_UTF32
#endif // WCHAR_T_IS_16_BIT
static inline bool from_wstring(const std::wstring& str, struct_type* s) {
return from_wstring(str.data(), str.length(), s);
}