mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 73.0.3665.0 (#620590)
This commit is contained in:
committed by
Marshall Greenblatt
parent
10916749d6
commit
1a86240c93
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
|
||||
index c54f40f27fbd..b96946a1ad96 100644
|
||||
index e0a839813a07..5c0d05bcc78c 100644
|
||||
--- chrome/common/crash_keys.cc
|
||||
+++ chrome/common/crash_keys.cc
|
||||
@@ -4,6 +4,8 @@
|
||||
@@ -241,7 +241,7 @@ index 9ee85554812c..7af55ddda8fe 100644
|
||||
extern void InitCrashKeysForTesting();
|
||||
|
||||
diff --git components/crash/content/app/crash_reporter_client.cc components/crash/content/app/crash_reporter_client.cc
|
||||
index f69c6c3ff26e..e0d402abd3fd 100644
|
||||
index b3b09cee8d6f..4bc2afc7bd6e 100644
|
||||
--- components/crash/content/app/crash_reporter_client.cc
|
||||
+++ components/crash/content/app/crash_reporter_client.cc
|
||||
@@ -88,7 +88,7 @@ int CrashReporterClient::GetResultCodeRespawnFailed() {
|
||||
@@ -300,9 +300,9 @@ index f69c6c3ff26e..e0d402abd3fd 100644
|
||||
+#endif
|
||||
+
|
||||
#if defined(OS_ANDROID)
|
||||
int CrashReporterClient::GetAndroidMinidumpDescriptor() {
|
||||
return 0;
|
||||
@@ -186,9 +214,11 @@ bool CrashReporterClient::ShouldMonitorCrashHandlerExpensively() {
|
||||
unsigned int CrashReporterClient::GetCrashDumpPercentageForWebView() {
|
||||
return 100;
|
||||
@@ -194,9 +222,11 @@ bool CrashReporterClient::ShouldMonitorCrashHandlerExpensively() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -318,7 +318,7 @@ index f69c6c3ff26e..e0d402abd3fd 100644
|
||||
|
||||
} // namespace crash_reporter
|
||||
diff --git components/crash/content/app/crash_reporter_client.h components/crash/content/app/crash_reporter_client.h
|
||||
index 485c2c8bf638..7eb175c43b6c 100644
|
||||
index caebf67a7e0f..5e7cf3d8c1a6 100644
|
||||
--- components/crash/content/app/crash_reporter_client.h
|
||||
+++ components/crash/content/app/crash_reporter_client.h
|
||||
@@ -5,7 +5,9 @@
|
||||
@@ -356,7 +356,7 @@ index 485c2c8bf638..7eb175c43b6c 100644
|
||||
#endif
|
||||
|
||||
// The location where minidump files should be written. Returns true if
|
||||
@@ -197,6 +201,30 @@ class CrashReporterClient {
|
||||
@@ -206,6 +210,30 @@ class CrashReporterClient {
|
||||
|
||||
// Returns true if breakpad should run in the given process type.
|
||||
virtual bool EnableBreakpadForProcess(const std::string& process_type);
|
||||
@@ -388,10 +388,10 @@ index 485c2c8bf638..7eb175c43b6c 100644
|
||||
|
||||
} // namespace crash_reporter
|
||||
diff --git components/crash/content/app/crashpad.cc components/crash/content/app/crashpad.cc
|
||||
index 5cf5818c879d..c085c84c8a16 100644
|
||||
index a04a4d843004..366a687c352d 100644
|
||||
--- components/crash/content/app/crashpad.cc
|
||||
+++ components/crash/content/app/crashpad.cc
|
||||
@@ -149,7 +149,8 @@ void InitializeCrashpadImpl(bool initial_client,
|
||||
@@ -150,7 +150,8 @@ void 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.
|
||||
@@ -509,10 +509,10 @@ index f079174b3586..ff9a19e259fb 100644
|
||||
handler_path, database_path, metrics_path, url,
|
||||
GetProcessSimpleAnnotations(), arguments, true, false);
|
||||
diff --git components/crash/content/app/crashpad_win.cc components/crash/content/app/crashpad_win.cc
|
||||
index 8b55f0a521f1..d58dcbce5af4 100644
|
||||
index cc16c40ea320..3bb03459adf4 100644
|
||||
--- components/crash/content/app/crashpad_win.cc
|
||||
+++ components/crash/content/app/crashpad_win.cc
|
||||
@@ -34,8 +34,8 @@ void GetPlatformCrashpadAnnotations(
|
||||
@@ -35,8 +35,8 @@ void GetPlatformCrashpadAnnotations(
|
||||
base::string16 product_name, version, special_build, channel_name;
|
||||
crash_reporter_client->GetProductNameAndVersion(
|
||||
exe_file, &product_name, &version, &special_build, &channel_name);
|
||||
@@ -523,7 +523,7 @@ index 8b55f0a521f1..d58dcbce5af4 100644
|
||||
#if defined(GOOGLE_CHROME_BUILD)
|
||||
// Empty means stable.
|
||||
const bool allow_empty_channel = true;
|
||||
@@ -47,9 +47,9 @@ void GetPlatformCrashpadAnnotations(
|
||||
@@ -48,9 +48,9 @@ void GetPlatformCrashpadAnnotations(
|
||||
if (!special_build.empty())
|
||||
(*annotations)["special"] = base::UTF16ToUTF8(special_build);
|
||||
#if defined(ARCH_CPU_X86)
|
||||
@@ -535,7 +535,7 @@ index 8b55f0a521f1..d58dcbce5af4 100644
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -64,7 +64,9 @@ base::FilePath PlatformCrashpadInitialization(
|
||||
@@ -65,7 +65,9 @@ base::FilePath PlatformCrashpadInitialization(
|
||||
base::FilePath metrics_path; // Only valid in the browser process.
|
||||
|
||||
const char kPipeNameVar[] = "CHROME_CRASHPAD_PIPE_NAME";
|
||||
@@ -545,7 +545,7 @@ index 8b55f0a521f1..d58dcbce5af4 100644
|
||||
std::unique_ptr<base::Environment> env(base::Environment::Create());
|
||||
if (initial_client) {
|
||||
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
|
||||
@@ -84,13 +86,13 @@ base::FilePath PlatformCrashpadInitialization(
|
||||
@@ -85,13 +87,13 @@ base::FilePath PlatformCrashpadInitialization(
|
||||
|
||||
#if defined(GOOGLE_CHROME_BUILD)
|
||||
std::string url = "https://clients2.google.com/cr/report";
|
||||
@@ -562,7 +562,7 @@ index 8b55f0a521f1..d58dcbce5af4 100644
|
||||
|
||||
base::FilePath exe_file(exe_path);
|
||||
if (exe_file.empty()) {
|
||||
@@ -108,13 +110,14 @@ base::FilePath PlatformCrashpadInitialization(
|
||||
@@ -109,13 +111,14 @@ base::FilePath PlatformCrashpadInitialization(
|
||||
crashpad::TriState::kEnabled, kIndirectMemoryLimit);
|
||||
}
|
||||
|
||||
@@ -582,7 +582,7 @@ index 8b55f0a521f1..d58dcbce5af4 100644
|
||||
if (!user_data_dir.empty()) {
|
||||
start_arguments.push_back(std::string("--user-data-dir=") +
|
||||
user_data_dir);
|
||||
@@ -125,9 +128,12 @@ base::FilePath PlatformCrashpadInitialization(
|
||||
@@ -126,9 +129,12 @@ base::FilePath PlatformCrashpadInitialization(
|
||||
start_arguments.push_back("/prefetch:7");
|
||||
} else {
|
||||
base::FilePath exe_dir = exe_file.DirName();
|
||||
|
Reference in New Issue
Block a user