bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 126.0.6478.0 (#1300313)

Browse Source
This commit is contained in:
Marshall Greenblatt
2024-05-22 21:52:35 -04:00
parent bc1b856b96
commit 701fc03f00
127 changed files with 915 additions and 909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patch/patches/crashpad_1995.patch
View File

@@ -81,19 +81,19 @@ index 30a2c1adc4509..b60a7afaf1e5e 100644
g_crash_helper_enabled = true;
return true;
diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
index 81fb33468431c..9b0d500e37452 100644
index a29f22161328a..4de56b81683f3 100644
--- chrome/common/crash_keys.cc
+++ chrome/common/crash_keys.cc
@@ -6,6 +6,8 @@
@@ -7,6 +7,8 @@
#include <deque>
#include <string_view>
+#include <iterator>
+
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/format_macros.h"
@@ -99,8 +101,10 @@ void HandleEnableDisableFeatures(const base::CommandLine& command_line) {
@@ -100,8 +102,10 @@ void HandleEnableDisableFeatures(const base::CommandLine& command_line) {
"commandline-disabled-feature");
}
@@ -105,7 +105,7 @@ index 81fb33468431c..9b0d500e37452 100644
static const char* const kIgnoreSwitches[] = {
switches::kEnableLogging,
switches::kFlagSwitchesBegin,
@@ -159,11 +163,9 @@ bool IsBoringSwitch(const std::string& flag) {
@@ -160,11 +164,9 @@ bool IsBoringSwitch(const std::string& flag) {
return false;
}
@@ -270,7 +270,7 @@ index a604df7a5ea6a..618fbde10a65c 100644
} // namespace crash_reporter
diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
index 4a25417a565fd..a7a1d451b56f9 100644
index 874ade6000ded..31fffc23197fc 100644
--- components/crash/core/app/crashpad.cc
+++ components/crash/core/app/crashpad.cc
@@ -137,7 +137,8 @@ bool InitializeCrashpadImpl(bool initial_client,
@@ -462,10 +462,10 @@ index eb5bcfe0234c3..8963b26806922 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 15addd5c5e663..f30027b9b6f3c 100644
index 0e00d26f79231..fdd2b4bc73f8e 100644
--- components/crash/core/app/crashpad_win.cc
+++ components/crash/core/app/crashpad_win.cc
@@ -36,8 +36,8 @@ void GetPlatformCrashpadAnnotations(
@@ -37,8 +37,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);
@@ -476,7 +476,7 @@ index 15addd5c5e663..f30027b9b6f3c 100644
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
// Empty means stable.
const bool allow_empty_channel = true;
@@ -54,9 +54,11 @@ void GetPlatformCrashpadAnnotations(
@@ -55,9 +55,11 @@ void GetPlatformCrashpadAnnotations(
if (!special_build.empty())
(*annotations)["special"] = base::WideToUTF8(special_build);
#if defined(ARCH_CPU_X86)
@@ -490,7 +490,7 @@ index 15addd5c5e663..f30027b9b6f3c 100644
#endif
}
@@ -71,7 +73,9 @@ bool PlatformCrashpadInitialization(
@@ -72,7 +74,9 @@ bool PlatformCrashpadInitialization(
base::FilePath metrics_path; // Only valid in the browser process.
const char kPipeNameVar[] = "CHROME_CRASHPAD_PIPE_NAME";
@@ -500,7 +500,7 @@ index 15addd5c5e663..f30027b9b6f3c 100644
std::unique_ptr<base::Environment> env(base::Environment::Create());
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
@@ -94,9 +98,11 @@ bool PlatformCrashpadInitialization(
@@ -95,9 +99,11 @@ bool PlatformCrashpadInitialization(
std::string url = crash_reporter_client->GetUploadUrl();
@@ -512,7 +512,7 @@ index 15addd5c5e663..f30027b9b6f3c 100644
base::FilePath exe_file(exe_path);
if (exe_file.empty()) {
@@ -107,13 +113,14 @@ bool PlatformCrashpadInitialization(
@@ -108,13 +114,14 @@ bool PlatformCrashpadInitialization(
exe_file = base::FilePath(exe_file_path);
}
@@ -533,7 +533,7 @@ index 15addd5c5e663..f30027b9b6f3c 100644
start_arguments.push_back(std::string("--user-data-dir=") +
user_data_dir);
@@ -124,9 +131,12 @@ bool PlatformCrashpadInitialization(
start_arguments.push_back("/prefetch:4");
app_launch_prefetch::SubprocessType::kCrashpad)));
} else {
base::FilePath exe_dir = exe_file.DirName();
- exe_file = exe_dir.Append(FILE_PATH_LITERAL("crashpad_handler.exe"));