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

chore: bump chromium to 113.0.5668.0 (main) (#37646)

Browse source 
* chore: bump chromium in DEPS to 113.0.5668.0

* chore: update patches

* chore: fixup for lint

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2023-03-22 20:09:13 -04:00 committed by GitHub
parent 52481bc923
commit 916861036d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 78 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = {
'chromium_version':
'113.0.5666.0',
'113.0.5668.0',
'node_version':
'v18.15.0',
'nan_version':

2
patches/chromium/blink_local_frame.patch
View file

@ -49,7 +49,7 @@ index b7bff829d779036ce0341b52ce9adc28eac91fa2..79b48d028ff6742d0d43ac6d32242f50
// its owning reference back to our owning LocalFrame.
client_->Detached(type);
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index a010de6ff33940f15450fefde5fddda3d6b5b37d..c6c10bb3dbaa25919a8d1c5aed363e37537e206f 100644
index 296fd54e6aa8f678d21ee3547cbc2a91eacfcaad..ce83dac248559ff3779f957527eb56aec95ed3d9 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -622,10 +622,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {

10
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file

@ -33,10 +33,10 @@ index cf53c168b31fecca8fd07f167d1e3523bc3be568..b13ffdfb9ffdaea0908b0b4b8260666f
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index f22463331732a07802a86cb65c07b9f1a1d3c29f..bda6ef4df1d2718ff6403ec392b67e17bab8a6f0 100644
index dd3ed42ff8b59f9346d864e96f9f20cf19c8dbdc..2bee1495ba31a255b66b048acf122a86836ba1d4 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4544,7 +4544,7 @@ static_library("browser") {
@@ -4552,7 +4552,7 @@ static_library("browser") {
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
# than here in :chrome_dll.
@ -46,7 +46,7 @@ index f22463331732a07802a86cb65c07b9f1a1d3c29f..bda6ef4df1d2718ff6403ec392b67e17
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index f4f0653f78b4bd114e46f60f214a5269fd9229c5..aa5d6db8cc9cf2a6f3266f2265460073fbe45df0 100644
index 03bbf4e354c5612a31a35c66999645c322d3ea3c..8e1ad9be9edfb20d734423fc37a7c74dc6196543 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6370,7 +6370,6 @@ test("unit_tests") {
@ -68,7 +68,7 @@ index f4f0653f78b4bd114e46f60f214a5269fd9229c5..aa5d6db8cc9cf2a6f3266f2265460073
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -7313,7 +7316,6 @@ test("unit_tests") {
@@ -7318,7 +7321,6 @@ test("unit_tests") {
}
deps += [
@ -76,7 +76,7 @@ index f4f0653f78b4bd114e46f60f214a5269fd9229c5..aa5d6db8cc9cf2a6f3266f2265460073
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
"//chrome/browser/apps/app_service:test_support",
@@ -7389,6 +7391,10 @@ test("unit_tests") {
@@ -7394,6 +7396,10 @@ test("unit_tests") {
"//ui/webui/resources/js/browser_command:mojo_bindings",
]

4
patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch
View file

@ -6,7 +6,7 @@ Subject: build: only use the mas build config in the required components
Before landing this patch should be split into the relevant MAS patches, or at least the patch this one partially reverts
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 070a1835319b26d1a602294ec1f380a773f886ac..f650946752cba6902434b0ddc737fee9af14c897 100644
index e3518fb8c518de4874da9a6288bac4acd0ee6cec..ac3f79b63fb25c2f0fb15692b4d8bc46ab73a94f 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1035,6 +1035,7 @@ component("base") {
@ -76,7 +76,7 @@ index 17b6cfd529e971cfe6683531d14daa121f531bb1..5ba0aacf84177274935bfdd22e26a299
if (is_win) {
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 2878747fa5685354f6a05fba429422aca1290781..cd32d3476ee38d6a0ee59cf2b305d773b4f570f9 100644
index 04c3f2e02fa5b1c06f92d565f1acc725ca1b37ec..cae80ff987a962029d57a2c990e3a1d0fb5a1bed 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -56,6 +56,7 @@ source_set("browser") {

8
patches/chromium/can_create_window.patch
View file

@ -9,7 +9,7 @@ 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 26d5f062cdc434139f6b136f12315e18f5db749e..c89d95fdfe292d87949e2ad6ef0ab499092c7148 100644
index b1d5cfa7f38a45b2e4bc47ced22a81a58203d017..2d7451eed6fc95388a8118514ba899da7aeda772 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -7634,6 +7634,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@ -21,10 +21,10 @@ index 26d5f062cdc434139f6b136f12315e18f5db749e..c89d95fdfe292d87949e2ad6ef0ab499
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 8cd33cbc8b38368fbf64c3ed74d7b37d88c44abf..e410f83816f6579dd07062b5037bf04407bda711 100644
index 79e0289b713ceba36383b64bea6d7b0cd402db94..37daf25c2a2a8c72fce2c5c49e5799c4bccc54df 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4123,6 +4123,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4147,6 +4147,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
auto* new_contents_impl = new_contents.get();
@ -37,7 +37,7 @@ index 8cd33cbc8b38368fbf64c3ed74d7b37d88c44abf..e410f83816f6579dd07062b5037bf044
// If the new frame has a name, make sure any SiteInstances that can find
// this named frame have proxies for it. Must be called after
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
@@ -4164,12 +4170,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4188,12 +4194,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}

6
patches/chromium/chore_add_electron_deps_to_gitignores.patch
View file

@ -18,7 +18,7 @@ index f39533c8951d81fba73910a89b5cf2de9bd34a02..00756eb8a32aec3bc109db9aa1b370ab
/google_apis/internal
/googleurl
diff --git a/third_party/.gitignore b/third_party/.gitignore
index 81a57c7001e3e2e03b3d8ffbcc142e363d85bfa8..57f9198494b2355c39b7f5f5df3724b2b9287567 100644
index 99375ca00842dabd41280333a680564ac557616e..825f913eb826de264ac101d6810c7f41aa822af2 100644
--- a/third_party/.gitignore
+++ b/third_party/.gitignore
@@ -90,6 +90,7 @@
@ -29,7 +29,7 @@ index 81a57c7001e3e2e03b3d8ffbcc142e363d85bfa8..57f9198494b2355c39b7f5f5df3724b2
/elfutils/src
/emoji-metadata/src
/emoji-segmenter/src
@@ -194,6 +195,7 @@
@@ -195,6 +196,7 @@
/mocha
/mockito/src
/nacl_sdk_binaries/
@ -37,7 +37,7 @@ index 81a57c7001e3e2e03b3d8ffbcc142e363d85bfa8..57f9198494b2355c39b7f5f5df3724b2
/nasm
/nearby/src
/neon_2_sse/src
@@ -257,6 +259,7 @@
@@ -258,6 +260,7 @@
/speex
/sqlite/src
/sqlite4java/lib/

8
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View file

@ -80,10 +80,10 @@ index aaaa61d5c3a1d5ade2fd355e38a3985ef5cc4e7d..b45746ba0f38a381a2ee5ca17f3a1685
}
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 2d196c0c5eee76bb0f89a94248d6c84d9272de85..e4c1e8a5c1a46f334bc54b71813c6f69b366e1df 100644
index f1e679d2db0f0f0b70c9be8d60d1351f48d44ad5..ebffc4b40e994d170380876130ec9182cf123fb3 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1836,12 +1836,11 @@ bool Browser::IsWebContentsCreationOverridden(
@@ -1837,12 +1837,11 @@ bool Browser::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@ -218,10 +218,10 @@ index 4e32d708ecf4afd3913d86ec1602ef2dc9a60998..1dd2f50fba1387b5eeb554dd540957d7
void AddNewContents(content::WebContents* source,
std::unique_ptr<content::WebContents> new_contents,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index f2dd1ecf9440030463669c515685d56c6a3b5c2d..220cb9a72e913e97830c58704441fdc55e2af560 100644
index 71b2238a1f2302bf3ec3fb648b98843a01c6dc0c..c4ac501e42f753f715d0ea890976ad7e9766d39e 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4026,8 +4026,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4050,8 +4050,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type,

16
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 53348f7a19ef39eb0a6fbdfbfcc7e280125f45f3..d67ac2c33eb94484827f96cc373d90a8633cf988 100644
index 1e6769d9091d0c0c17869730c754aec116dd372c..68044a4d9d271ce3930c0247533e8533059d2fe6 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1410,6 +1410,13 @@ void NetworkContext::SetNetworkConditions(
@ -51,22 +51,22 @@ index 53348f7a19ef39eb0a6fbdfbfcc7e280125f45f3..d67ac2c33eb94484827f96cc373d90a8
// 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 ce1162a98b9fa50e775d4f2539d6f38389d49bdd..515ea31e8d19b55cf81b15e2ba41c22686a16df5 100644
index 4e74b29c4063da63cb2b8b46ec0879d3a5a3f76d..9822ecde4ddd8209b4d1f129eb26a0b7a17d43ba 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -313,6 +313,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -309,6 +309,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
mojom::NetworkConditionsPtr conditions) override;
+ void SetUserAgent(const std::string& new_user_agent) override;
void SetAcceptLanguage(const std::string& new_accept_language) override;
void SetEnableReferrers(bool enable_referrers) override;
void SetEnablePreconnect(bool enable_preconnect) override;
#if BUILDFLAG(IS_CHROMEOS)
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index ee9771be4f6ed4bc30bc812eaf4f7b23643a4548..ce08b0912e4f314387727c830b93b07d4b7a2f06 100644
index aabe94b0c6a5d131723217118469465b7cc808f1..e8586f71bae62339b43eea554d7e0306eb4c8da1 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -1102,6 +1102,9 @@ interface NetworkContext {
@@ -1099,6 +1099,9 @@ interface NetworkContext {
SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
NetworkConditions? conditions);
@ -77,7 +77,7 @@ index ee9771be4f6ed4bc30bc812eaf4f7b23643a4548..ce08b0912e4f314387727c830b93b07d
SetAcceptLanguage(string new_accept_language);
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index 05071b3ab170d8c8d54e9dd1d3859ff3244a3310..fda0926db3b8266d74ab5fb2a8ac553c75ea3100 100644
index 53e79f16daaa2c536d7a867b8fc11874c00a042b..1b12249c279f83c486485d0ce8bf42e67e224fa4 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -139,6 +139,7 @@ class TestNetworkContext : public mojom::NetworkContext {
@ -87,4 +87,4 @@ index 05071b3ab170d8c8d54e9dd1d3859ff3244a3310..fda0926db3b8266d74ab5fb2a8ac553c
+ void SetUserAgent(const std::string& new_user_agent) override {}
void SetAcceptLanguage(const std::string& new_accept_language) override {}
void SetEnableReferrers(bool enable_referrers) override {}
void SetEnablePreconnect(bool enable_preconnect) override {}
#if BUILDFLAG(IS_CHROMEOS)

4
patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
View file

@ -112,7 +112,7 @@ index 48d273dd5db3b9db89fc543b04d47d1da9ccfede..0b95993bc7e5b8bd675e295f8d4acd2a
string mime_type;
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index 1320507f190cba1172469f985d2844240555850d..0bfde16e65668cc28dd0d0a6279b114552e91b43 100644
index bd09094f349a1051d328c917c29cf4c3a2b9ccdb..42abf94829bb6fc9774c6225c93a77d7366cfba5 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -642,6 +642,7 @@ URLLoader::URLLoader(
@ -132,7 +132,7 @@ index 1320507f190cba1172469f985d2844240555850d..0bfde16e65668cc28dd0d0a6279b1145
url_request_->SetResponseHeadersCallback(base::BindRepeating(
&URLLoader::SetRawResponseHeaders, base::Unretained(this)));
}
@@ -1591,6 +1592,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
@@ -1610,6 +1611,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
}
response_ = BuildResponseHead();

4
patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
View file

@ -6,10 +6,10 @@ Subject: fix: allow guest webcontents to enter fullscreen
This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9ef2e1eff9fbda6ebcd8c8e8f37201f1cf7c8718..66528026750e5c56c009f06ef4463d5f30ab5685 100644
index 73fbbcc21ad06c59d48d6e7a2897d4d04388a0f5..f48bf0d890e251461730199b8a3c600ee3639886 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3547,7 +3547,7 @@ void WebContentsImpl::EnterFullscreenMode(
@@ -3571,7 +3571,7 @@ void WebContentsImpl::EnterFullscreenMode(
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
DCHECK(CanEnterFullscreenMode(requesting_frame, options));
DCHECK(requesting_frame->IsActive());

10
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
View file

@ -17,10 +17,10 @@ policy->CanCommitOriginAndUrl.
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index 5bae7bfd9e427c162024cf1590e37d79c0745442..fea8e560e8f6ec3fd187a4d753295f9d63d7a6c0 100644
index ddc4da15221e992201e6b98a90188a49d56ae242..a076988e5ea7338e723f5c2bf38bc20fefd1e086 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -7200,10 +7200,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
@@ -7206,10 +7206,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
if (IsForMhtmlSubframe())
return origin_with_debug_info;
@ -37,10 +37,10 @@ index 5bae7bfd9e427c162024cf1590e37d79c0745442..fea8e560e8f6ec3fd187a4d753295f9d
}
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
index f4acf19001d2139d0b237116be94235255af1b41..8c130b6d3e3dc6390d9d22ea4da77cdd3743b210 100644
index 95ad4547efb132874179786553797974f7873961..1c6d8787d8c4e0ebc0c6e0c7ad6ade567bd9dbfa 100644
--- a/content/browser/renderer_host/render_frame_host_impl.h
+++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -2883,6 +2883,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -2892,6 +2892,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
// last committed document.
CookieChangeListener::CookieChangeInfo GetCookieChangeInfo();
@ -58,7 +58,7 @@ index f4acf19001d2139d0b237116be94235255af1b41..8c130b6d3e3dc6390d9d22ea4da77cdd
// Sets a ResourceCache in the renderer. `remote` must have the same process
// isolation policy.
// TODO(https://crbug.com/1414262): Add checks to ensure the preconditions.
@@ -3215,17 +3226,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -3228,17 +3239,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
// relevant.
void ResetWaitingState();

4
patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
View file

@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
to users. We should try to upstream this.
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 30e2e358ebe97a0cd06ddc63ce51ea845c82c77e..51e0b306d1d4781959dae4c02ff090b506230e16 100644
index f27919003e423bff6432c9ecc411f9811d20b1aa..b9c6e75260c233cca0e833b818e768e95ffa3f29 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -1867,7 +1867,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -1871,7 +1871,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
// IncrementCapturerCount() is destructed.
void DecrementCapturerCount(bool stay_hidden,
bool stay_awake,

4
patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
View file

@ -45,10 +45,10 @@ index 2ca4e42342ff6bf3f2ad104208944e36d572aa3c..7421cc779873b580d6f5a109d57ff744
// RenderFrameMetadataProvider::Observer implementation.
void OnRenderFrameMetadataChangedBeforeActivation(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 66528026750e5c56c009f06ef4463d5f30ab5685..547d87ea3cb5e6a3004d6164508f9a1a1691d8aa 100644
index f48bf0d890e251461730199b8a3c600ee3639886..09d4ef1af33c6434441714753a85ca2f370f88d1 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -8057,7 +8057,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
@@ -8081,7 +8081,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
"WebContentsImpl::OnFocusedElementChangedInFrame",
"render_frame_host", frame);
RenderWidgetHostViewBase* root_view =

2
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
View file

@ -64,7 +64,7 @@ index 4cd668a127a50e5462e3878c3f1dcb7384926768..dfbec49249404df8f8ebdbd26e6e865c
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index c6c10bb3dbaa25919a8d1c5aed363e37537e206f..b69f706059e0be9f1dc9199884d100e80bbb649c 100644
index ce83dac248559ff3779f957527eb56aec95ed3d9..d837a66929d6e8d3e305d4bbf5ef4ac5e2700990 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -2690,6 +2690,7 @@ void LocalFrame::RequestExecuteScript(

2
patches/chromium/gritsettings_resource_ids.patch
View file

@ -6,7 +6,7 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation.
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index a21845c454f438c0ec4607d8f90eb758a5c1b256..ca49c75c55b09639ed35f832a0d24947e19f7934 100644
index d635208d00ae6b19eb401227bd24f29c3b83380d..628afef66ee41952499b841772ffec768e7522a2 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1111,6 +1111,11 @@

2
patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
View file

@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 5dd69146da3af2e8a5f78bd4a4440df791916f05..8d104087f7baa04493eec9daafcfa76f077e18b7 100755
index c7b57628e5d50c0ddec646924ee95c4b6a9f5e7c..192249784d60626d6dbd3ef5143fa4db28a868ad 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -302,6 +302,8 @@ def GetDefaultHostOs():

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 8d2080d91c5c0a1d4fbd6a4261d9c14bf36bc34c..53348f7a19ef39eb0a6fbdfbfcc7e280125f45f3 100644
index f4a9d9a7d977ed97b2c9284dbf7f13c12a22b4db..1e6769d9091d0c0c17869730c754aec116dd372c 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -138,6 +138,11 @@
@ -128,7 +128,7 @@ index 8d2080d91c5c0a1d4fbd6a4261d9c14bf36bc34c..53348f7a19ef39eb0a6fbdfbfcc7e280
void NetworkContext::CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) {
@@ -2217,6 +2314,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2213,6 +2310,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
std::move(cert_verifier));
cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_.get());
#endif // BUILDFLAG(IS_CHROMEOS)
@ -139,7 +139,7 @@ index 8d2080d91c5c0a1d4fbd6a4261d9c14bf36bc34c..53348f7a19ef39eb0a6fbdfbfcc7e280
builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
diff --git a/services/network/network_context.h b/services/network/network_context.h
index ab0d0362e9d61b6a5c395591f772819f0302d8aa..ce1162a98b9fa50e775d4f2539d6f38389d49bdd 100644
index 08ae9bbf8d3ea77c38accc919995e9d2fdc04c8b..4e74b29c4063da63cb2b8b46ec0879d3a5a3f76d 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -114,6 +114,7 @@ class URLMatcher;
@ -150,7 +150,7 @@ index ab0d0362e9d61b6a5c395591f772819f0302d8aa..ce1162a98b9fa50e775d4f2539d6f383
class CookieManager;
class HostResolver;
class MdnsResponderManager;
@@ -249,6 +250,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -245,6 +246,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
void CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) override;
@ -159,7 +159,7 @@ index ab0d0362e9d61b6a5c395591f772819f0302d8aa..ce1162a98b9fa50e775d4f2539d6f383
void ResetURLLoaderFactories() override;
void GetViaObliviousHttp(
mojom::ObliviousHttpRequestPtr request,
@@ -845,6 +848,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -840,6 +843,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
std::vector<base::OnceClosure> dismount_closures_;
#endif // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
@ -169,7 +169,7 @@ index ab0d0362e9d61b6a5c395591f772819f0302d8aa..ce1162a98b9fa50e775d4f2539d6f383
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 290804a60997d21f5486e83b9625c73dd8685106..ee9771be4f6ed4bc30bc812eaf4f7b23643a4548 100644
index c0694c8b6b40ce5377d5d054fafda6bea63031a7..aabe94b0c6a5d131723217118469465b7cc808f1 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -293,6 +293,17 @@ struct NetworkContextFilePaths {
@ -190,7 +190,7 @@ index 290804a60997d21f5486e83b9625c73dd8685106..ee9771be4f6ed4bc30bc812eaf4f7b23
// Parameters for constructing a network context.
struct NetworkContextParams {
// The user agent string.
@@ -840,6 +851,9 @@ interface NetworkContext {
@@ -837,6 +848,9 @@ interface NetworkContext {
// Sets a client for this network context.
SetClient(pending_remote<NetworkContextClient> client);

6
patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
View file

@ -8,10 +8,10 @@ needed in chromium but our autofill implementation uses them. This patch can be
our autofill implementation to work like Chromium's.
diff --git a/ui/color/color_id.h b/ui/color/color_id.h
index e25a87d2710ed0486bd780791635a5c2e2adfd48..8c0e4d2f25a74ab3c09655871e8586fc9f1bd10b 100644
index 52320d02883b51f40a0f21b19245303e32b62336..8b946da457a468c14cc57ff46e019558ef230304 100644
--- a/ui/color/color_id.h
+++ b/ui/color/color_id.h
@@ -345,6 +345,10 @@
@@ -349,6 +349,10 @@
E_CPONLY(kColorScrollbarThumbInactive) \
E_CPONLY(kColorScrollbarThumbPressed) \
E_CPONLY(kColorScrollbarTrack) \
@ -22,7 +22,7 @@ index e25a87d2710ed0486bd780791635a5c2e2adfd48..8c0e4d2f25a74ab3c09655871e8586fc
E_CPONLY(kColorSeparator) \
E_CPONLY(kColorShadowBase) \
E_CPONLY(kColorShadowValueAmbientShadowElevationSixteen) \
@@ -416,6 +420,7 @@
@@ -420,6 +424,7 @@
E_CPONLY(kColorTreeNodeForeground) \
E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \

4
patches/chromium/printing.patch
View file

@ -818,10 +818,10 @@ index 146fbcb2e6bd4348110ecc3220d6ac0ac59babf3..eecc3118033ef7fe1f17aba48cd19b17
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
// Set options for print preset from source PDF document.
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 72b5c69bfa0c222dbe6d11822b62056d26f7f461..2878747fa5685354f6a05fba429422aca1290781 100644
index 1c99ce5b8dfa6bb302bc11240fd3276ec77c6df4..04c3f2e02fa5b1c06f92d565f1acc725ca1b37ec 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2831,8 +2831,9 @@ source_set("browser") {
@@ -2835,8 +2835,9 @@ source_set("browser") {
"//ppapi/shared_impl",
]

12
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View file

@ -43,10 +43,10 @@ index d164a86023ceb2718dfefce23d0a9fc910150f0e..a6c12048023a42192894f46efd90ff19
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index e410f83816f6579dd07062b5037bf04407bda711..f2dd1ecf9440030463669c515685d56c6a3b5c2d 100644
index 37daf25c2a2a8c72fce2c5c49e5799c4bccc54df..71b2238a1f2302bf3ec3fb648b98843a01c6dc0c 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4715,6 +4715,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -4739,6 +4739,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}
@ -59,10 +59,10 @@ index e410f83816f6579dd07062b5037bf04407bda711..f2dd1ecf9440030463669c515685d56c
RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 1b0b92ec09df720f504fd12ca6f4ff73d86f603f..30e2e358ebe97a0cd06ddc63ce51ea845c82c77e 100644
index 69807399c332ba08b4e8ce345c86d63023713e7d..f27919003e423bff6432c9ecc411f9811d20b1aa 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -968,6 +968,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -972,6 +972,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
void SendScreenRects() override;
void SendActiveState(bool active) override;
TextInputManager* GetTextInputManager() override;
@ -71,7 +71,7 @@ index 1b0b92ec09df720f504fd12ca6f4ff73d86f603f..30e2e358ebe97a0cd06ddc63ce51ea84
RenderWidgetHostImpl* render_widget_host) override;
bool IsShowingContextMenuOnPage() const override;
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index f4c8ee3fe8b161752b4c3b74f43b69f2b348d3c2..bab2cd2e09819e7629f5b9f6e8f92667a8ad7990 100644
index 977cd925f574c6960f4d801540f37e2a13396504..fcc16b4dff08b781be4e3494ae20481ca85dcd16 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -30,6 +30,7 @@
@ -82,7 +82,7 @@ index f4c8ee3fe8b161752b4c3b74f43b69f2b348d3c2..bab2cd2e09819e7629f5b9f6e8f92667
#include "ui/base/page_transition_types.h"
#include "ui/base/window_open_disposition.h"
@@ -546,6 +547,9 @@ class CONTENT_EXPORT WebContentsObserver {
@@ -560,6 +561,9 @@ class CONTENT_EXPORT WebContentsObserver {
// Invoked when the primary main frame changes size.
virtual void PrimaryMainFrameWasResized(bool width_changed) {}

6
patches/chromium/revert_roll_clang_rust_llvmorg-16-init-17653-g39da55e8-3.patch
View file

@ -25,10 +25,10 @@ index 7ddeb126840f554955f6339a54756e21382d5a7d..c9558ee8b59f2824df9f4f103099a9d3
# Extension for shared library files (including leading dot).
diff --git a/tools/clang/scripts/build.py b/tools/clang/scripts/build.py
index b686912d6fb5775731b07217c964dc9f0ade8309..d78a85422fcbf3afb909d5195fad2942058246f8 100755
index 2dc93235a96d610b0bdfa9cad2c4be36df18b96f..392eb396c124a2e4179522d3f8d08ad0bbd6df6d 100755
--- a/tools/clang/scripts/build.py
+++ b/tools/clang/scripts/build.py
@@ -578,6 +578,15 @@ def main():
@@ -595,6 +595,15 @@ def main():
global CLANG_REVISION, PACKAGE_VERSION, LLVM_BUILD_DIR
@ -45,7 +45,7 @@ index b686912d6fb5775731b07217c964dc9f0ade8309..d78a85422fcbf3afb909d5195fad2942
print('--pgo/--thinlto requires --bootstrap')
return 1
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 8d104087f7baa04493eec9daafcfa76f077e18b7..106849006b66b157da92df2bbf2f7016d56dc375 100755
index 192249784d60626d6dbd3ef5143fa4db28a868ad..36b276b84a950a51f68b80d277ddf40d9d70fe47 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -35,11 +35,12 @@ import zlib

6
patches/chromium/web_contents.patch
View file

@ -9,10 +9,10 @@ is needed for OSR.
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 220cb9a72e913e97830c58704441fdc55e2af560..9ef2e1eff9fbda6ebcd8c8e8f37201f1cf7c8718 100644
index c4ac501e42f753f715d0ea890976ad7e9766d39e..73fbbcc21ad06c59d48d6e7a2897d4d04388a0f5 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3165,6 +3165,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3189,6 +3189,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
params.main_frame_name, GetOpener(), primary_main_frame_policy,
base::UnguessableToken::Create());
@ -26,7 +26,7 @@ index 220cb9a72e913e97830c58704441fdc55e2af560..9ef2e1eff9fbda6ebcd8c8e8f37201f1
std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3175,6 +3182,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3199,6 +3206,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_);
}

2
patches/chromium/webview_fullscreen.patch
View file

@ -14,7 +14,7 @@ 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 c89d95fdfe292d87949e2ad6ef0ab499092c7148..06313410ebaf0361cd0e35bd48a48b560938cd97 100644
index 2d7451eed6fc95388a8118514ba899da7aeda772..4eaef7517af1dc4cbae9f6c54c626dc4bb151955 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6868,6 +6868,17 @@ void RenderFrameHostImpl::EnterFullscreen(

6
patches/v8/build_gn.patch
View file

@ -9,10 +9,10 @@ necessary for native modules to load.
Also, some fixes relating to mksnapshot on ARM.
diff --git a/BUILD.gn b/BUILD.gn
index 5e5bb5a7dee99df7bb52eb137a217e4bcaf68bcc..75869b200c4ae73108cc03e47aa581d57e470426 100644
index ac155fd467f5a4b56bc861e8fc62c20b02e3d247..534b7c3165e549f87f16c931ccfe87f855ac550f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -689,7 +689,7 @@ config("internal_config") {
@@ -691,7 +691,7 @@ config("internal_config") {
":cppgc_header_features",
]
@ -21,7 +21,7 @@ index 5e5bb5a7dee99df7bb52eb137a217e4bcaf68bcc..75869b200c4ae73108cc03e47aa581d5
defines += [ "BUILDING_V8_SHARED" ]
}
@@ -6381,7 +6381,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -6384,7 +6384,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]

4
patches/v8/do_not_export_private_v8_symbols_on_windows.patch
View file

@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
contain any standard C++ library exports (e.g. `std::ostringstream`).
diff --git a/BUILD.gn b/BUILD.gn
index 4594ab8d14a6b3221f2391935927dfc692a5cc8c..a8c8d65a76c7b8d73fd279e58d2149b9a9b969b4 100644
index 3fdd0beb746b2739689e08a741c387c87ad99ded..83ac0a1a2abe2e917f314bb88e28a27f71019101 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -689,6 +689,10 @@ config("internal_config") {
@@ -691,6 +691,10 @@ config("internal_config") {
":cppgc_header_features",
]

2
patches/v8/export_symbols_needed_for_windows_build.patch
View file

@ -19,7 +19,7 @@ index eb0b3d61ddc74f513707643c9316b9f80c0d6ada..90d46b3be7c5141e476fad2744275cd5
explicit inline Relocatable(Isolate* isolate);
inline virtual ~Relocatable();
diff --git a/src/objects/ordered-hash-table.h b/src/objects/ordered-hash-table.h
index 60a6343bb0698902074741c860f3af0f398a85a5..5699fd042e8e3fa19d155de5162a18e24b87f90c 100644
index 41cb6cf6e271ad85d129c6ec8ee0c7971f0655f0..5f8e67958ba73b5375e1d4927e7de700dfb7ff4a 100644
--- a/src/objects/ordered-hash-table.h
+++ b/src/objects/ordered-hash-table.h
@@ -64,7 +64,7 @@ namespace internal {

4
patches/v8/expose_mksnapshot.patch
View file

@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
Needed in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn
index 75869b200c4ae73108cc03e47aa581d57e470426..4594ab8d14a6b3221f2391935927dfc692a5cc8c 100644
index 534b7c3165e549f87f16c931ccfe87f855ac550f..3fdd0beb746b2739689e08a741c387c87ad99ded 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -6393,7 +6393,6 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -6396,7 +6396,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") {

2
shell/browser/browser_linux.cc
View file

@ -29,7 +29,7 @@ const char kXdgSettingsDefaultSchemeHandler[] = "default-url-scheme-handler";
// The use of the ForTesting flavors is a hack workaround to avoid having to
// patch these as friends into the associated guard classes.
class [[maybe_unused, nodiscard]] LaunchXdgUtilityScopedAllowBaseSyncPrimitives
: public base::ScopedAllowBaseSyncPrimitivesForTesting{};
: public base::ScopedAllowBaseSyncPrimitivesForTesting {};
bool LaunchXdgUtility(const std::vector<std::string>& argv, int* exit_code) {
*exit_code = EXIT_FAILURE;