mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 103.0.5060.0 (#1002911)
This commit is contained in:
@@ -47,7 +47,7 @@ index 3fe0b9b74ae0a..38987ce169308 100644
|
||||
|
||||
source_set("dll_hash") {
|
||||
diff --git chrome/chrome_elf/crash/crash_helper.cc chrome/chrome_elf/crash/crash_helper.cc
|
||||
index 886372e114899..ad3bc2242883b 100644
|
||||
index c5fe247fc3acd..8ce4bcd78ea9e 100644
|
||||
--- chrome/chrome_elf/crash/crash_helper.cc
|
||||
+++ chrome/chrome_elf/crash/crash_helper.cc
|
||||
@@ -11,12 +11,17 @@
|
||||
@@ -81,19 +81,19 @@ index 886372e114899..ad3bc2242883b 100644
|
||||
g_crash_helper_enabled = true;
|
||||
return true;
|
||||
diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
|
||||
index 3a954d5ce176c..7054e98ddf539 100644
|
||||
index cd5ebb2ff81ac..ec5193c3d2a93 100644
|
||||
--- chrome/common/crash_keys.cc
|
||||
+++ chrome/common/crash_keys.cc
|
||||
@@ -4,6 +4,8 @@
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#include "chrome/common/crash_keys.h"
|
||||
#include <deque>
|
||||
|
||||
+#include <iterator>
|
||||
+
|
||||
#include "base/base_switches.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
@@ -45,8 +47,10 @@ void HandleEnableDisableFeatures(const base::CommandLine& command_line) {
|
||||
#include "base/format_macros.h"
|
||||
@@ -94,8 +96,10 @@ void HandleEnableDisableFeatures(const base::CommandLine& command_line) {
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -105,7 +105,7 @@ index 3a954d5ce176c..7054e98ddf539 100644
|
||||
static const char* const kIgnoreSwitches[] = {
|
||||
switches::kEnableLogging,
|
||||
switches::kFlagSwitchesBegin,
|
||||
@@ -106,13 +110,11 @@ bool IsBoringSwitch(const std::string& flag) {
|
||||
@@ -155,13 +159,11 @@ bool IsBoringSwitch(const std::string& flag) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -264,7 +264,7 @@ index 24e53fa62c2c4..ffc72f79d67b0 100644
|
||||
|
||||
} // namespace crash_reporter
|
||||
diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
|
||||
index 6da6be46cee4a..5e3067c081867 100644
|
||||
index 9058d56e8bda7..6a62596c03a52 100644
|
||||
--- components/crash/core/app/crashpad.cc
|
||||
+++ components/crash/core/app/crashpad.cc
|
||||
@@ -154,7 +154,8 @@ bool InitializeCrashpadImpl(bool initial_client,
|
||||
@@ -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 32e2038e15ada..bf72a94fcc167 100644
|
||||
index 39fb479eba509..809859ee5e597 100644
|
||||
--- components/crash/core/app/crashpad_linux.cc
|
||||
+++ components/crash/core/app/crashpad_linux.cc
|
||||
@@ -23,6 +23,7 @@
|
||||
@@ -454,7 +454,7 @@ 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 d2354b84f3a18..f0d5b76a7e61a 100644
|
||||
index 80f33dc5e2f2e..277c336a90668 100644
|
||||
--- components/crash/core/app/crashpad_win.cc
|
||||
+++ components/crash/core/app/crashpad_win.cc
|
||||
@@ -35,8 +35,8 @@ void GetPlatformCrashpadAnnotations(
|
||||
@@ -492,7 +492,7 @@ index d2354b84f3a18..f0d5b76a7e61a 100644
|
||||
std::unique_ptr<base::Environment> env(base::Environment::Create());
|
||||
|
||||
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
|
||||
@@ -91,9 +95,11 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -93,9 +97,11 @@ bool PlatformCrashpadInitialization(
|
||||
|
||||
std::string url = crash_reporter_client->GetUploadUrl();
|
||||
|
||||
@@ -504,7 +504,7 @@ index d2354b84f3a18..f0d5b76a7e61a 100644
|
||||
|
||||
base::FilePath exe_file(exe_path);
|
||||
if (exe_file.empty()) {
|
||||
@@ -104,13 +110,14 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -106,13 +112,14 @@ bool PlatformCrashpadInitialization(
|
||||
exe_file = base::FilePath(exe_file_path);
|
||||
}
|
||||
|
||||
@@ -524,7 +524,7 @@ index d2354b84f3a18..f0d5b76a7e61a 100644
|
||||
if (!user_data_dir.empty()) {
|
||||
start_arguments.push_back(std::string("--user-data-dir=") +
|
||||
user_data_dir);
|
||||
@@ -121,9 +128,12 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -123,9 +130,12 @@ bool PlatformCrashpadInitialization(
|
||||
start_arguments.push_back("/prefetch:7");
|
||||
} else {
|
||||
base::FilePath exe_dir = exe_file.DirName();
|
||||
|
Reference in New Issue
Block a user