mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 78.0.3904.0 (#693954)
This commit is contained in:
@@ -146,7 +146,7 @@ index a2b0c74636f4..01370fdc20d9 100644
|
||||
struct Data;
|
||||
|
||||
diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn
|
||||
index b841b0ccd3a2..94ff9177d842 100644
|
||||
index 550f686a4562..b6cc04846d42 100644
|
||||
--- third_party/crashpad/crashpad/handler/BUILD.gn
|
||||
+++ third_party/crashpad/crashpad/handler/BUILD.gn
|
||||
@@ -12,6 +12,7 @@
|
||||
@@ -157,7 +157,7 @@ index b841b0ccd3a2..94ff9177d842 100644
|
||||
import("../build/crashpad_buildconfig.gni")
|
||||
|
||||
static_library("handler") {
|
||||
@@ -65,6 +66,17 @@ static_library("handler") {
|
||||
@@ -74,6 +75,17 @@ static_library("handler") {
|
||||
]
|
||||
}
|
||||
|
||||
@@ -175,7 +175,7 @@ index b841b0ccd3a2..94ff9177d842 100644
|
||||
public_configs = [ "..:crashpad_config" ]
|
||||
|
||||
public_deps = [
|
||||
@@ -77,6 +89,7 @@ static_library("handler") {
|
||||
@@ -86,6 +98,7 @@ static_library("handler") {
|
||||
"../minidump",
|
||||
"../snapshot",
|
||||
"../tools:tool_support",
|
||||
@@ -248,7 +248,7 @@ index 2ec1147d2620..8ff9a72e0bd7 100644
|
||||
//! \brief Calls ProcessPendingReports() in response to ReportPending() having
|
||||
//! been called on any thread, as well as periodically on a timer.
|
||||
diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc
|
||||
index 05a2e7b44e41..6e72c17a57e6 100644
|
||||
index 7b69e8481ffa..2cee1da0dc4b 100644
|
||||
--- third_party/crashpad/crashpad/handler/handler_main.cc
|
||||
+++ third_party/crashpad/crashpad/handler/handler_main.cc
|
||||
@@ -36,8 +36,10 @@
|
||||
@@ -262,7 +262,7 @@ index 05a2e7b44e41..6e72c17a57e6 100644
|
||||
#include "client/crash_report_database.h"
|
||||
#include "client/crashpad_client.h"
|
||||
#include "client/crashpad_info.h"
|
||||
@@ -96,6 +98,10 @@
|
||||
@@ -100,6 +102,10 @@
|
||||
#include "handler/linux/exception_handler_server.h"
|
||||
#endif // OS_MACOSX
|
||||
|
||||
@@ -273,28 +273,28 @@ index 05a2e7b44e41..6e72c17a57e6 100644
|
||||
namespace crashpad {
|
||||
|
||||
namespace {
|
||||
@@ -188,6 +194,9 @@ struct Options {
|
||||
@@ -195,6 +201,9 @@ struct Options {
|
||||
bool periodic_tasks;
|
||||
bool rate_limit;
|
||||
bool upload_gzip;
|
||||
+ int max_uploads;
|
||||
+ int max_database_size;
|
||||
+ int max_database_age;
|
||||
};
|
||||
|
||||
// Splits |key_value| on '=' and inserts the resulting key and value into |map|.
|
||||
@@ -553,6 +562,9 @@ int HandlerMain(int argc,
|
||||
#if defined(OS_CHROMEOS)
|
||||
bool use_cros_crash_reporter;
|
||||
#endif // OS_CHROMEOS
|
||||
@@ -569,6 +578,9 @@ int HandlerMain(int argc,
|
||||
kOptionTraceParentWithException,
|
||||
#endif
|
||||
kOptionURL,
|
||||
+ kOptionMaxUploads,
|
||||
+ kOptionMaxDatabaseSize,
|
||||
+ kOptionMaxDatabaseAge,
|
||||
|
||||
// Standard options.
|
||||
kOptionHelp = -2,
|
||||
@@ -620,6 +632,9 @@ int HandlerMain(int argc,
|
||||
{"url", required_argument, nullptr, kOptionURL},
|
||||
#if defined(OS_CHROMEOS)
|
||||
kOptionUseCrosCrashReporter,
|
||||
#endif // OS_CHROMEOS
|
||||
@@ -645,6 +657,9 @@ int HandlerMain(int argc,
|
||||
#endif // OS_CHROMEOS
|
||||
{"help", no_argument, nullptr, kOptionHelp},
|
||||
{"version", no_argument, nullptr, kOptionVersion},
|
||||
+ {"max-uploads", required_argument, nullptr, kOptionMaxUploads},
|
||||
@@ -303,7 +303,7 @@ index 05a2e7b44e41..6e72c17a57e6 100644
|
||||
{nullptr, 0, nullptr, 0},
|
||||
};
|
||||
|
||||
@@ -759,6 +774,27 @@ int HandlerMain(int argc,
|
||||
@@ -784,6 +799,27 @@ int HandlerMain(int argc,
|
||||
options.url = optarg;
|
||||
break;
|
||||
}
|
||||
@@ -328,10 +328,10 @@ index 05a2e7b44e41..6e72c17a57e6 100644
|
||||
+ }
|
||||
+ break;
|
||||
+ }
|
||||
case kOptionHelp: {
|
||||
Usage(me);
|
||||
MetricsRecordExit(Metrics::LifetimeMilestone::kExitedEarly);
|
||||
@@ -879,8 +915,14 @@ int HandlerMain(int argc,
|
||||
#if defined(OS_CHROMEOS)
|
||||
case kOptionUseCrosCrashReporter: {
|
||||
options.use_cros_crash_reporter = true;
|
||||
@@ -910,8 +946,14 @@ int HandlerMain(int argc,
|
||||
upload_thread_options.upload_gzip = options.upload_gzip;
|
||||
upload_thread_options.watch_pending_reports = options.periodic_tasks;
|
||||
|
||||
@@ -346,7 +346,7 @@ index 05a2e7b44e41..6e72c17a57e6 100644
|
||||
upload_thread.Get()->Start();
|
||||
}
|
||||
|
||||
@@ -908,7 +950,8 @@ int HandlerMain(int argc,
|
||||
@@ -961,7 +1003,8 @@ int HandlerMain(int argc,
|
||||
ScopedStoppable prune_thread;
|
||||
if (options.periodic_tasks) {
|
||||
prune_thread.Reset(new PruneCrashReportThread(
|
||||
|
Reference in New Issue
Block a user