mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 94.0.4606.0 (#911515)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git base/BUILD.gn base/BUILD.gn
|
||||
index 576bd49a6198f..d5872f293f7cc 100644
|
||||
index bafc85477602d..7672916319fa9 100644
|
||||
--- base/BUILD.gn
|
||||
+++ base/BUILD.gn
|
||||
@@ -34,6 +34,7 @@ import("//build/config/ui.gni")
|
||||
@@ -10,7 +10,7 @@ index 576bd49a6198f..d5872f293f7cc 100644
|
||||
import("//testing/libfuzzer/fuzzer_test.gni")
|
||||
import("//testing/test.gni")
|
||||
import("//third_party/icu/config.gni")
|
||||
@@ -1731,7 +1732,11 @@ component("base") {
|
||||
@@ -1745,7 +1746,11 @@ component("base") {
|
||||
"hash/md5_constexpr_internal.h",
|
||||
"hash/sha1.h",
|
||||
]
|
||||
@@ -23,7 +23,7 @@ index 576bd49a6198f..d5872f293f7cc 100644
|
||||
sources += [
|
||||
"hash/md5_nacl.cc",
|
||||
"hash/md5_nacl.h",
|
||||
@@ -1978,6 +1983,12 @@ component("base") {
|
||||
@@ -1993,6 +1998,12 @@ component("base") {
|
||||
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
|
||||
}
|
||||
|
||||
@@ -33,9 +33,9 @@ index 576bd49a6198f..d5872f293f7cc 100644
|
||||
+ defines += [ "_ENABLE_ATOMIC_ALIGNMENT_FIX" ]
|
||||
+ }
|
||||
+
|
||||
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
||||
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
||||
|
||||
libs += [
|
||||
"cfgmgr32.lib",
|
||||
"powrprof.lib",
|
||||
diff --git base/hash/md5.h base/hash/md5.h
|
||||
index 8a49f08dcb04d..2f03d7a6d1b34 100644
|
||||
--- base/hash/md5.h
|
||||
@@ -66,3 +66,27 @@ index 5bb10fe069850..206344d0fd3b1 100644
|
||||
#include "base/hash/sha1_nacl.h"
|
||||
#else
|
||||
#include "base/hash/sha1_boringssl.h"
|
||||
diff --git base/unguessable_token.cc base/unguessable_token.cc
|
||||
index d156be5597625..fc753a2ceb88a 100644
|
||||
--- base/unguessable_token.cc
|
||||
+++ base/unguessable_token.cc
|
||||
@@ -9,8 +9,9 @@
|
||||
#include "base/format_macros.h"
|
||||
#include "base/rand_util.h"
|
||||
#include "build/build_config.h"
|
||||
+#include "cef/libcef/features/features.h"
|
||||
|
||||
-#if !defined(OS_NACL)
|
||||
+#if !defined(OS_NACL) && !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
||||
#include "third_party/boringssl/src/include/openssl/mem.h"
|
||||
#endif
|
||||
|
||||
@@ -41,7 +42,7 @@ UnguessableToken UnguessableToken::Deserialize(uint64_t high, uint64_t low) {
|
||||
}
|
||||
|
||||
bool UnguessableToken::operator==(const UnguessableToken& other) const {
|
||||
-#if defined(OS_NACL)
|
||||
+#if defined(OS_NACL) || BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
||||
// BoringSSL is unavailable for NaCl builds so it remains timing dependent.
|
||||
return token_ == other.token_;
|
||||
#else
|
||||
|
Reference in New Issue
Block a user