chore: bump chromium to 108.0.5355.0 (main) (#35900)
* chore: bump chromium in DEPS to 108.0.5339.0 * chore: bump chromium in DEPS to 108.0.5341.0 * chore: sync patch to unrelated upstream code shear patches/chromium/network_service_allow_remote_certificate_verification_logic.patch Xref:3927793
* chore: sync patch to unrelated upstream code shear patches/chromium/printing.patch Xref:3927793
* chore: sync patch to unrelated upstream code shear patches/chromium/chore_add_electron_deps_to_gitignores.patch Xref:3906023
* chore: refresh patches - `e patches all` * chore: remove unused parameter from WillCreateURLLoaderRequestInterceptors Xref:3932218
* perf: avoid unique pointer round trip Xref:3913938
* refactor: Simplify entropy provider management. Xref:3901211
* fixup! perf: avoid unique pointer round trip * fixup! perf: avoid unique pointer round trip * refactor: update typeof FileSelectHelper::select_file_dialog_ Xref:3930092
* fixup! fixup! perf: avoid unique pointer round trip * chore: bump chromium in DEPS to 108.0.5343.0 * chore: update patches * chore: bump chromium in DEPS to 108.0.5345.0 * chore: bump chromium in DEPS to 108.0.5347.0 * chore: bump chromium in DEPS to 108.0.5349.0 * chore: bump chromium in DEPS to 108.0.5351.0 * chore: bump chromium in DEPS to 108.0.5353.0 * chore: bump chromium in DEPS to 108.0.5355.0 * chore: update patches * Refactor display::win::DisplayInfo to display::win::internal::DisplayInfo Refs3929014
* Update proxy resolution to use NAK - Part 2 Refs3934016
* Disable PreconnectManager when the user disabled preloading. Refs3928470
Refs3937183
* chore: update patches * chore: update sysroot * linux: Remove breakpad integration Refs3764621
* chore: update comments Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: electron-patch-conflict-fixer[bot] <83340002+electron-patch-conflict-fixer[bot]@users.noreply.github.com>
This commit is contained in:
parent
bcafe8f654
commit
f2c341b655
95 changed files with 484 additions and 1001 deletions
|
@ -43,7 +43,6 @@
|
|||
#include "base/containers/span.h"
|
||||
#include "base/files/file_util.h"
|
||||
#include "base/guid.h"
|
||||
#include "components/crash/core/app/breakpad_linux.h"
|
||||
#include "components/crash/core/common/crash_keys.h"
|
||||
#include "components/upload_list/combining_upload_list.h"
|
||||
#include "v8/include/v8-wasm-trap-handler-posix.h"
|
||||
|
@ -149,28 +148,15 @@ void Start(const std::string& submit_url,
|
|||
? "node"
|
||||
: command_line->GetSwitchValueASCII(::switches::kProcessType);
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
if (::crash_reporter::IsCrashpadEnabled()) {
|
||||
for (const auto& pair : extra)
|
||||
electron::crash_keys::SetCrashKey(pair.first, pair.second);
|
||||
{
|
||||
base::ThreadRestrictions::ScopedAllowIO allow_io;
|
||||
::crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
|
||||
}
|
||||
if (ignore_system_crash_handler) {
|
||||
crashpad::CrashpadInfo::GetCrashpadInfo()
|
||||
->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
|
||||
}
|
||||
} else {
|
||||
::crash_keys::SetMetricsClientIdFromGUID(GetClientId());
|
||||
auto& global_crash_keys = GetGlobalCrashKeysMutable();
|
||||
for (const auto& pair : global_extra) {
|
||||
global_crash_keys[pair.first] = pair.second;
|
||||
}
|
||||
for (const auto& pair : extra)
|
||||
electron::crash_keys::SetCrashKey(pair.first, pair.second);
|
||||
for (const auto& pair : global_extra)
|
||||
electron::crash_keys::SetCrashKey(pair.first, pair.second);
|
||||
breakpad::InitCrashReporter(process_type);
|
||||
for (const auto& pair : extra)
|
||||
electron::crash_keys::SetCrashKey(pair.first, pair.second);
|
||||
{
|
||||
base::ThreadRestrictions::ScopedAllowIO allow_io;
|
||||
::crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
|
||||
}
|
||||
if (ignore_system_crash_handler) {
|
||||
crashpad::CrashpadInfo::GetCrashpadInfo()
|
||||
->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
|
||||
}
|
||||
#elif BUILDFLAG(IS_MAC)
|
||||
for (const auto& pair : extra)
|
||||
|
@ -213,17 +199,15 @@ scoped_refptr<UploadList> CreateCrashUploadList() {
|
|||
crash_dir_path.AppendASCII(CrashUploadList::kReporterLogFilename);
|
||||
scoped_refptr<UploadList> result =
|
||||
base::MakeRefCounted<TextLogUploadList>(upload_log_path);
|
||||
if (crash_reporter::IsCrashpadEnabled()) {
|
||||
// Crashpad keeps the records of C++ crashes (segfaults, etc) in its
|
||||
// internal database. The JavaScript error reporter writes JS error upload
|
||||
// records to the older text format. Combine the two to present a complete
|
||||
// list to the user.
|
||||
// TODO(nornagon): what is "The JavaScript error reporter", and do we care
|
||||
// about it?
|
||||
std::vector<scoped_refptr<UploadList>> uploaders = {
|
||||
base::MakeRefCounted<CrashUploadListCrashpad>(), std::move(result)};
|
||||
result = base::MakeRefCounted<CombiningUploadList>(std::move(uploaders));
|
||||
}
|
||||
// Crashpad keeps the records of C++ crashes (segfaults, etc) in its
|
||||
// internal database. The JavaScript error reporter writes JS error upload
|
||||
// records to the older text format. Combine the two to present a complete
|
||||
// list to the user.
|
||||
// TODO(nornagon): what is "The JavaScript error reporter", and do we care
|
||||
// about it?
|
||||
std::vector<scoped_refptr<UploadList>> uploaders = {
|
||||
base::MakeRefCounted<CrashUploadListCrashpad>(), std::move(result)};
|
||||
result = base::MakeRefCounted<CombiningUploadList>(std::move(uploaders));
|
||||
return result;
|
||||
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
}
|
||||
|
|
|
@ -282,7 +282,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
|
|||
base::UTF8ToWide(device_name.c_str(), device_name.size(),
|
||||
&wide_device_name);
|
||||
const int64_t device_id =
|
||||
display::win::DisplayInfo::DeviceIdFromDeviceName(
|
||||
display::win::internal::DisplayInfo::DeviceIdFromDeviceName(
|
||||
wide_device_name.c_str());
|
||||
source.display_id = base::NumberToString(device_id);
|
||||
}
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
|
||||
#include "net/base/completion_repeating_callback.h"
|
||||
#include "net/base/load_flags.h"
|
||||
#include "net/base/network_anonymization_key.h"
|
||||
#include "net/http/http_auth_handler_factory.h"
|
||||
#include "net/http/http_auth_preferences.h"
|
||||
#include "net/http/http_cache.h"
|
||||
|
@ -99,23 +100,6 @@
|
|||
using content::BrowserThread;
|
||||
using content::StoragePartition;
|
||||
|
||||
namespace predictors {
|
||||
// NOTE(nornagon): this is copied from
|
||||
// //chrome/browser/predictors/resource_prefetch_predictor.cc we don't need
|
||||
// anything in that file other than this constructor. Without it we get a link
|
||||
// error. Probably upstream the constructor should be moved to
|
||||
// preconnect_manager.cc.
|
||||
PreconnectRequest::PreconnectRequest(
|
||||
const url::Origin& origin,
|
||||
int num_sockets,
|
||||
const net::NetworkIsolationKey& network_isolation_key)
|
||||
: origin(origin),
|
||||
num_sockets(num_sockets),
|
||||
network_isolation_key(network_isolation_key) {
|
||||
DCHECK_GE(num_sockets, 0);
|
||||
}
|
||||
} // namespace predictors
|
||||
|
||||
namespace {
|
||||
|
||||
struct ClearStorageDataOptions {
|
||||
|
@ -162,6 +146,30 @@ uint32_t GetQuotaMask(const std::vector<std::string>& quota_types) {
|
|||
return quota_mask;
|
||||
}
|
||||
|
||||
base::Value::Dict createProxyConfig(ProxyPrefs::ProxyMode proxy_mode,
|
||||
std::string const& pac_url,
|
||||
std::string const& proxy_server,
|
||||
std::string const& bypass_list) {
|
||||
if (proxy_mode == ProxyPrefs::MODE_DIRECT) {
|
||||
return ProxyConfigDictionary::CreateDirect();
|
||||
}
|
||||
|
||||
if (proxy_mode == ProxyPrefs::MODE_SYSTEM) {
|
||||
return ProxyConfigDictionary::CreateSystem();
|
||||
}
|
||||
|
||||
if (proxy_mode == ProxyPrefs::MODE_AUTO_DETECT) {
|
||||
return ProxyConfigDictionary::CreateAutoDetect();
|
||||
}
|
||||
|
||||
if (proxy_mode == ProxyPrefs::MODE_PAC_SCRIPT) {
|
||||
const bool pac_mandatory = true;
|
||||
return ProxyConfigDictionary::CreatePacScript(pac_url, pac_mandatory);
|
||||
}
|
||||
|
||||
return ProxyConfigDictionary::CreateFixedServers(proxy_server, bypass_list);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
namespace gin {
|
||||
|
@ -517,26 +525,10 @@ v8::Local<v8::Promise> Session::SetProxy(gin::Arguments* args) {
|
|||
}
|
||||
}
|
||||
|
||||
std::unique_ptr<base::Value> proxy_config;
|
||||
if (proxy_mode == ProxyPrefs::MODE_DIRECT) {
|
||||
proxy_config =
|
||||
std::make_unique<base::Value>(ProxyConfigDictionary::CreateDirect());
|
||||
} else if (proxy_mode == ProxyPrefs::MODE_SYSTEM) {
|
||||
proxy_config =
|
||||
std::make_unique<base::Value>(ProxyConfigDictionary::CreateSystem());
|
||||
} else if (proxy_mode == ProxyPrefs::MODE_AUTO_DETECT) {
|
||||
proxy_config = std::make_unique<base::Value>(
|
||||
ProxyConfigDictionary::CreateAutoDetect());
|
||||
} else if (proxy_mode == ProxyPrefs::MODE_PAC_SCRIPT) {
|
||||
proxy_config =
|
||||
std::make_unique<base::Value>(ProxyConfigDictionary::CreatePacScript(
|
||||
pac_url, true /* pac_mandatory */));
|
||||
} else {
|
||||
proxy_config = std::make_unique<base::Value>(
|
||||
ProxyConfigDictionary::CreateFixedServers(proxy_rules, bypass_list));
|
||||
}
|
||||
browser_context_->in_memory_pref_store()->SetValue(
|
||||
proxy_config::prefs::kProxy, std::move(proxy_config),
|
||||
proxy_config::prefs::kProxy,
|
||||
base::Value{
|
||||
createProxyConfig(proxy_mode, pac_url, proxy_rules, bypass_list)},
|
||||
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
|
||||
|
||||
base::ThreadTaskRunnerHandle::Get()->PostTask(
|
||||
|
@ -955,7 +947,8 @@ static void StartPreconnectOnUI(ElectronBrowserContext* browser_context,
|
|||
url::Origin origin = url::Origin::Create(url);
|
||||
std::vector<predictors::PreconnectRequest> requests = {
|
||||
{url::Origin::Create(url), num_sockets_to_preconnect,
|
||||
net::NetworkIsolationKey(origin, origin)}};
|
||||
net::NetworkAnonymizationKey(net::SchemefulSite(origin),
|
||||
net::SchemefulSite(origin))}};
|
||||
browser_context->GetPreconnectManager()->Start(url, requests);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue