mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 101.0.4951.0 (#982481)
Known issues: - chrome: Some ceftests are failing due to bfcache same-site enabled by default (see issue #3301)
This commit is contained in:
@ -81,7 +81,7 @@ index 886372e114899..ad3bc2242883b 100644
|
||||
g_crash_helper_enabled = true;
|
||||
return true;
|
||||
diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
|
||||
index f6850e85411ab..4f5500d8fa1ea 100644
|
||||
index 3a954d5ce176c..7054e98ddf539 100644
|
||||
--- chrome/common/crash_keys.cc
|
||||
+++ chrome/common/crash_keys.cc
|
||||
@@ -4,6 +4,8 @@
|
||||
@ -92,8 +92,8 @@ index f6850e85411ab..4f5500d8fa1ea 100644
|
||||
+
|
||||
#include "base/base_switches.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/cxx17_backports.h"
|
||||
@@ -46,8 +48,10 @@ void HandleEnableDisableFeatures(const base::CommandLine& command_line) {
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
@@ -45,8 +47,10 @@ void HandleEnableDisableFeatures(const base::CommandLine& command_line) {
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -105,7 +105,7 @@ index f6850e85411ab..4f5500d8fa1ea 100644
|
||||
static const char* const kIgnoreSwitches[] = {
|
||||
switches::kEnableLogging,
|
||||
switches::kFlagSwitchesBegin,
|
||||
@@ -107,13 +111,11 @@ bool IsBoringSwitch(const std::string& flag) {
|
||||
@@ -106,13 +110,11 @@ bool IsBoringSwitch(const std::string& flag) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -278,7 +278,7 @@ index 6da6be46cee4a..5e3067c081867 100644
|
||||
->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
|
||||
}
|
||||
diff --git components/crash/core/app/crashpad_linux.cc components/crash/core/app/crashpad_linux.cc
|
||||
index dc2b18b322350..be84c0d0d1d7a 100644
|
||||
index 32e2038e15ada..bf72a94fcc167 100644
|
||||
--- components/crash/core/app/crashpad_linux.cc
|
||||
+++ components/crash/core/app/crashpad_linux.cc
|
||||
@@ -23,6 +23,7 @@
|
||||
@ -289,7 +289,7 @@ index dc2b18b322350..be84c0d0d1d7a 100644
|
||||
#include "sandbox/linux/services/namespace_sandbox.h"
|
||||
#include "third_party/crashpad/crashpad/client/crashpad_client.h"
|
||||
#include "third_party/crashpad/crashpad/client/crashpad_info.h"
|
||||
@@ -117,11 +118,10 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -107,11 +108,10 @@ bool PlatformCrashpadInitialization(
|
||||
crash_reporter_client->GetCrashDumpLocation(database_path);
|
||||
crash_reporter_client->GetCrashMetricsLocation(&metrics_path);
|
||||
|
||||
@ -304,7 +304,7 @@ index dc2b18b322350..be84c0d0d1d7a 100644
|
||||
|
||||
// When --use-cros-crash-reporter is set (below), the handler passes dumps
|
||||
// to ChromeOS's /sbin/crash_reporter which in turn passes the dump to
|
||||
@@ -138,8 +138,8 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -128,8 +128,8 @@ bool PlatformCrashpadInitialization(
|
||||
&product_version, &channel);
|
||||
|
||||
std::map<std::string, std::string> annotations;
|
||||
@ -315,7 +315,7 @@ index dc2b18b322350..be84c0d0d1d7a 100644
|
||||
|
||||
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
// Empty means stable.
|
||||
@@ -156,7 +156,20 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -146,7 +146,20 @@ bool PlatformCrashpadInitialization(
|
||||
annotations["channel"] = channel;
|
||||
}
|
||||
|
||||
@ -337,7 +337,7 @@ index dc2b18b322350..be84c0d0d1d7a 100644
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
// "build_time_millis" is used on LaCros chrome to determine when to stop
|
||||
@@ -201,6 +214,12 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -191,6 +204,12 @@ bool PlatformCrashpadInitialization(
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -454,10 +454,10 @@ index dc041c43371fd..1d060ae55c586 100644
|
||||
handler_path, *database_path, metrics_path, url,
|
||||
GetProcessSimpleAnnotations(), arguments, true, false);
|
||||
diff --git components/crash/core/app/crashpad_win.cc components/crash/core/app/crashpad_win.cc
|
||||
index 1a8f42cb4e2ea..fbdeab5d54584 100644
|
||||
index d2354b84f3a18..f0d5b76a7e61a 100644
|
||||
--- components/crash/core/app/crashpad_win.cc
|
||||
+++ components/crash/core/app/crashpad_win.cc
|
||||
@@ -36,8 +36,8 @@ void GetPlatformCrashpadAnnotations(
|
||||
@@ -35,8 +35,8 @@ void GetPlatformCrashpadAnnotations(
|
||||
std::wstring product_name, version, special_build, channel_name;
|
||||
crash_reporter_client->GetProductNameAndVersion(
|
||||
exe_file, &product_name, &version, &special_build, &channel_name);
|
||||
@ -468,7 +468,7 @@ index 1a8f42cb4e2ea..fbdeab5d54584 100644
|
||||
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
// Empty means stable.
|
||||
const bool allow_empty_channel = true;
|
||||
@@ -54,9 +54,11 @@ void GetPlatformCrashpadAnnotations(
|
||||
@@ -53,9 +53,11 @@ void GetPlatformCrashpadAnnotations(
|
||||
if (!special_build.empty())
|
||||
(*annotations)["special"] = base::WideToUTF8(special_build);
|
||||
#if defined(ARCH_CPU_X86)
|
||||
@ -482,7 +482,7 @@ index 1a8f42cb4e2ea..fbdeab5d54584 100644
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -71,7 +73,9 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -70,7 +72,9 @@ bool PlatformCrashpadInitialization(
|
||||
base::FilePath metrics_path; // Only valid in the browser process.
|
||||
|
||||
const char kPipeNameVar[] = "CHROME_CRASHPAD_PIPE_NAME";
|
||||
@ -492,7 +492,7 @@ index 1a8f42cb4e2ea..fbdeab5d54584 100644
|
||||
std::unique_ptr<base::Environment> env(base::Environment::Create());
|
||||
|
||||
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
|
||||
@@ -92,9 +96,11 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -91,9 +95,11 @@ bool PlatformCrashpadInitialization(
|
||||
|
||||
std::string url = crash_reporter_client->GetUploadUrl();
|
||||
|
||||
@ -504,7 +504,7 @@ index 1a8f42cb4e2ea..fbdeab5d54584 100644
|
||||
|
||||
base::FilePath exe_file(exe_path);
|
||||
if (exe_file.empty()) {
|
||||
@@ -105,13 +111,14 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -104,13 +110,14 @@ bool PlatformCrashpadInitialization(
|
||||
exe_file = base::FilePath(exe_file_path);
|
||||
}
|
||||
|
||||
@ -524,7 +524,7 @@ index 1a8f42cb4e2ea..fbdeab5d54584 100644
|
||||
if (!user_data_dir.empty()) {
|
||||
start_arguments.push_back(std::string("--user-data-dir=") +
|
||||
user_data_dir);
|
||||
@@ -122,9 +129,12 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -121,9 +128,12 @@ bool PlatformCrashpadInitialization(
|
||||
start_arguments.push_back("/prefetch:7");
|
||||
} else {
|
||||
base::FilePath exe_dir = exe_file.DirName();
|
||||
|
Reference in New Issue
Block a user