mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 87.0.4280.0 (#812852)
- Windows: VS2015 Update 2 is now the minimum version requirement for linking cef_sandbox from official build binary distributions.
This commit is contained in:
@@ -146,7 +146,7 @@ index 5761c6b965b5..aee4e6c96033 100644
|
||||
struct Data;
|
||||
|
||||
diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn
|
||||
index 54af69767c8a..8b659955db3e 100644
|
||||
index 332117d78126..e7babc8f1764 100644
|
||||
--- third_party/crashpad/crashpad/handler/BUILD.gn
|
||||
+++ third_party/crashpad/crashpad/handler/BUILD.gn
|
||||
@@ -12,6 +12,7 @@
|
||||
@@ -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 c8001f457199..6c64610c69d4 100644
|
||||
index 33649291e253..1bb3c8dc5ac9 100644
|
||||
--- third_party/crashpad/crashpad/handler/handler_main.cc
|
||||
+++ third_party/crashpad/crashpad/handler/handler_main.cc
|
||||
@@ -36,8 +36,10 @@
|
||||
@@ -262,8 +262,8 @@ index c8001f457199..6c64610c69d4 100644
|
||||
#include "client/crash_report_database.h"
|
||||
#include "client/crashpad_client.h"
|
||||
#include "client/crashpad_info.h"
|
||||
@@ -91,6 +93,10 @@
|
||||
#include "handler/linux/exception_handler_server.h"
|
||||
@@ -88,6 +90,10 @@
|
||||
#include "util/win/session_end_watcher.h"
|
||||
#endif // OS_APPLE
|
||||
|
||||
+#if BUILDFLAG(ENABLE_CEF)
|
||||
@@ -273,7 +273,7 @@ index c8001f457199..6c64610c69d4 100644
|
||||
namespace crashpad {
|
||||
|
||||
namespace {
|
||||
@@ -215,6 +221,9 @@ struct Options {
|
||||
@@ -212,6 +218,9 @@ struct Options {
|
||||
bool periodic_tasks;
|
||||
bool rate_limit;
|
||||
bool upload_gzip;
|
||||
@@ -283,7 +283,7 @@ index c8001f457199..6c64610c69d4 100644
|
||||
#if defined(OS_CHROMEOS)
|
||||
bool use_cros_crash_reporter = false;
|
||||
base::FilePath minidump_dir_for_tests;
|
||||
@@ -568,6 +577,9 @@ int HandlerMain(int argc,
|
||||
@@ -566,6 +575,9 @@ int HandlerMain(int argc,
|
||||
kOptionTraceParentWithException,
|
||||
#endif
|
||||
kOptionURL,
|
||||
@@ -293,7 +293,7 @@ index c8001f457199..6c64610c69d4 100644
|
||||
#if defined(OS_CHROMEOS)
|
||||
kOptionUseCrosCrashReporter,
|
||||
kOptionMinidumpDirForTests,
|
||||
@@ -669,6 +681,9 @@ int HandlerMain(int argc,
|
||||
@@ -667,6 +679,9 @@ int HandlerMain(int argc,
|
||||
#endif // OS_ANDROID
|
||||
{"help", no_argument, nullptr, kOptionHelp},
|
||||
{"version", no_argument, nullptr, kOptionVersion},
|
||||
@@ -303,7 +303,7 @@ index c8001f457199..6c64610c69d4 100644
|
||||
{nullptr, 0, nullptr, 0},
|
||||
};
|
||||
|
||||
@@ -824,6 +839,27 @@ int HandlerMain(int argc,
|
||||
@@ -822,6 +837,27 @@ int HandlerMain(int argc,
|
||||
options.url = optarg;
|
||||
break;
|
||||
}
|
||||
@@ -331,7 +331,7 @@ index c8001f457199..6c64610c69d4 100644
|
||||
#if defined(OS_CHROMEOS)
|
||||
case kOptionUseCrosCrashReporter: {
|
||||
options.use_cros_crash_reporter = true;
|
||||
@@ -973,8 +1009,14 @@ int HandlerMain(int argc,
|
||||
@@ -971,8 +1007,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 c8001f457199..6c64610c69d4 100644
|
||||
upload_thread.Get()->Start();
|
||||
}
|
||||
|
||||
@@ -1044,7 +1086,8 @@ int HandlerMain(int argc,
|
||||
@@ -1042,7 +1084,8 @@ int HandlerMain(int argc,
|
||||
ScopedStoppable prune_thread;
|
||||
if (options.periodic_tasks) {
|
||||
prune_thread.Reset(new PruneCrashReportThread(
|
||||
|
Reference in New Issue
Block a user