ccd4531bfb
* chore: bump chromium in DEPS to 117.0.5846.0 * chore: update patches * 4628901: Bump the macOS deployment target to 10.15 https://chromium-review.googlesource.com/c/chromium/src/+/4628901 * 4593350: [Private Network Access] Trigger Permission Prompt https://chromium-review.googlesource.com/c/chromium/src/+/4593350 * 4631011: Remove unlaunched "InstallReplacementAndroidApp" Platform App APIs https://chromium-review.googlesource.com/c/chromium/src/+/4631011 * chore: disable API deprecation warnings in NSKeyedArchiver * chore: update libcxx filenames * chore: bump chromium in DEPS to 117.0.5848.2 * chore: update feat_add_set_theme_source_to_allow_apps_to.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629743 No manual changes; patch succeeded with fuzz * chore: update process_singleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4605398 Trivial manual patch adjustments to account for code shear. * chore: remove electron::BrowserContext::GetMediaDeviceIDSalt() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4608130 upstream tldr: - content::BrowserContext::GetMediaDeviceIDSalt() - content::ContentBrowserClient::ArePersistentMediaDeviceIDsAllowed() + content::ContentBrowserClient::GetMediaDeviceIDSalt() This commit leaves ElectronBrowserContext::GetMediaDeviceIDSalt() in place (now non-virtual, non-override). It is now called by the new function ElectronBrowserClient::GetMediaDeviceIDSalt(). As a followup, we might want to consider using the new upstream media_device_salt::MediaDeviceSaltService and removing our electron::MediaDeviceIDSalt code. CC @MarshallOfSound for 2nd opinion since he has done the most work on MediaDeviceIDSalt and may have more context. * chore: fix iwyu breakage Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629624 electron_browser_main_parts.cc uses ui::ColorProviderManager but didn't include it. Things worked anyway because we got it indirectly from content/public/browser/web_contents.h until 4629624. * chore: remove call to base::mac::IsAtLeastOS10_14 upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in IAP upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in electron_application_delegate upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove broken-before-macOS-10.15 patch in mas_avoid_usage_of_private_macos_apis.patch Upstream has bumped minimum to macOS 10.15 * chore: remove @available(macOS 10.14) check Upstream minimum requirement for macOS is now 10.15 * chore: update patches * chore: bump chromium in DEPS to 117.0.5850.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5852.0 * chore: update patches * Move two params from NetworkContextParams to NetworkContextFilePaths. https://chromium-review.googlesource.com/c/chromium/src/+/4615930 * WebUSB: Add exclusionFilters to USBRequestDeviceOptions https://chromium-review.googlesource.com/c/chromium/src/+/4614682 * Convert /chrome/browser/ui to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4615920 * fixup! Bump the macOS deployment target to 10.15 * fixup! Bump the macOS deployment target to 10.15 * chore: update libcxx files * win: Remove 10Glass from Windows10Glass function and var names https://chromium-review.googlesource.com/c/chromium/src/+/4641314 * chore: revert 392e5f43 from chromium * Add an ExecutionContext to ScriptState https://chromium-review.googlesource.com/c/chromium/src/+/4609446 * fixup! Add an ExecutionContext to ScriptState * chore: fix header * Revert "chore: revert 392e5f43 from chromium" This reverts commit b7f782943e4ce83cae8cd35780d8d3618cf0772c. * fix: return correct min/max sizes in WinFrameView * fixup! Revert chore: revert 392e5f43 from chromium * fixup! Add an ExecutionContext to ScriptState * Revert "fixup! Revert chore: revert 392e5f43 from chromium" This reverts commit 7e2c7281abfc4f309255339fdba073d90a9ae3eb. * Revert "fix: return correct min/max sizes in WinFrameView" This reverts commit 3f418b1ab5155686730e087ae6cabe4a21b4bb61. * Revert "Revert "chore: revert 392e5f43 from chromium"" This reverts commit 56296d8b7c434147e032e3c3b08c0e371b6c27ba. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
143 lines
5.7 KiB
Diff
143 lines
5.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <jeremya@chromium.org>
|
|
Date: Thu, 30 Apr 2020 10:08:06 -0700
|
|
Subject: crash: allow setting more options
|
|
|
|
This allows the client of //components/crash to set upload url,
|
|
rate-limiting, compression and global annotations.
|
|
|
|
This should be upstreamed.
|
|
|
|
diff --git a/components/crash/core/app/crash_reporter_client.cc b/components/crash/core/app/crash_reporter_client.cc
|
|
index 3f3ed53d48fc4b19642cae847e69982782790e31..51d089f9fa0e1734f98f270a81a200beda71f2f4 100644
|
|
--- a/components/crash/core/app/crash_reporter_client.cc
|
|
+++ b/components/crash/core/app/crash_reporter_client.cc
|
|
@@ -141,6 +141,17 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
|
|
return false;
|
|
}
|
|
|
|
+bool CrashReporterClient::GetShouldRateLimit() {
|
|
+ return true;
|
|
+}
|
|
+
|
|
+bool CrashReporterClient::GetShouldCompressUploads() {
|
|
+ return true;
|
|
+}
|
|
+
|
|
+void CrashReporterClient::GetProcessSimpleAnnotations(std::map<std::string, std::string>* annotations) {
|
|
+}
|
|
+
|
|
#if BUILDFLAG(IS_ANDROID)
|
|
unsigned int CrashReporterClient::GetCrashDumpPercentage() {
|
|
return 100;
|
|
diff --git a/components/crash/core/app/crash_reporter_client.h b/components/crash/core/app/crash_reporter_client.h
|
|
index a604df7a5ea6a1f5613acc032a65668364aadf89..93a8bf787bdaa0e4251a41453eb22062646f4bcb 100644
|
|
--- a/components/crash/core/app/crash_reporter_client.h
|
|
+++ b/components/crash/core/app/crash_reporter_client.h
|
|
@@ -7,6 +7,7 @@
|
|
|
|
#include <stdint.h>
|
|
|
|
+#include <map>
|
|
#include <string>
|
|
|
|
#include "build/build_config.h"
|
|
@@ -153,6 +154,19 @@ class CrashReporterClient {
|
|
// that case, |breakpad_enabled| is set to the value enforced by policies.
|
|
virtual bool ReportingIsEnforcedByPolicy(bool* breakpad_enabled);
|
|
|
|
+ // Returns true if crash uploads should be rate limited. If false, no
|
|
+ // throttling will be applied for uploads.
|
|
+ virtual bool GetShouldRateLimit();
|
|
+
|
|
+ // Returns true if crash uploads should be compressed with gzip. If false,
|
|
+ // reports will be uploaded uncompressed.
|
|
+ virtual bool GetShouldCompressUploads();
|
|
+
|
|
+ // Allows the client to add or edit global annotations passed to the crashpad
|
|
+ // handler.
|
|
+ virtual void GetProcessSimpleAnnotations(
|
|
+ std::map<std::string, std::string>* annotations);
|
|
+
|
|
#if BUILDFLAG(IS_ANDROID)
|
|
// Used by WebView to sample crashes without generating the unwanted dumps. If
|
|
// the returned value is less than 100, crash dumping will be sampled to that
|
|
diff --git a/components/crash/core/app/crashpad_linux.cc b/components/crash/core/app/crashpad_linux.cc
|
|
index 99efa6b245b9944710b76a342ec9a37947078a48..e55df93f17560a566e1dd2a63c560054edd772a5 100644
|
|
--- a/components/crash/core/app/crashpad_linux.cc
|
|
+++ b/components/crash/core/app/crashpad_linux.cc
|
|
@@ -170,6 +170,7 @@ bool PlatformCrashpadInitialization(
|
|
// where crash_reporter provides it's own values for lsb-release.
|
|
annotations["lsb-release"] = base::GetLinuxDistro();
|
|
#endif
|
|
+ crash_reporter_client->GetProcessSimpleAnnotations(&annotations);
|
|
|
|
std::vector<std::string> arguments;
|
|
if (crash_reporter_client->ShouldMonitorCrashHandlerExpensively()) {
|
|
@@ -191,6 +192,13 @@ bool PlatformCrashpadInitialization(
|
|
}
|
|
#endif
|
|
|
|
+ if (!crash_reporter_client->GetShouldRateLimit()) {
|
|
+ arguments.push_back("--no-rate-limit");
|
|
+ }
|
|
+ if (!crash_reporter_client->GetShouldCompressUploads()) {
|
|
+ arguments.push_back("--no-upload-gzip");
|
|
+ }
|
|
+
|
|
CHECK(client.StartHandler(handler_path, *database_path, metrics_path, url,
|
|
annotations, arguments, false, false));
|
|
} else {
|
|
diff --git a/components/crash/core/app/crashpad_mac.mm b/components/crash/core/app/crashpad_mac.mm
|
|
index d7351f4a912b36bb541c59a408bae85dda537fc4..49e3e819f51621ce9b5f52eeed561983533783c8 100644
|
|
--- a/components/crash/core/app/crashpad_mac.mm
|
|
+++ b/components/crash/core/app/crashpad_mac.mm
|
|
@@ -91,6 +91,8 @@
|
|
} // @autoreleasepool
|
|
return process_annotations;
|
|
}();
|
|
+ CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
|
|
+ crash_reporter_client->GetProcessSimpleAnnotations(&annotations);
|
|
return annotations;
|
|
}
|
|
|
|
@@ -161,6 +163,13 @@ bool PlatformCrashpadInitialization(
|
|
|
|
std::vector<std::string> arguments;
|
|
|
|
+ if (!crash_reporter_client->GetShouldRateLimit()) {
|
|
+ arguments.push_back("--no-rate-limit");
|
|
+ }
|
|
+ if (!crash_reporter_client->GetShouldCompressUploads()) {
|
|
+ arguments.push_back("--no-upload-gzip");
|
|
+ }
|
|
+
|
|
if (crash_reporter_client->ShouldMonitorCrashHandlerExpensively()) {
|
|
arguments.push_back("--monitor-self");
|
|
}
|
|
diff --git a/components/crash/core/app/crashpad_win.cc b/components/crash/core/app/crashpad_win.cc
|
|
index 9ab5fb1c822752854fc88ba0ee3d24ddca4dd107..11ae602ccc58cb2728911b28d6637079d2dcb359 100644
|
|
--- a/components/crash/core/app/crashpad_win.cc
|
|
+++ b/components/crash/core/app/crashpad_win.cc
|
|
@@ -91,6 +91,7 @@ bool PlatformCrashpadInitialization(
|
|
|
|
std::map<std::string, std::string> process_annotations;
|
|
GetPlatformCrashpadAnnotations(&process_annotations);
|
|
+ crash_reporter_client->GetProcessSimpleAnnotations(&process_annotations);
|
|
|
|
std::string url = crash_reporter_client->GetUploadUrl();
|
|
|
|
@@ -129,6 +130,13 @@ bool PlatformCrashpadInitialization(
|
|
|
|
std::vector<std::string> arguments(start_arguments);
|
|
|
|
+ if (!crash_reporter_client->GetShouldRateLimit()) {
|
|
+ arguments.push_back("--no-rate-limit");
|
|
+ }
|
|
+ if (!crash_reporter_client->GetShouldCompressUploads()) {
|
|
+ arguments.push_back("--no-upload-gzip");
|
|
+ }
|
|
+
|
|
if (crash_reporter_client->ShouldMonitorCrashHandlerExpensively()) {
|
|
arguments.push_back("--monitor-self");
|
|
for (const std::string& start_argument : start_arguments) {
|