github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: update patches

Browse Source
This commit is contained in:
PatchUp
2024-01-11 13:12:13 +00:00
committed by John Kleinschmidt
parent a26dbb755f
commit 95b04b1fca
11 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/chromium/add_didinstallconditionalfeatures.patch
View File

@@ -23,10 +23,10 @@ index 79162faef6654f52651ffdff5705f7b27d2ae4f2..8148896d3f12772a1b4ba04601c57d9e
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 61cf400b697eabc3ba2af8e6359e2a5f15d2fde8..7a0bed0c32139ba2cc189cdfaee3cf010152a63c 100644
index 830fab69d710a510c82e7e4f5a60660da4fba218..d9fec6a204bb437260a5d9a97dbfc8e6346ef785 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4553,6 +4553,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4563,6 +4563,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}
@@ -40,10 +40,10 @@ index 61cf400b697eabc3ba2af8e6359e2a5f15d2fde8..7a0bed0c32139ba2cc189cdfaee3cf01
int world_id) {
for (auto& observer : observers_)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 2e8d7b30531c8ae309fca729ded220796ce13ede..e7164b329f1651f4e8622baa9880fd488a6cbe7a 100644
index 62491b134edb6920c0661d356e4380a04f91ebc3..ff9f6ca6f8e24634ebd9f8be502bc72fcd3ed4e5 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -634,6 +634,8 @@ class CONTENT_EXPORT RenderFrameImpl
@@ -636,6 +636,8 @@ class CONTENT_EXPORT RenderFrameImpl
void DidObserveLayoutShift(double score, bool after_input_or_scroll) override;
void DidCreateScriptContext(v8::Local<v8::Context> context,
int world_id) override;

14
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View File

@@ -33,10 +33,10 @@ index 3611378c052813bd9c9ab9ce7d1840d6535576bf..b148e0acaf28197ee1da634b5e4c449f
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 646b354b6fc47d03493039f21c4b17ce49cb38d7..8d5fb227e872c2668a50bb4590be6ffbe720926b 100644
index fcf5c84dc55e100c909fe1924a07e6013e13a984..54c3e596d5c59f60c4efa6ea5d122faf15a88daa 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4748,7 +4748,7 @@ static_library("browser") {
@@ -4749,7 +4749,7 @@ static_library("browser") {
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
# than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 646b354b6fc47d03493039f21c4b17ce49cb38d7..8d5fb227e872c2668a50bb4590be6ffb
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index c124c3d73c0de5c3878e403cd317e7a3ac18422a..0c033fef636dfe07001d5a198953077ba4a63939 100644
index 072bc1c1a8a0d756814323d7de167a33e6c0c68c..61881ee74ae9e1c58c7acf5f409affc67325bc64 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -7200,7 +7200,6 @@ if (!is_fuchsia) {
@@ -7211,7 +7211,6 @@ if (!is_fuchsia) {
deps += [
"//chrome:other_version",
@@ -57,7 +57,7 @@ index c124c3d73c0de5c3878e403cd317e7a3ac18422a..0c033fef636dfe07001d5a198953077b
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -7221,6 +7220,10 @@ if (!is_fuchsia) {
@@ -7232,6 +7231,10 @@ if (!is_fuchsia) {
"//ui/resources",
]
@@ -68,7 +68,7 @@ index c124c3d73c0de5c3878e403cd317e7a3ac18422a..0c033fef636dfe07001d5a198953077b
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -8243,7 +8246,6 @@ if (!is_fuchsia) {
@@ -8254,7 +8257,6 @@ if (!is_fuchsia) {
}
deps += [
@@ -76,7 +76,7 @@ index c124c3d73c0de5c3878e403cd317e7a3ac18422a..0c033fef636dfe07001d5a198953077b
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
"//chrome/browser/apps/app_service:app_registry_cache_waiter",
@@ -8336,6 +8338,10 @@ if (!is_fuchsia) {
@@ -8347,6 +8349,10 @@ if (!is_fuchsia) {
"//ui/webui/resources/js/browser_command:mojo_bindings",
]

8
patches/chromium/can_create_window.patch
View File

@@ -9,10 +9,10 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 77ff4f22d0190e84577023f7d3cda795ca17ec8a..9a8335535c8dd961ee7b6dc67527f6f96a604d0c 100644
index 30320410d0e1f7f388e3109bf314cd68011327a2..2be4d5b3da53134524ac67aaee812315a9e539b0 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -8218,6 +8218,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -8211,6 +8211,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
@@ -148,10 +148,10 @@ index 4b32bf8ccc4ed370e2d1a218ae1fd69a98e23636..b9168a2488f5c4977eba5856882b561e
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 0db50a5254f41f8f948816fc661f5b96369da113..61cf400b697eabc3ba2af8e6359e2a5f15d2fde8 100644
index b5a74dd6d0d6b9c1a851c1f21b7cb1f8a94461ab..830fab69d710a510c82e7e4f5a60660da4fba218 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -6540,6 +6540,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
@@ -6550,6 +6550,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
GetWebFrame()->IsAdScriptInStack());

6
patches/chromium/chore_introduce_blocking_api_for_electron.patch
View File

@@ -7,7 +7,7 @@ This patch comes after Chromium removed the ScopedAllowIO API in favor
of explicitly adding ScopedAllowBlocking calls as friends.
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index 53775a0aa1350ee433e3b23530fb0e246e575d2f..4e056adb25e0a32bc85fb16debe7844966d51f10 100644
index b0b4109b04de8c2861c5df48977d5dc48fe1e6e9..8d7947d2e8ee05dd0969b943e9d097afc7ac8d38 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -135,6 +135,7 @@ class KeyStorageLinux;
@@ -28,7 +28,7 @@ index 53775a0aa1350ee433e3b23530fb0e246e575d2f..4e056adb25e0a32bc85fb16debe78449
namespace enterprise_connectors {
class LinuxKeyRotationCommand;
} // namespace enterprise_connectors
@@ -564,6 +568,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking {
@@ -571,6 +575,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking {
friend class ::DesktopNotificationBalloon;
friend class ::FirefoxProfileLock;
friend class ::GaiaConfig;
@@ -36,7 +36,7 @@ index 53775a0aa1350ee433e3b23530fb0e246e575d2f..4e056adb25e0a32bc85fb16debe78449
friend class ::ProfileImpl;
friend class ::ScopedAllowBlockingForProfile;
friend class ::StartupTabProviderImpl;
@@ -602,6 +607,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking {
@@ -609,6 +614,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking {
friend class crosapi::LacrosThreadTypeDelegate;
friend class crypto::ScopedAllowBlockingForNSS; // http://crbug.com/59847
friend class drive::FakeDriveService;

10
patches/chromium/expose_setuseragent_on_networkcontext.patch
View File

@@ -33,7 +33,7 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
} // namespace net
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 26b42d959f8600db21d81a4cd3f87d3a1d20ad17..f8e3e2598cb7efe45d96838c840ec3fccb3f97df 100644
index 0baa6a42e5e78999cf2d0b0ce7f76b293264624f..97035a83f3ad14ee51791060f5322ed23aa10b71 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1526,6 +1526,13 @@ void NetworkContext::SetNetworkConditions(
@@ -51,7 +51,7 @@ index 26b42d959f8600db21d81a4cd3f87d3a1d20ad17..f8e3e2598cb7efe45d96838c840ec3fc
// This may only be called on NetworkContexts created with the constructor
// that calls MakeURLRequestContext().
diff --git a/services/network/network_context.h b/services/network/network_context.h
index 45aa40bd7c0bed46fa9215f3268181ed7668c13e..3d3dc3c118a07162a451715e6adc27c2c5472b63 100644
index 140ba906bb2ab40dd7ea27b54858db9023282863..e0028ba739cb23edc86c821220dab01427595c5c 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -316,6 +316,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -63,10 +63,10 @@ index 45aa40bd7c0bed46fa9215f3268181ed7668c13e..3d3dc3c118a07162a451715e6adc27c2
void SetEnableReferrers(bool enable_referrers) override;
#if BUILDFLAG(IS_CT_SUPPORTED)
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index ecfc90423639c4c2494355cd6f1bf1ae247236be..3a143d77c90e93b0df2384d96ab2c68936ebda66 100644
index 08a01b7f448a0e42c3372a8f745f1e48987f055b..47c3dfe24e673f11952020398829b0ac544faa8d 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -1234,6 +1234,9 @@ interface NetworkContext {
@@ -1258,6 +1258,9 @@ interface NetworkContext {
SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
NetworkConditions? conditions);
@@ -77,7 +77,7 @@ index ecfc90423639c4c2494355cd6f1bf1ae247236be..3a143d77c90e93b0df2384d96ab2c689
SetAcceptLanguage(string new_accept_language);
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index be94ed854cb5cf9e165e7e83a2e8cd3d3ab498cd..fca5afdc4a260559d5c7198de4686615ba4c09b3 100644
index 381c00fbe1af5711860b3237be1165e1c58540c0..cf16ab98f288b4a74dcb2bc9ab74ae6aa9d78805 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -147,6 +147,7 @@ class TestNetworkContext : public mojom::NetworkContext {

22
patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch
View File

@@ -9,10 +9,10 @@ to support content settings UI. The support pulls in chrome content settings
and UI code which are not valid in the scope of Electron.
diff --git a/chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc b/chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc
index d8e49b2ed69bd7eeb0b7d474c665fea7b06e297b..c07e1cb57de8fdd80c7c67bc14daea5ca3a37173 100644
index 0ce1329190c2fed707abcd5ffb01bf660b9069d7..5410c34efffa85569cc0947ee44a48b9ceb676b8 100644
--- a/chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc
+++ b/chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc
@@ -21,8 +21,10 @@
@@ -22,8 +22,10 @@
#include "ui/gfx/geometry/size.h"
#if !BUILDFLAG(IS_ANDROID)
#include "base/task/sequenced_task_runner.h"
@@ -23,7 +23,7 @@ index d8e49b2ed69bd7eeb0b7d474c665fea7b06e297b..c07e1cb57de8fdd80c7c67bc14daea5c
#include "media/base/media_switches.h"
#include "net/base/url_util.h"
#include "third_party/blink/public/common/features.h"
@@ -39,7 +41,7 @@ constexpr gfx::Size kMinWindowSize(240, 52);
@@ -44,7 +46,7 @@ constexpr gfx::Size kMinWindowSize(240, 52);
// not apply to video Picture-in-Picture windows.
constexpr double kMaxWindowSizeRatio = 0.8;
@@ -32,7 +32,7 @@ index d8e49b2ed69bd7eeb0b7d474c665fea7b06e297b..c07e1cb57de8fdd80c7c67bc14daea5c
// Returns true if a document picture-in-picture window should be focused upon
// opening it.
bool ShouldFocusPictureInPictureWindow(const NavigateParams& params) {
@@ -171,7 +173,7 @@ bool PictureInPictureWindowManager::ExitPictureInPictureViaWindowUi(
@@ -176,7 +178,7 @@ bool PictureInPictureWindowManager::ExitPictureInPictureViaWindowUi(
return false;
}
@@ -41,7 +41,7 @@ index d8e49b2ed69bd7eeb0b7d474c665fea7b06e297b..c07e1cb57de8fdd80c7c67bc14daea5c
if (auto_pip_setting_helper_) {
auto_pip_setting_helper_->OnUserClosedWindow();
}
@@ -354,7 +356,7 @@ gfx::Size PictureInPictureWindowManager::GetMaximumWindowSize(
@@ -359,7 +361,7 @@ gfx::Size PictureInPictureWindowManager::GetMaximumWindowSize(
// static
void PictureInPictureWindowManager::SetWindowParams(NavigateParams& params) {
@@ -50,7 +50,7 @@ index d8e49b2ed69bd7eeb0b7d474c665fea7b06e297b..c07e1cb57de8fdd80c7c67bc14daea5c
// Always show document picture-in-picture in a new window. When this is
// not opened via the AutoPictureInPictureTabHelper, focus the window.
params.window_action = ShouldFocusPictureInPictureWindow(params)
@@ -391,7 +393,7 @@ void PictureInPictureWindowManager::CloseWindowInternal() {
@@ -402,7 +404,7 @@ void PictureInPictureWindowManager::CloseWindowInternal() {
video_web_contents_observer_.reset();
pip_window_controller_->Close(false /* should_pause_video */);
pip_window_controller_ = nullptr;
@@ -59,7 +59,7 @@ index d8e49b2ed69bd7eeb0b7d474c665fea7b06e297b..c07e1cb57de8fdd80c7c67bc14daea5c
auto_pip_setting_helper_.reset();
#endif // !BUILDFLAG(IS_ANDROID)
}
@@ -402,8 +404,10 @@ void PictureInPictureWindowManager::DocumentWebContentsDestroyed() {
@@ -413,8 +415,10 @@ void PictureInPictureWindowManager::DocumentWebContentsDestroyed() {
// contents, so we only need to forget the controller here when user closes
// the parent web contents with the PiP window open.
document_web_contents_observer_.reset();
@@ -70,7 +70,7 @@ index d8e49b2ed69bd7eeb0b7d474c665fea7b06e297b..c07e1cb57de8fdd80c7c67bc14daea5c
if (pip_window_controller_)
pip_window_controller_ = nullptr;
}
@@ -425,6 +429,7 @@ PictureInPictureWindowManager::GetOverlayView(
@@ -436,6 +440,7 @@ PictureInPictureWindowManager::GetOverlayView(
return nullptr;
}
@@ -78,7 +78,7 @@ index d8e49b2ed69bd7eeb0b7d474c665fea7b06e297b..c07e1cb57de8fdd80c7c67bc14daea5c
// It would be nice to create this in `EnterPictureInPicture*`, but detecting
// auto-pip while pip is in the process of opening doesn't work.
//
@@ -455,6 +460,8 @@ PictureInPictureWindowManager::GetOverlayView(
@@ -466,6 +471,8 @@ PictureInPictureWindowManager::GetOverlayView(
}
return overlay_view;
@@ -87,7 +87,7 @@ index d8e49b2ed69bd7eeb0b7d474c665fea7b06e297b..c07e1cb57de8fdd80c7c67bc14daea5c
}
PictureInPictureOcclusionTracker*
@@ -465,6 +472,7 @@ PictureInPictureWindowManager::GetOcclusionTracker() {
@@ -476,6 +483,7 @@ PictureInPictureWindowManager::GetOcclusionTracker() {
#endif // !BUILDFLAG(IS_ANDROID)
#if !BUILDFLAG(IS_ANDROID)
@@ -95,7 +95,7 @@ index d8e49b2ed69bd7eeb0b7d474c665fea7b06e297b..c07e1cb57de8fdd80c7c67bc14daea5c
void PictureInPictureWindowManager::CreateAutoPipSettingHelperIfNeeded() {
// Because we have to defer creating this until after the tab helper finds out
// about pip, we don't care if there's already a helper. Just use it.
@@ -494,6 +502,7 @@ void PictureInPictureWindowManager::CreateAutoPipSettingHelperIfNeeded() {
@@ -505,6 +513,7 @@ void PictureInPictureWindowManager::CreateAutoPipSettingHelperIfNeeded() {
web_contents,
base::BindOnce(&PictureInPictureWindowManager::ExitPictureInPictureSoon));
}

4
patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
View File

@@ -35,7 +35,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to
system priority.
diff --git a/base/BUILD.gn b/base/BUILD.gn
index b5acd3b6eb7122aaf4284ce62212f415325a7394..9de4a87a2b11c196c95113984e4b7f3f160fd063 100644
index 2916d69d2b1db2f8185fafe97f10dbb4e84c3f47..03496947664007069251b6fef0ed78db47d56425 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1038,6 +1038,7 @@ component("base") {
@@ -1278,7 +1278,7 @@ index eb81a70e4d5d5cd3e6ae9b45f8cd1c795ea76c51..dc30306f2c5d20503399fc3a8860773a
} // namespace sandbox
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
index f90c93e24e5108a4ada2eda59094677609e803ea..b4732ba0be1ced6824cc567515a0c4f528a4d220 100644
index 3d8a9d4b222d1be1717bb169f2c7810282adc4d4..bad1100c97b2bdc6ab85bfe618763a5813b4191a 100644
--- a/third_party/blink/renderer/core/BUILD.gn
+++ b/third_party/blink/renderer/core/BUILD.gn
@@ -312,6 +312,7 @@ component("core") {

14
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
View File

@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
session.setCertificateVerifyCallback.
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 9a4bb25a5e041b49673a0ab19e8469c446952d6b..26b42d959f8600db21d81a4cd3f87d3a1d20ad17 100644
index ad8c5086ddc5c86162a151524ed0115555a045ae..0baa6a42e5e78999cf2d0b0ce7f76b293264624f 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -147,6 +147,11 @@
@@ -136,7 +136,7 @@ index 9a4bb25a5e041b49673a0ab19e8469c446952d6b..26b42d959f8600db21d81a4cd3f87d3a
void NetworkContext::CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) {
@@ -2352,6 +2457,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2241,6 +2346,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
std::move(cert_verifier));
cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_.get());
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -147,7 +147,7 @@ index 9a4bb25a5e041b49673a0ab19e8469c446952d6b..26b42d959f8600db21d81a4cd3f87d3a
builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
diff --git a/services/network/network_context.h b/services/network/network_context.h
index 988ef64ea7ec1527be735bccef7edbf3802aba55..45aa40bd7c0bed46fa9215f3268181ed7668c13e 100644
index b52a48c7f58994dbd0e6f0591c5a0fed4742d703..140ba906bb2ab40dd7ea27b54858db9023282863 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -114,6 +114,7 @@ class URLMatcher;
@@ -167,7 +167,7 @@ index 988ef64ea7ec1527be735bccef7edbf3802aba55..45aa40bd7c0bed46fa9215f3268181ed
void ResetURLLoaderFactories() override;
void GetViaObliviousHttp(
mojom::ObliviousHttpRequestPtr request,
@@ -887,6 +890,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -881,6 +884,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
std::vector<base::OnceClosure> dismount_closures_;
#endif // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
@@ -177,7 +177,7 @@ index 988ef64ea7ec1527be735bccef7edbf3802aba55..45aa40bd7c0bed46fa9215f3268181ed
std::unique_ptr<HostResolver> internal_host_resolver_;
// Map values set to non-null only if that HostResolver has its own private
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 5c850267c3744ded7af8cc6356109bc220ed8143..ecfc90423639c4c2494355cd6f1bf1ae247236be 100644
index 345662a15929f79267444b7d538dedffcb87f0e0..08a01b7f448a0e42c3372a8f745f1e48987f055b 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -296,6 +296,16 @@ struct SocketBrokerRemotes {
@@ -197,7 +197,7 @@ index 5c850267c3744ded7af8cc6356109bc220ed8143..ecfc90423639c4c2494355cd6f1bf1ae
// Parameters for constructing a network context.
struct NetworkContextParams {
@@ -938,6 +948,9 @@ interface NetworkContext {
@@ -962,6 +972,9 @@ interface NetworkContext {
// Sets a client for this network context.
SetClient(pending_remote<NetworkContextClient> client);
@@ -208,7 +208,7 @@ index 5c850267c3744ded7af8cc6356109bc220ed8143..ecfc90423639c4c2494355cd6f1bf1ae
CreateURLLoaderFactory(pending_receiver<URLLoaderFactory> url_loader_factory,
URLLoaderFactoryParams params);
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index 23694108d7d81ac70085513ef32f569f89564682..be94ed854cb5cf9e165e7e83a2e8cd3d3ab498cd 100644
index caf25a79cface282294e4646dcb8fd08d6ca6efd..381c00fbe1af5711860b3237be1165e1c58540c0 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -62,6 +62,8 @@ class TestNetworkContext : public mojom::NetworkContext {

2
patches/chromium/notification_provenance.patch
View File

@@ -133,7 +133,7 @@ index 1dc5478b8d0787a1cc82dc9fcb0227fed3f583c2..9a76f675ccdd4b173afa65aa05b733d4
const GURL& document_url,
const WeakDocumentPtr& weak_document_ptr,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index e9b2454aa41e9b330d23f18dad3e195722bdd42a..ef50edd704ff0889d99cc0fed6e345c2514e0fc6 100644
index 935d172aa06ec108bcfda4a38c2a5acc1119197b..38cedc8ecdd1b9ac446cc44354f04f8bfb259fe1 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2045,7 +2045,7 @@ void RenderProcessHostImpl::CreateNotificationService(

2
patches/chromium/support_mixed_sandbox_with_zygote.patch
View File

@@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index ef50edd704ff0889d99cc0fed6e345c2514e0fc6..1a30d5b148e8587ae3bae249e6c4a46a8c0f5fad 100644
index 38cedc8ecdd1b9ac446cc44354f04f8bfb259fe1..10e673cf96a6c8302e5ed34caf5ee7a9ccb6d7bc 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1727,9 +1727,15 @@ bool RenderProcessHostImpl::Init() {

4
patches/chromium/webview_fullscreen.patch
View File

@@ -15,10 +15,10 @@ Note that we also need to manually update embedder's
`api::WebContents::IsFullscreenForTabOrPending` value.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 9a8335535c8dd961ee7b6dc67527f6f96a604d0c..c18cf98a932aba0ff084e3a7393c7d8fa8860c8a 100644
index 2be4d5b3da53134524ac67aaee812315a9e539b0..fd9c189f60b3e627760e15df8e15f3c4b7ac3390 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -7410,6 +7410,17 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -7403,6 +7403,17 @@ void RenderFrameHostImpl::EnterFullscreen(
}
}