mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
0a0d7a8202
* chore: bump chromium in DEPS to 78.0.3899.1 * chore: bump chromium in DEPS to 78.0.3900.1 * chore: bump chromium in DEPS to 78.0.3900.2 * chore: bump chromium in DEPS to 78.0.3901.1 * chore: bump chromium in DEPS to 78.0.3902.1 * chore: remove tts.patch https://chromium-review.googlesource.com/c/chromium/src/+/1717595 * build: disable widevine cdm component https://chromium-review.googlesource.com/c/chromium/src/+/1767596 * chore: bump chromium in DEPS to 78.0.3903.1 * build: redo network_context.h mojification187df411f2%5E%21/#F7 * build: disable widevine Disable widevine, atleast for the moment by deleting the patch and removing the build argument. > At the moment its horribly broken, we would have to look into fixing on all > three platforms now that upstream also supports linux. * chore: bump chromium in DEPS to 78.0.3904.1 * update pepper_flash.patch https://chromium-review.googlesource.com/c/chromium/src/+/1771371 * chore: bump chromium in DEPS to 78.0.3905.1 * Update patches * Convert Web Speech Synthesis API over to Mojo https://chromium-review.googlesource.com/c/chromium/src/+/1717595 (cherry picked from commite0163b0185) * Update patches * CookieInclusionStatus: Support warnings and multiple exclusion reasons https://chromium-review.googlesource.com/c/chromium/src/+/1756157 (cherry picked from commitab2f5ac40b) * Pass request_unadjusted_movement to lock mouse https://chromium-review.googlesource.com/c/chromium/src/+/1767098 (cherry picked from commita17daff6f1) * chore: rename thread_pool to thread_pool_instance Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1773663 (cherry picked from commit8547b09de8) * Remove the typemap from network::mojom::URLResponseHead. https://chromium-review.googlesource.com/c/chromium/src/+/1758653 (cherry picked from commita768ad210d) * ServiceWorker: Make Extension WebRequestAPI aware of service worker update check script requests https://chromium-review.googlesource.com/c/chromium/src/+/1782230 (cherry picked from commit615d33517a) * Convert CertVerifierClient to new Mojo types https://bugs.chromium.org/p/chromium/issues/detail?id=955171 (cherry picked from commitac5e8dbce5) * Convert DataPipeGetterPtr and DataPipeGetterRequest to new Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/1787760 https://chromium-review.googlesource.com/c/chromium/src/+/1787659 (cherry picked from commit8611783898) * Add tts patch * build: fix compilation with MSSTL (cherry picked from commit4d8cb7de9b)
54 lines
2.5 KiB
Diff
54 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Deepak Mohan <hop2deep@gmail.com>
|
|
Date: Tue, 10 Sep 2019 14:34:52 -0700
|
|
Subject: net: avoid vector<const T>, since it doesn't build with MSSTL yet.
|
|
|
|
Fixes build for embedders using `use_custom_libcxx=false` on windows.
|
|
This was introduced with https://chromium-review.googlesource.com/c/chromium/src/+/1638928
|
|
|
|
diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc
|
|
index d83ff7c15024bd8b7e674f480f8ffd91527dabb9..d5ee744b2a92fcb0c42a43b41796e4f1debb489e 100644
|
|
--- a/net/dns/dns_util.cc
|
|
+++ b/net/dns/dns_util.cc
|
|
@@ -139,11 +139,11 @@ struct DohUpgradeEntry {
|
|
const DnsConfig::DnsOverHttpsServerConfig dns_over_https_config;
|
|
};
|
|
|
|
-const std::vector<const DohUpgradeEntry>& GetDohUpgradeList() {
|
|
+const std::vector<DohUpgradeEntry>& GetDohUpgradeList() {
|
|
// The provider names in these entries should be kept in sync with the
|
|
// DohProviderId histogram suffix list in
|
|
// tools/metrics/histograms/histograms.xml.
|
|
- static const base::NoDestructor<std::vector<const DohUpgradeEntry>>
|
|
+ static const base::NoDestructor<std::vector<DohUpgradeEntry>>
|
|
upgradable_servers({
|
|
DohUpgradeEntry(
|
|
"CleanBrowsingAdult",
|
|
@@ -222,7 +222,7 @@ const std::vector<const DohUpgradeEntry>& GetDohUpgradeList() {
|
|
std::vector<const DohUpgradeEntry*> GetDohUpgradeEntriesFromNameservers(
|
|
const std::vector<IPEndPoint>& dns_servers,
|
|
const std::vector<std::string>& excluded_providers) {
|
|
- const std::vector<const DohUpgradeEntry>& upgradable_servers =
|
|
+ const std::vector<DohUpgradeEntry>& upgradable_servers =
|
|
GetDohUpgradeList();
|
|
std::vector<const DohUpgradeEntry*> entries;
|
|
|
|
@@ -417,7 +417,7 @@ std::vector<DnsConfig::DnsOverHttpsServerConfig>
|
|
GetDohUpgradeServersFromDotHostname(
|
|
const std::string& dot_server,
|
|
const std::vector<std::string>& excluded_providers) {
|
|
- const std::vector<const DohUpgradeEntry>& upgradable_servers =
|
|
+ const std::vector<DohUpgradeEntry>& upgradable_servers =
|
|
GetDohUpgradeList();
|
|
std::vector<DnsConfig::DnsOverHttpsServerConfig> doh_servers;
|
|
|
|
@@ -451,7 +451,7 @@ GetDohUpgradeServersFromNameservers(
|
|
|
|
std::string GetDohProviderIdForHistogramFromDohConfig(
|
|
const DnsConfig::DnsOverHttpsServerConfig& doh_server) {
|
|
- const std::vector<const DohUpgradeEntry>& upgradable_servers =
|
|
+ const std::vector<DohUpgradeEntry>& upgradable_servers =
|
|
GetDohUpgradeList();
|
|
for (const auto& upgrade_entry : upgradable_servers) {
|
|
if (doh_server.server_template ==
|