mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 107.0.5304.0 (#1047731)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git base/BUILD.gn base/BUILD.gn
|
||||
index 20e49fa40d823..9e18a2b2dc6c0 100644
|
||||
index 60fdc3b8e47ed..fee7412fb46ce 100644
|
||||
--- base/BUILD.gn
|
||||
+++ base/BUILD.gn
|
||||
@@ -37,6 +37,7 @@ import("//build/nocompile.gni")
|
||||
@@ -10,7 +10,7 @@ index 20e49fa40d823..9e18a2b2dc6c0 100644
|
||||
import("//testing/libfuzzer/fuzzer_test.gni")
|
||||
import("//testing/test.gni")
|
||||
|
||||
@@ -1957,7 +1958,11 @@ mixed_component("base") {
|
||||
@@ -1971,7 +1972,11 @@ mixed_component("base") {
|
||||
"hash/md5_constexpr_internal.h",
|
||||
"hash/sha1.h",
|
||||
]
|
||||
@@ -23,7 +23,7 @@ index 20e49fa40d823..9e18a2b2dc6c0 100644
|
||||
sources += [
|
||||
"hash/md5_nacl.cc",
|
||||
"hash/md5_nacl.h",
|
||||
@@ -2107,6 +2112,12 @@ mixed_component("base") {
|
||||
@@ -2112,6 +2117,12 @@ mixed_component("base") {
|
||||
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ index 20e49fa40d823..9e18a2b2dc6c0 100644
|
||||
"cfgmgr32.lib",
|
||||
"powrprof.lib",
|
||||
diff --git base/allocator/dispatcher/dispatcher.cc base/allocator/dispatcher/dispatcher.cc
|
||||
index b6ecb1c5640ea..892c011336706 100644
|
||||
index 4a1bf8191ba2c..1fed45b2ac0d9 100644
|
||||
--- base/allocator/dispatcher/dispatcher.cc
|
||||
+++ base/allocator/dispatcher/dispatcher.cc
|
||||
@@ -13,6 +13,7 @@
|
||||
@@ -55,10 +55,10 @@ index b6ecb1c5640ea..892c011336706 100644
|
||||
-#if DCHECK_IS_ON()
|
||||
+#if DCHECK_IS_ON() && !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
||||
DCHECK([&]() {
|
||||
auto const was_set = is_initialized_check_flag_.test();
|
||||
auto const was_set = is_initialized_check_flag_.test_and_set();
|
||||
is_initialized_check_flag_.clear();
|
||||
diff --git base/hash/md5.h base/hash/md5.h
|
||||
index ea6bbd31e3fc8..9941050ac0113 100644
|
||||
index aa889f350e8f7..50acac8a69225 100644
|
||||
--- base/hash/md5.h
|
||||
+++ base/hash/md5.h
|
||||
@@ -10,8 +10,9 @@
|
||||
@@ -73,7 +73,7 @@ index ea6bbd31e3fc8..9941050ac0113 100644
|
||||
#else
|
||||
#include "base/hash/md5_boringssl.h"
|
||||
diff --git base/hash/sha1.h base/hash/sha1.h
|
||||
index c4e656b9a68ef..8eb01343cd5d1 100644
|
||||
index 29626e5853c6e..2fb1c61504c5d 100644
|
||||
--- base/hash/sha1.h
|
||||
+++ base/hash/sha1.h
|
||||
@@ -14,7 +14,9 @@
|
||||
@@ -87,8 +87,55 @@ index c4e656b9a68ef..8eb01343cd5d1 100644
|
||||
#include "base/hash/sha1_nacl.h"
|
||||
#else
|
||||
#include "base/hash/sha1_boringssl.h"
|
||||
diff --git base/rand_util_win.cc base/rand_util_win.cc
|
||||
index 0a81ed63d1e3c..b08ff362d511e 100644
|
||||
--- base/rand_util_win.cc
|
||||
+++ base/rand_util_win.cc
|
||||
@@ -20,14 +20,19 @@
|
||||
#include <limits>
|
||||
|
||||
#include "base/check.h"
|
||||
+#include "cef/libcef/features/features.h"
|
||||
+
|
||||
+#if !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
||||
#include "base/feature_list.h"
|
||||
#include "third_party/boringssl/src/include/openssl/crypto.h"
|
||||
#include "third_party/boringssl/src/include/openssl/rand.h"
|
||||
+#endif
|
||||
|
||||
namespace base {
|
||||
|
||||
namespace internal {
|
||||
|
||||
+#if !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
||||
namespace {
|
||||
|
||||
// The BoringSSl helpers are duplicated in rand_util_fuchsia.cc and
|
||||
@@ -48,9 +53,14 @@ bool UseBoringSSLForRandBytes() {
|
||||
return g_use_boringssl.load(std::memory_order_relaxed);
|
||||
}
|
||||
|
||||
+#else // !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
||||
+void ConfigureBoringSSLBackedRandBytesFieldTrial() {}
|
||||
+#endif
|
||||
+
|
||||
} // namespace internal
|
||||
|
||||
void RandBytes(void* output, size_t output_length) {
|
||||
+#if !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
||||
if (internal::UseBoringSSLForRandBytes()) {
|
||||
// Ensure BoringSSL is initialized so it can use things like RDRAND.
|
||||
CRYPTO_library_init();
|
||||
@@ -58,6 +68,7 @@ void RandBytes(void* output, size_t output_length) {
|
||||
(void)RAND_bytes(static_cast<uint8_t*>(output), output_length);
|
||||
return;
|
||||
}
|
||||
+#endif // !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
||||
|
||||
char* output_ptr = static_cast<char*>(output);
|
||||
while (output_length > 0) {
|
||||
diff --git base/unguessable_token.cc base/unguessable_token.cc
|
||||
index 04ea514c6ce35..4f69b8a7f87f3 100644
|
||||
index dcef8fbda4493..c8034ebc44b23 100644
|
||||
--- base/unguessable_token.cc
|
||||
+++ base/unguessable_token.cc
|
||||
@@ -9,8 +9,9 @@
|
||||
|
Reference in New Issue
Block a user