diff options
Diffstat (limited to 'www/iridium/files/patch-components_crash_content_app_crashpad.cc')
| -rw-r--r-- | www/iridium/files/patch-components_crash_content_app_crashpad.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/www/iridium/files/patch-components_crash_content_app_crashpad.cc b/www/iridium/files/patch-components_crash_content_app_crashpad.cc index 2fb251a44e96..d0641d172733 100644 --- a/www/iridium/files/patch-components_crash_content_app_crashpad.cc +++ b/www/iridium/files/patch-components_crash_content_app_crashpad.cc @@ -1,8 +1,8 @@ ---- components/crash/content/app/crashpad.cc.orig 2018-08-01 00:08:38.000000000 +0200 -+++ components/crash/content/app/crashpad.cc 2018-08-05 12:57:33.862455000 +0200 -@@ -101,6 +101,12 @@ - const std::string& user_data_dir, +--- components/crash/content/app/crashpad.cc.orig 2019-03-11 22:00:56 UTC ++++ components/crash/content/app/crashpad.cc +@@ -102,6 +102,12 @@ void InitializeCrashpadImpl(bool initial_client, const base::FilePath& exe_path, + const std::vector<std::string>& initial_arguments, bool embedded_handler) { + +#if defined(OS_BSD) @@ -13,16 +13,16 @@ static bool initialized = false; DCHECK(!initialized); initialized = true; -@@ -119,7 +125,7 @@ - // as processed by the backend. +@@ -122,7 +128,7 @@ void InitializeCrashpadImpl(bool initial_client, DCHECK(browser_process || process_type == "Chrome Installer" || - process_type == "notification-helper"); + process_type == "notification-helper" || + process_type == "GCPW Installer" || process_type == "GCPW DLL"); -#elif defined(OS_LINUX) || defined(OS_ANDROID) +#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) DCHECK(browser_process); #else #error Port. -@@ -184,7 +190,7 @@ +@@ -187,7 +193,7 @@ void InitializeCrashpadImpl(bool initial_client, // other "main, first process" to initialize things. There is no "relauncher" // on Windows, so this is synonymous with initial_client. const bool should_initialize_database_and_set_upload_policy = initial_client; @@ -31,13 +31,13 @@ const bool should_initialize_database_and_set_upload_policy = browser_process; #endif if (should_initialize_database_and_set_upload_policy) { -@@ -253,7 +259,9 @@ - } +@@ -267,7 +273,9 @@ bool GetUploadsEnabled() { + #if !defined(OS_ANDROID) void DumpWithoutCrashing() { +#if !defined(OS_BSD) CRASHPAD_SIMULATE_CRASH(); +#endif } + #endif - void GetReports(std::vector<Report>* reports) { |