mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 134.0.6998.0 (#1415337)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git base/BUILD.gn base/BUILD.gn
|
||||
index 5d8029ab4b82c..3fd3b54866cf7 100644
|
||||
index 854457658bbdc..823f50e53821d 100644
|
||||
--- base/BUILD.gn
|
||||
+++ base/BUILD.gn
|
||||
@@ -42,6 +42,7 @@ import("//build/rust/rust_static_library.gni")
|
||||
@@ -10,7 +10,7 @@ index 5d8029ab4b82c..3fd3b54866cf7 100644
|
||||
import("//testing/libfuzzer/fuzzer_test.gni")
|
||||
import("//testing/test.gni")
|
||||
|
||||
@@ -1491,7 +1492,13 @@ component("base") {
|
||||
@@ -1492,7 +1493,13 @@ component("base") {
|
||||
"hash/md5_constexpr_internal.h",
|
||||
"hash/sha1.h",
|
||||
]
|
||||
@@ -25,7 +25,7 @@ index 5d8029ab4b82c..3fd3b54866cf7 100644
|
||||
sources += [
|
||||
"hash/md5_nacl.cc",
|
||||
"hash/md5_nacl.h",
|
||||
@@ -1941,6 +1948,12 @@ component("base") {
|
||||
@@ -1942,6 +1949,12 @@ component("base") {
|
||||
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
|
||||
}
|
||||
|
||||
@@ -59,6 +59,28 @@ index f680f63cffc5b..9cb615bbc8a5a 100644
|
||||
DCHECK([&] {
|
||||
auto const was_set = is_initialized_check_flag_.test_and_set();
|
||||
is_initialized_check_flag_.clear();
|
||||
diff --git base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr.h base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr.h
|
||||
index c3ac11523410f..2a3d3bc4d1f34 100644
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr.h
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr.h
|
||||
@@ -1271,7 +1271,7 @@ template <typename T,
|
||||
typename TQ,
|
||||
template <typename>
|
||||
typename UQ>
|
||||
-struct std::basic_common_reference<raw_ptr<T, Traits>, T*, TQ, UQ> {
|
||||
+struct basic_common_reference<raw_ptr<T, Traits>, T*, TQ, UQ> {
|
||||
using type = T*;
|
||||
};
|
||||
|
||||
@@ -1281,7 +1281,7 @@ template <typename T,
|
||||
typename TQ,
|
||||
template <typename>
|
||||
typename UQ>
|
||||
-struct std::basic_common_reference<T*, raw_ptr<T, Traits>, TQ, UQ> {
|
||||
+struct basic_common_reference<T*, raw_ptr<T, Traits>, TQ, UQ> {
|
||||
using type = T*;
|
||||
};
|
||||
|
||||
diff --git base/hash/md5.h base/hash/md5.h
|
||||
index 215d636fec275..922e88f31b999 100644
|
||||
--- base/hash/md5.h
|
||||
@@ -179,10 +201,10 @@ index af1d4f46d02c9..953585804c177 100644
|
||||
#else
|
||||
return base::FeatureList::IsEnabled(base::features::kUseRustJsonParser);
|
||||
diff --git base/logging.cc base/logging.cc
|
||||
index b67b6fbf7e4e5..fc23ed1b4477d 100644
|
||||
index 4511af700c1be..dbd50c28455be 100644
|
||||
--- base/logging.cc
|
||||
+++ base/logging.cc
|
||||
@@ -60,6 +60,7 @@
|
||||
@@ -56,6 +56,7 @@
|
||||
#include "base/vlog.h"
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
@@ -190,7 +212,7 @@ index b67b6fbf7e4e5..fc23ed1b4477d 100644
|
||||
#include "third_party/abseil-cpp/absl/base/internal/raw_logging.h"
|
||||
#include "third_party/abseil-cpp/absl/cleanup/cleanup.h"
|
||||
|
||||
@@ -538,7 +539,7 @@ bool BaseInitLoggingImpl(const LoggingSettings& settings) {
|
||||
@@ -534,7 +535,7 @@ bool BaseInitLoggingImpl(const LoggingSettings& settings) {
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -247,12 +269,12 @@ index 5d11d4a1560b1..242a93bcca8ed 100644
|
||||
} // namespace win
|
||||
#endif
|
||||
diff --git base/rand_util.h base/rand_util.h
|
||||
index b198a7198aab9..01bc8e9b6ad1f 100644
|
||||
index 716222897d140..2d1053085630c 100644
|
||||
--- base/rand_util.h
|
||||
+++ base/rand_util.h
|
||||
@@ -17,8 +17,9 @@
|
||||
#include "base/containers/span.h"
|
||||
#include "base/gtest_prod_util.h"
|
||||
@@ -23,8 +23,9 @@
|
||||
#include "base/numerics/safe_conversions.h"
|
||||
#include "base/time/time.h"
|
||||
#include "build/build_config.h"
|
||||
+#include "cef/libcef/features/features.h"
|
||||
|
||||
@@ -261,7 +283,7 @@ index b198a7198aab9..01bc8e9b6ad1f 100644
|
||||
#include "third_party/boringssl/src/include/openssl/rand.h"
|
||||
#endif
|
||||
|
||||
@@ -117,7 +118,7 @@ class RandomBitGenerator {
|
||||
@@ -185,7 +186,7 @@ class RandomBitGenerator {
|
||||
~RandomBitGenerator() = default;
|
||||
};
|
||||
|
||||
@@ -344,7 +366,7 @@ index ea33ca66f384c..33f4cc76f76bd 100644
|
||||
return lhs.token_ == rhs.token_;
|
||||
#else
|
||||
diff --git base/win/sid.cc base/win/sid.cc
|
||||
index 6b5d9b1e494b7..538c98d6676ad 100644
|
||||
index 6a91e984f5161..4433591d96c99 100644
|
||||
--- base/win/sid.cc
|
||||
+++ base/win/sid.cc
|
||||
@@ -29,12 +29,56 @@
|
||||
|
Reference in New Issue
Block a user