Update to Chromium version 101.0.4951.34
This commit is contained in:
parent
1f02c709c8
commit
d56d7ab290
|
@ -7,6 +7,6 @@
|
||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/101.0.4951.26',
|
'chromium_checkout': 'refs/tags/101.0.4951.34',
|
||||||
'depot_tools_checkout': '7f02c0d981'
|
'depot_tools_checkout': '7f02c0d981'
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||||
index 3e75521cfba38..318b58d0c069d 100644
|
index a9322c24ebaa8..627c60761cf6e 100644
|
||||||
--- chrome/browser/BUILD.gn
|
--- chrome/browser/BUILD.gn
|
||||||
+++ chrome/browser/BUILD.gn
|
+++ chrome/browser/BUILD.gn
|
||||||
@@ -12,6 +12,7 @@ import("//build/config/features.gni")
|
@@ -12,6 +12,7 @@ import("//build/config/features.gni")
|
||||||
|
@ -10,7 +10,7 @@ index 3e75521cfba38..318b58d0c069d 100644
|
||||||
import("//chrome/browser/buildflags.gni")
|
import("//chrome/browser/buildflags.gni")
|
||||||
import("//chrome/browser/downgrade/buildflags.gni")
|
import("//chrome/browser/downgrade/buildflags.gni")
|
||||||
import("//chrome/common/features.gni")
|
import("//chrome/common/features.gni")
|
||||||
@@ -1923,6 +1924,7 @@ static_library("browser") {
|
@@ -1925,6 +1926,7 @@ static_library("browser") {
|
||||||
"//build:chromeos_buildflags",
|
"//build:chromeos_buildflags",
|
||||||
"//build/config/compiler:compiler_buildflags",
|
"//build/config/compiler:compiler_buildflags",
|
||||||
"//cc",
|
"//cc",
|
||||||
|
@ -18,7 +18,7 @@ index 3e75521cfba38..318b58d0c069d 100644
|
||||||
"//chrome:extra_resources",
|
"//chrome:extra_resources",
|
||||||
"//chrome:resources",
|
"//chrome:resources",
|
||||||
"//chrome:strings",
|
"//chrome:strings",
|
||||||
@@ -2580,6 +2582,10 @@ static_library("browser") {
|
@@ -2582,6 +2584,10 @@ static_library("browser") {
|
||||||
deps += [ "//chrome/browser/ui/webui/connectors_internals:mojo_bindings" ]
|
deps += [ "//chrome/browser/ui/webui/connectors_internals:mojo_bindings" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
|
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
|
||||||
index e921b7e8be8dc..414358c5191f1 100644
|
index 79b8e30b8f584..507abacbdeb19 100644
|
||||||
--- chrome/browser/themes/theme_service.cc
|
--- chrome/browser/themes/theme_service.cc
|
||||||
+++ chrome/browser/themes/theme_service.cc
|
+++ chrome/browser/themes/theme_service.cc
|
||||||
@@ -32,6 +32,7 @@
|
@@ -32,6 +32,7 @@
|
||||||
|
@ -21,7 +21,7 @@ index e921b7e8be8dc..414358c5191f1 100644
|
||||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||||
#include "base/scoped_observation.h"
|
#include "base/scoped_observation.h"
|
||||||
#include "extensions/browser/extension_registry_observer.h"
|
#include "extensions/browser/extension_registry_observer.h"
|
||||||
@@ -573,11 +578,19 @@ void ThemeService::Init() {
|
@@ -571,11 +576,19 @@ void ThemeService::Init() {
|
||||||
// OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
|
// OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
|
||||||
// constructed in time to observe the corresponding events.
|
// constructed in time to observe the corresponding events.
|
||||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||||
|
|
|
@ -40,10 +40,10 @@ index b80cf7a59103b..6318dd05e6eef 100644
|
||||||
virtual ~PruneCondition() {}
|
virtual ~PruneCondition() {}
|
||||||
|
|
||||||
diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc
|
diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc
|
||||||
index 966481d6284e4..e0fa8394cb045 100644
|
index 8fe578f92f3a3..9acab9404c885 100644
|
||||||
--- third_party/crashpad/crashpad/client/settings.cc
|
--- third_party/crashpad/crashpad/client/settings.cc
|
||||||
+++ third_party/crashpad/crashpad/client/settings.cc
|
+++ third_party/crashpad/crashpad/client/settings.cc
|
||||||
@@ -87,7 +87,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
|
@@ -111,7 +111,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
|
||||||
|
|
||||||
struct Settings::Data {
|
struct Settings::Data {
|
||||||
static constexpr uint32_t kSettingsMagic = 'CPds';
|
static constexpr uint32_t kSettingsMagic = 'CPds';
|
||||||
|
@ -52,7 +52,7 @@ index 966481d6284e4..e0fa8394cb045 100644
|
||||||
|
|
||||||
enum Options : uint32_t {
|
enum Options : uint32_t {
|
||||||
kUploadsEnabled = 1 << 0,
|
kUploadsEnabled = 1 << 0,
|
||||||
@@ -98,6 +98,9 @@ struct Settings::Data {
|
@@ -122,6 +122,9 @@ struct Settings::Data {
|
||||||
options(0),
|
options(0),
|
||||||
padding_0(0),
|
padding_0(0),
|
||||||
last_upload_attempt_time(0),
|
last_upload_attempt_time(0),
|
||||||
|
@ -62,7 +62,7 @@ index 966481d6284e4..e0fa8394cb045 100644
|
||||||
client_id() {}
|
client_id() {}
|
||||||
|
|
||||||
uint32_t magic;
|
uint32_t magic;
|
||||||
@@ -105,6 +108,9 @@ struct Settings::Data {
|
@@ -129,6 +132,9 @@ struct Settings::Data {
|
||||||
uint32_t options;
|
uint32_t options;
|
||||||
uint32_t padding_0;
|
uint32_t padding_0;
|
||||||
int64_t last_upload_attempt_time; // time_t
|
int64_t last_upload_attempt_time; // time_t
|
||||||
|
@ -72,7 +72,7 @@ index 966481d6284e4..e0fa8394cb045 100644
|
||||||
UUID client_id;
|
UUID client_id;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -188,6 +194,56 @@ bool Settings::SetLastUploadAttemptTime(time_t time) {
|
@@ -212,6 +218,56 @@ bool Settings::SetLastUploadAttemptTime(time_t time) {
|
||||||
return WriteSettings(handle.get(), settings);
|
return WriteSettings(handle.get(), settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,10 +130,10 @@ index 966481d6284e4..e0fa8394cb045 100644
|
||||||
Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
|
Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
|
||||||
FileHandle file,
|
FileHandle file,
|
||||||
diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h
|
diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h
|
||||||
index e476c60c3ba6b..ce8256c9f6d25 100644
|
index aedf30cd874f7..ab798f00e0862 100644
|
||||||
--- third_party/crashpad/crashpad/client/settings.h
|
--- third_party/crashpad/crashpad/client/settings.h
|
||||||
+++ third_party/crashpad/crashpad/client/settings.h
|
+++ third_party/crashpad/crashpad/client/settings.h
|
||||||
@@ -116,6 +116,11 @@ class Settings {
|
@@ -120,6 +120,11 @@ class Settings {
|
||||||
//! error logged.
|
//! error logged.
|
||||||
bool SetLastUploadAttemptTime(time_t time);
|
bool SetLastUploadAttemptTime(time_t time);
|
||||||
|
|
||||||
|
@ -184,7 +184,7 @@ index 0fe4760db7fe2..042af7247712c 100644
|
||||||
|
|
||||||
if (crashpad_is_win) {
|
if (crashpad_is_win) {
|
||||||
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
||||||
index efbeab7804c44..44fd31e58175c 100644
|
index 138cf80026c98..d4af1f0c38d76 100644
|
||||||
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
||||||
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
||||||
@@ -269,6 +269,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
|
@@ -269,6 +269,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
|
||||||
|
|
|
@ -12,7 +12,7 @@ index 5356717746edd..6345b837a6ea6 100644
|
||||||
# https://crbug.com/474506.
|
# https://crbug.com/474506.
|
||||||
"//clank/java/BUILD.gn",
|
"//clank/java/BUILD.gn",
|
||||||
diff --git BUILD.gn BUILD.gn
|
diff --git BUILD.gn BUILD.gn
|
||||||
index be7d8478860ce..5c3281f22fc4f 100644
|
index de738745dfb85..e30d3dad0f717 100644
|
||||||
--- BUILD.gn
|
--- BUILD.gn
|
||||||
+++ BUILD.gn
|
+++ BUILD.gn
|
||||||
@@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni")
|
@@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni")
|
||||||
|
|
Loading…
Reference in New Issue