mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: update patches

Browse source
This commit is contained in:
Samuel Attard 2021-03-04 16:20:36 -08:00
parent e715b9c921
commit c8148febfa
3 changed files with 4 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch
View file

@ -82,7 +82,7 @@ index ce483753dff0130c5ac20258c0cf7e399c0d1c51..dea741c526f10616c3779f76a6d9cf8a
OnAuthCredentials(base::nullopt);
return;
}
@@ -1201,10 +1207,21 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
@@ -1201,10 +1207,22 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
DCHECK(!auth_challenge_responder_receiver_.is_bound());
@ -96,8 +96,9 @@ index ce483753dff0130c5ac20258c0cf7e399c0d1c51..dea741c526f10616c3779f76a6d9cf8a
+ head->auth_challenge_info = auth_info;
+ if (auth_client_) {
+ auth_client_->OnAuthRequired(
+ fetch_window_id_, request_id_, url_request_->url(), first_auth_attempt_,
+ auth_info, url_request->response_headers(),
+ fetch_window_id_, factory_params_->process_id, render_frame_id_,
+ request_id_, url_request_->url(), first_auth_attempt_, auth_info,
+ std::move(head),
+ auth_challenge_responder_receiver_.BindNewPipeAndPassRemote());
+ } else {
+ auth_cert_observer_->OnAuthRequired(

1
patches/v8/.patches
View file

@ -6,4 +6,3 @@ export_symbols_needed_for_windows_build.patch
workaround_an_undefined_symbol_error.patch
do_not_export_private_v8_symbols_on_windows.patch
fix_build_deprecated_attirbute_for_older_msvc_versions.patch
chore_disallow_copying_cppheapcreateparams.patch

47
patches/v8/chore_disallow_copying_cppheapcreateparams.patch
View file

@ -1,47 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Thu, 19 Nov 2020 13:12:56 -0600
Subject: chore: disallow copying CppHeapCreateParams
Experimental commit to resolve FTBS https://ci.appveyor.com/project/electron-bot/electron-ljo26/builds/36405680#L25345
which introduces a new struct CppHeapCreateParams that aggregates a
vector of unique_ptrs. Our Windows CI is unhappy that this struct
implicitly deletes its copy ctor, so this commit makes it explicit.
Xref: https://chromium-review.googlesource.com/c/v8/v8/+/2536642
diff --git a/include/v8-cppgc.h b/include/v8-cppgc.h
index fba35f71c9ae079fde28f5f26de1fbedcf8f671d..8b6e5fdb843ee5b70a68118cc384f23f405d64d2 100644
--- a/include/v8-cppgc.h
+++ b/include/v8-cppgc.h
@@ -72,12 +72,17 @@ struct WrapperDescriptor final {
uint16_t embedder_id_for_garbage_collected;
};
-struct V8_EXPORT CppHeapCreateParams {
+class V8_EXPORT CppHeapCreateParams {
+ public:
CppHeapCreateParams(const CppHeapCreateParams&) = delete;
CppHeapCreateParams& operator=(const CppHeapCreateParams&) = delete;
std::vector<std::unique_ptr<cppgc::CustomSpaceBase>> custom_spaces;
WrapperDescriptor wrapper_descriptor;
+
+ private:
+ CppHeapCreateParams (const CppHeapCreateParams&) =delete;
+ CppHeapCreateParams& operator=(const CppHeapCreateParams&) =delete;
};
/**
diff --git a/include/v8.h b/include/v8.h
index b869480cddda91242738786d9ffdc24c3d7ac7dd..a8b984658dc1309cb626f96c222ad9bffcb13754 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -93,6 +93,7 @@ class Utils;
class Value;
class WasmMemoryObject;
class WasmModuleObject;
+class CppHeapCreateParams;
template <class K, class V, class T>
class GlobalValueMap;
template <class K, class V, class T>