mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 74.0.3729.0 (#638880)
- Windows: 10.0.17763.0 SDK is now required. - Mac: 10.13 SDK is now required. - Removed CefRequestContext::ResolveHostCached which is no longer supported by Chromium.
This commit is contained in:
committed by
Marshall Greenblatt
parent
58e1149c71
commit
725ed88529
@@ -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 32d4d6c11a15..7c1b1a344831 100644
|
||||
index b22ab2c4b912..223e43e910d7 100644
|
||||
--- third_party/crashpad/crashpad/handler/BUILD.gn
|
||||
+++ third_party/crashpad/crashpad/handler/BUILD.gn
|
||||
@@ -12,6 +12,7 @@
|
||||
@@ -156,8 +156,8 @@ index 32d4d6c11a15..7c1b1a344831 100644
|
||||
+import("//cef/libcef/features/features.gni")
|
||||
import("../build/crashpad_buildconfig.gni")
|
||||
|
||||
static_library("handler") {
|
||||
@@ -65,6 +66,17 @@ static_library("handler") {
|
||||
if (crashpad_is_in_chromium) {
|
||||
@@ -69,6 +70,17 @@ static_library("handler") {
|
||||
]
|
||||
}
|
||||
|
||||
@@ -175,7 +175,7 @@ index 32d4d6c11a15..7c1b1a344831 100644
|
||||
public_configs = [ "..:crashpad_config" ]
|
||||
|
||||
public_deps = [
|
||||
@@ -77,6 +89,7 @@ static_library("handler") {
|
||||
@@ -81,6 +93,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 b3e0a68a1c0a..087a4e4c6b9c 100644
|
||||
index 31686b3eb899..f361f5759976 100644
|
||||
--- third_party/crashpad/crashpad/handler/handler_main.cc
|
||||
+++ third_party/crashpad/crashpad/handler/handler_main.cc
|
||||
@@ -36,8 +36,10 @@
|
||||
@@ -283,7 +283,7 @@ index b3e0a68a1c0a..087a4e4c6b9c 100644
|
||||
};
|
||||
|
||||
// Splits |key_value| on '=' and inserts the resulting key and value into |map|.
|
||||
@@ -541,6 +550,9 @@ int HandlerMain(int argc,
|
||||
@@ -553,6 +562,9 @@ int HandlerMain(int argc,
|
||||
kOptionSanitizationInformation,
|
||||
#endif
|
||||
kOptionURL,
|
||||
@@ -293,7 +293,7 @@ index b3e0a68a1c0a..087a4e4c6b9c 100644
|
||||
|
||||
// Standard options.
|
||||
kOptionHelp = -2,
|
||||
@@ -602,6 +614,9 @@ int HandlerMain(int argc,
|
||||
@@ -614,6 +626,9 @@ int HandlerMain(int argc,
|
||||
{"url", required_argument, nullptr, kOptionURL},
|
||||
{"help", no_argument, nullptr, kOptionHelp},
|
||||
{"version", no_argument, nullptr, kOptionVersion},
|
||||
@@ -303,7 +303,7 @@ index b3e0a68a1c0a..087a4e4c6b9c 100644
|
||||
{nullptr, 0, nullptr, 0},
|
||||
};
|
||||
|
||||
@@ -737,6 +752,27 @@ int HandlerMain(int argc,
|
||||
@@ -749,6 +764,27 @@ int HandlerMain(int argc,
|
||||
options.url = optarg;
|
||||
break;
|
||||
}
|
||||
@@ -331,7 +331,7 @@ index b3e0a68a1c0a..087a4e4c6b9c 100644
|
||||
case kOptionHelp: {
|
||||
Usage(me);
|
||||
MetricsRecordExit(Metrics::LifetimeMilestone::kExitedEarly);
|
||||
@@ -851,8 +887,14 @@ int HandlerMain(int argc,
|
||||
@@ -863,8 +899,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 b3e0a68a1c0a..087a4e4c6b9c 100644
|
||||
upload_thread.Get()->Start();
|
||||
}
|
||||
|
||||
@@ -880,7 +922,8 @@ int HandlerMain(int argc,
|
||||
@@ -892,7 +934,8 @@ int HandlerMain(int argc,
|
||||
ScopedStoppable prune_thread;
|
||||
if (options.periodic_tasks) {
|
||||
prune_thread.Reset(new PruneCrashReportThread(
|
||||
|
Reference in New Issue
Block a user