mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 105.0.5195.0 (#1027018)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/chrome_elf/BUILD.gn chrome/chrome_elf/BUILD.gn
|
||||
index da34cf911b74d..d5c8ca11be3fc 100644
|
||||
index 9d96774f5f3de..51c1d85178604 100644
|
||||
--- chrome/chrome_elf/BUILD.gn
|
||||
+++ chrome/chrome_elf/BUILD.gn
|
||||
@@ -7,6 +7,7 @@
|
||||
@@ -20,7 +20,7 @@ index da34cf911b74d..d5c8ca11be3fc 100644
|
||||
"crash/crash_helper.cc",
|
||||
"crash/crash_helper.h",
|
||||
]
|
||||
@@ -116,6 +114,7 @@ static_library("crash") {
|
||||
@@ -117,6 +115,7 @@ static_library("crash") {
|
||||
":hook_util",
|
||||
"//base", # This needs to go. DEP of app, crash_keys, client.
|
||||
"//base:base_static", # pe_image
|
||||
@@ -28,7 +28,7 @@ index da34cf911b74d..d5c8ca11be3fc 100644
|
||||
"//chrome/install_static:install_static_util",
|
||||
"//components/crash/core/app",
|
||||
"//components/crash/core/common", # crash_keys
|
||||
@@ -123,6 +122,17 @@ static_library("crash") {
|
||||
@@ -124,6 +123,17 @@ static_library("crash") {
|
||||
"//content/public/common:result_codes",
|
||||
"//third_party/crashpad/crashpad/client", # DumpWithoutCrash
|
||||
]
|
||||
@@ -136,10 +136,10 @@ index e2d53ac83dde0..6ac76e407a748 100644
|
||||
// on the given |command_line|.
|
||||
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
|
||||
diff --git components/crash/core/app/crash_reporter_client.cc components/crash/core/app/crash_reporter_client.cc
|
||||
index 82b7f241e2618..525f1efe5aa6a 100644
|
||||
index 463f92a6e5470..99e70307f180e 100644
|
||||
--- components/crash/core/app/crash_reporter_client.cc
|
||||
+++ components/crash/core/app/crash_reporter_client.cc
|
||||
@@ -89,7 +89,7 @@ bool CrashReporterClient::GetShouldDumpLargerDumps() {
|
||||
@@ -93,7 +93,7 @@ bool CrashReporterClient::GetShouldDumpLargerDumps() {
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -148,7 +148,7 @@ index 82b7f241e2618..525f1efe5aa6a 100644
|
||||
void CrashReporterClient::GetProductNameAndVersion(const char** product_name,
|
||||
const char** version) {
|
||||
}
|
||||
@@ -98,6 +98,7 @@ void CrashReporterClient::GetProductNameAndVersion(std::string* product_name,
|
||||
@@ -102,6 +102,7 @@ void CrashReporterClient::GetProductNameAndVersion(std::string* product_name,
|
||||
std::string* version,
|
||||
std::string* channel) {}
|
||||
|
||||
@@ -156,7 +156,7 @@ index 82b7f241e2618..525f1efe5aa6a 100644
|
||||
base::FilePath CrashReporterClient::GetReporterLogFilename() {
|
||||
return base::FilePath();
|
||||
}
|
||||
@@ -107,6 +108,7 @@ bool CrashReporterClient::HandleCrashDump(const char* crashdump_filename,
|
||||
@@ -111,6 +112,7 @@ bool CrashReporterClient::HandleCrashDump(const char* crashdump_filename,
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
@@ -164,7 +164,7 @@ index 82b7f241e2618..525f1efe5aa6a 100644
|
||||
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
bool CrashReporterClient::GetCrashDumpLocation(std::wstring* crash_dir) {
|
||||
@@ -141,6 +143,28 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
|
||||
@@ -145,6 +147,28 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -193,7 +193,7 @@ index 82b7f241e2618..525f1efe5aa6a 100644
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
unsigned int CrashReporterClient::GetCrashDumpPercentage() {
|
||||
return 100;
|
||||
@@ -203,9 +227,4 @@ bool CrashReporterClient::ShouldMonitorCrashHandlerExpensively() {
|
||||
@@ -207,9 +231,4 @@ bool CrashReporterClient::ShouldMonitorCrashHandlerExpensively() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -204,7 +204,7 @@ index 82b7f241e2618..525f1efe5aa6a 100644
|
||||
-
|
||||
} // namespace crash_reporter
|
||||
diff --git components/crash/core/app/crash_reporter_client.h components/crash/core/app/crash_reporter_client.h
|
||||
index 24e53fa62c2c4..ffc72f79d67b0 100644
|
||||
index 2532e99f00b39..c39256296c50d 100644
|
||||
--- components/crash/core/app/crash_reporter_client.h
|
||||
+++ components/crash/core/app/crash_reporter_client.h
|
||||
@@ -5,7 +5,9 @@
|
||||
@@ -217,7 +217,7 @@ index 24e53fa62c2c4..ffc72f79d67b0 100644
|
||||
|
||||
#include "build/build_config.h"
|
||||
|
||||
@@ -89,7 +91,7 @@ class CrashReporterClient {
|
||||
@@ -94,7 +96,7 @@ class CrashReporterClient {
|
||||
virtual bool GetShouldDumpLargerDumps();
|
||||
#endif
|
||||
|
||||
@@ -226,7 +226,7 @@ index 24e53fa62c2c4..ffc72f79d67b0 100644
|
||||
// Returns a textual description of the product type and version to include
|
||||
// in the crash report. Neither out parameter should be set to NULL.
|
||||
// TODO(jperaza): Remove the 2-parameter overload of this method once all
|
||||
@@ -100,6 +102,7 @@ class CrashReporterClient {
|
||||
@@ -105,6 +107,7 @@ class CrashReporterClient {
|
||||
std::string* version,
|
||||
std::string* channel);
|
||||
|
||||
@@ -234,7 +234,7 @@ index 24e53fa62c2c4..ffc72f79d67b0 100644
|
||||
virtual base::FilePath GetReporterLogFilename();
|
||||
|
||||
// Custom crash minidump handler after the minidump is generated.
|
||||
@@ -109,6 +112,7 @@ class CrashReporterClient {
|
||||
@@ -114,6 +117,7 @@ class CrashReporterClient {
|
||||
// libc nor allocate memory normally.
|
||||
virtual bool HandleCrashDump(const char* crashdump_filename,
|
||||
uint64_t crash_pid);
|
||||
@@ -242,7 +242,7 @@ index 24e53fa62c2c4..ffc72f79d67b0 100644
|
||||
#endif
|
||||
|
||||
// The location where minidump files should be written. Returns true if
|
||||
@@ -206,6 +210,20 @@ class CrashReporterClient {
|
||||
@@ -211,6 +215,20 @@ class CrashReporterClient {
|
||||
|
||||
// Returns true if breakpad should run in the given process type.
|
||||
virtual bool EnableBreakpadForProcess(const std::string& process_type);
|
||||
@@ -264,10 +264,10 @@ index 24e53fa62c2c4..ffc72f79d67b0 100644
|
||||
|
||||
} // namespace crash_reporter
|
||||
diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
|
||||
index 9058d56e8bda7..6a62596c03a52 100644
|
||||
index 34abee33b74b7..1a67519bb305b 100644
|
||||
--- components/crash/core/app/crashpad.cc
|
||||
+++ components/crash/core/app/crashpad.cc
|
||||
@@ -154,7 +154,8 @@ bool InitializeCrashpadImpl(bool initial_client,
|
||||
@@ -157,7 +157,8 @@ bool InitializeCrashpadImpl(bool initial_client,
|
||||
// fallback. Forwarding is turned off for debug-mode builds even for the
|
||||
// browser process, because the system's crash reporter can take a very long
|
||||
// time to chew on symbols.
|
||||
@@ -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 80f33dc5e2f2e..277c336a90668 100644
|
||||
index ad401a7711cef..0b10f904549bb 100644
|
||||
--- components/crash/core/app/crashpad_win.cc
|
||||
+++ components/crash/core/app/crashpad_win.cc
|
||||
@@ -35,8 +35,8 @@ void GetPlatformCrashpadAnnotations(
|
||||
@@ -36,8 +36,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 80f33dc5e2f2e..277c336a90668 100644
|
||||
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
// Empty means stable.
|
||||
const bool allow_empty_channel = true;
|
||||
@@ -53,9 +53,11 @@ void GetPlatformCrashpadAnnotations(
|
||||
@@ -54,9 +54,11 @@ void GetPlatformCrashpadAnnotations(
|
||||
if (!special_build.empty())
|
||||
(*annotations)["special"] = base::WideToUTF8(special_build);
|
||||
#if defined(ARCH_CPU_X86)
|
||||
@@ -482,7 +482,7 @@ index 80f33dc5e2f2e..277c336a90668 100644
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -70,7 +72,9 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -71,7 +73,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 80f33dc5e2f2e..277c336a90668 100644
|
||||
std::unique_ptr<base::Environment> env(base::Environment::Create());
|
||||
|
||||
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
|
||||
@@ -93,9 +97,11 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -94,9 +98,11 @@ bool PlatformCrashpadInitialization(
|
||||
|
||||
std::string url = crash_reporter_client->GetUploadUrl();
|
||||
|
||||
@@ -504,7 +504,7 @@ index 80f33dc5e2f2e..277c336a90668 100644
|
||||
|
||||
base::FilePath exe_file(exe_path);
|
||||
if (exe_file.empty()) {
|
||||
@@ -106,13 +112,14 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -107,13 +113,14 @@ bool PlatformCrashpadInitialization(
|
||||
exe_file = base::FilePath(exe_file_path);
|
||||
}
|
||||
|
||||
@@ -524,7 +524,7 @@ index 80f33dc5e2f2e..277c336a90668 100644
|
||||
if (!user_data_dir.empty()) {
|
||||
start_arguments.push_back(std::string("--user-data-dir=") +
|
||||
user_data_dir);
|
||||
@@ -123,9 +130,12 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -124,9 +131,12 @@ bool PlatformCrashpadInitialization(
|
||||
start_arguments.push_back("/prefetch:7");
|
||||
} else {
|
||||
base::FilePath exe_dir = exe_file.DirName();
|
||||
|
Reference in New Issue
Block a user