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: export_all_patches

Browse Source
This commit is contained in:
Charles Kerr
2021-04-02 17:25:30 -05:00
committed by Samuel Attard
parent d5b017208b
commit 218952ec9d
31 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/chromium/accelerator.patch
View File

@@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
3. Ctrl-Shift-= should show as Ctrl-+
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
index c44f3d375202..8e0c14463158 100644
index c44f3d3752025bd3f11db790a97a48e8ba856034..8e0c1446315823a391614b19aa2c4ba2e5faed0d 100644
--- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc
@@ -11,6 +11,7 @@

10
patches/chromium/add_didinstallconditionalfeatures.patch
View File

@@ -23,10 +23,10 @@ index 5a733f2086ec10d3010da52a2758e1748d1178e1..d8c7ef2e3c03f5275c1ed58849ec892f
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 9e871c08ba85571063e906d314f704df705a1e4b..ae77e7566d47aa86513dc9671dd9a67c684e74f1 100644
index 7297cf0034d746bf3ac37d52bb024944219d13cb..db755b81622a00429141493d9877c73cce23d164 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4537,6 +4537,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4551,6 +4551,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}
@@ -40,10 +40,10 @@ index 9e871c08ba85571063e906d314f704df705a1e4b..ae77e7566d47aa86513dc9671dd9a67c
int world_id) {
for (auto& observer : observers_)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index a2c21adbdc6ddfa5290e92cccbf9a120987ab5d9..1a1a73c4f2ec7479e43b1cb8570767a9f6715ee7 100644
index eedbed861396c1de4faf828e23bee8b9920ba602..b4c0b684e5a710806376cc83dfcefe82c153faba 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -584,6 +584,8 @@ class CONTENT_EXPORT RenderFrameImpl
@@ -585,6 +585,8 @@ class CONTENT_EXPORT RenderFrameImpl
blink::WebLocalFrameClient::LazyLoadBehavior lazy_load_behavior) override;
void DidCreateScriptContext(v8::Local<v8::Context> context,
int world_id) override;
@@ -67,7 +67,7 @@ index 883f83327a5b04ad56d82b91e1c7d8fa674324b1..2b7d8e13dcde8cd916c1d0a804883415
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
int32_t world_id) {}
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
index be5cf4457cd379d5abc119d209d2df6520ad1022..8a0baac5bb8cb403324fb8156be62b924d6d3d1a 100644
index 50aa1b94ac6aab922f570d78f06096226d428c33..7af7ad0b7ed50dfc1ac061a915d3a99291afaec4 100644
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -188,6 +188,7 @@ void LocalWindowProxy::Initialize() {

14
patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch
View File

@@ -49,10 +49,10 @@ index 69e8d361c9e14f325fc897dad2819b2a57819e75..66ab57629fb07baa52e7a3f64dde4a96
// cookies) and to shard network resources, like the cache. If set, takes
// precedence over ResourceRequest::TrustedParams::IsolationInfo field
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index 5b35cc21830c5a59ceddea64e5e3c7dd68cb62be..7d50e66c5dc14f62fec5ddaf2fc4813b5f868b8a 100644
index 4e9acd4055df32e1249e870f517b662b22268712..96c00617fe6b761a13a38669d13c83a5a438452d 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -461,6 +461,7 @@ URLLoader::URLLoader(
@@ -463,6 +463,7 @@ URLLoader::URLLoader(
scoped_refptr<ResourceSchedulerClient> resource_scheduler_client,
base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
@@ -60,7 +60,7 @@ index 5b35cc21830c5a59ceddea64e5e3c7dd68cb62be..7d50e66c5dc14f62fec5ddaf2fc4813b
mojom::OriginPolicyManager* origin_policy_manager,
std::unique_ptr<TrustTokenRequestHelperFactory> trust_token_helper_factory,
const cors::OriginAccessList& origin_access_list,
@@ -525,6 +526,11 @@ URLLoader::URLLoader(
@@ -527,6 +528,11 @@ URLLoader::URLLoader(
header_client_.set_disconnect_handler(
base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
}
@@ -72,7 +72,7 @@ index 5b35cc21830c5a59ceddea64e5e3c7dd68cb62be..7d50e66c5dc14f62fec5ddaf2fc4813b
if (want_raw_headers_) {
options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
mojom::kURLLoadOptionSendSSLInfoForCertificateError;
@@ -1187,7 +1193,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
@@ -1192,7 +1198,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
return;
}
auto* url_loader_network_observer = GetURLLoaderNetworkServiceObserver();
@@ -81,7 +81,7 @@ index 5b35cc21830c5a59ceddea64e5e3c7dd68cb62be..7d50e66c5dc14f62fec5ddaf2fc4813b
OnAuthCredentials(base::nullopt);
return;
}
@@ -1199,10 +1205,22 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
@@ -1204,10 +1210,22 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
DCHECK(!auth_challenge_responder_receiver_.is_bound());
@@ -109,7 +109,7 @@ index 5b35cc21830c5a59ceddea64e5e3c7dd68cb62be..7d50e66c5dc14f62fec5ddaf2fc4813b
auth_challenge_responder_receiver_.set_disconnect_handler(
base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this)));
diff --git a/services/network/url_loader.h b/services/network/url_loader.h
index 5f8a2246a1a900dc710ebe637cfe4138d15a7e86..7820a0036057400d9debf63bf6ebc0e8fc5dc54b 100644
index 2c7d7de40f3084a80cab78659cb91d5c78286b92..404d431ed1d1a47ed4f9a77412b004953da1a854 100644
--- a/services/network/url_loader.h
+++ b/services/network/url_loader.h
@@ -128,6 +128,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
@@ -120,7 +120,7 @@ index 5f8a2246a1a900dc710ebe637cfe4138d15a7e86..7820a0036057400d9debf63bf6ebc0e8
mojom::OriginPolicyManager* origin_policy_manager,
std::unique_ptr<TrustTokenRequestHelperFactory>
trust_token_helper_factory,
@@ -509,6 +510,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
@@ -513,6 +514,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
base::Optional<base::UnguessableToken> fetch_window_id_;
mojo::Remote<mojom::TrustedHeaderClient> header_client_;

6
patches/chromium/blink_world_context.patch
View File

@@ -7,7 +7,7 @@ This exposes a method for obtaining a reference to an isolated world, which is
otherwise not available in the Blink API.
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index 151d9e3de3f4399bfe3489a155ea7747eabcd8e7..3b1e645f333bb0798d5fdea732a68c2f1088c7e9 100644
index 8505e1e62eab91a69bae9a409ecd51fdfbcc1896..4b792e288366ee1cbb29199fc955cbb2e94e78f2 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -368,6 +368,8 @@ class WebLocalFrame : public WebFrame {
@@ -20,7 +20,7 @@ index 151d9e3de3f4399bfe3489a155ea7747eabcd8e7..3b1e645f333bb0798d5fdea732a68c2f
// Executes script in the context of the current page and returns the value
// that the script evaluated to with callback. Script execution can be
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index ce2ed9317cad6da2260b8c9dccb22cc120ed6a6f..7bcd5371b3f956d4980023af8023f6111ddab87a 100644
index e00a3d8189ffa348f23c0ef65636226bdc088e85..48aeac714fa736a7cf1a21dcf64834df85445cd3 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -1037,6 +1037,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -38,7 +38,7 @@ index ce2ed9317cad6da2260b8c9dccb22cc120ed6a6f..7bcd5371b3f956d4980023af8023f611
return BindingSecurity::ShouldAllowAccessToFrame(
CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
index 7bd9fc46986354cdd4991443df7e84b74df07357..17812885aba991d3992f018b7ecfa73c53d7bab1 100644
index 3e37593a263133b5c02a06f12be29961f8163c3e..0ddd40b2543de1c771a03169fbaed657ae0e58e9 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
@@ -166,6 +166,8 @@ class CORE_EXPORT WebLocalFrameImpl final

18
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 929f3b3450ff6eda94d8bb36a0f3632c57c49ae0..f30e63504304d94a7af7155a09780881de1f4c7f 100644
index db6e887dd6f83e2bc643048ff75939cb9402069c..596ce3ac3e1ca597cae0fc7f5b425256814a4cb2 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5368,6 +5368,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -5397,6 +5397,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,
@@ -21,7 +21,7 @@ index 929f3b3450ff6eda94d8bb36a0f3632c57c49ae0..f30e63504304d94a7af7155a09780881
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 0321d0f6d9bc399887fffab4b8a46a40a9017289..24979412cf08fdec93d256bcf16d7dd1abdf4ff6 100644
index e0a37e9ae4a6c568584cf5af9f69a6741a89ccd1..a614848cb66184b3b57de1b16ad8e3d023a1bb3a 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3596,6 +3596,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -68,10 +68,10 @@ index fb71337543f3c967a50e8e6031c8f2f2a997ebe2..54c53188a78d1011dc6a6758f0c515c2
// Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index af88b54f9208cb067d83f04f379b0911b15403f0..59c747a6f63a53eff7e2ca8d46a859f615638e3f 100644
index 6eaf6018ef555acda3f1df371b8b51d555121c04..421a6c9acc4079df2c5de7322d1566039a17222c 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -559,6 +559,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -560,6 +560,8 @@ bool ContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -81,7 +81,7 @@ index af88b54f9208cb067d83f04f379b0911b15403f0..59c747a6f63a53eff7e2ca8d46a859f6
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 89ae0bdd201df11f92318cce98e8d8254e183903..584a98da0ccde8b87171c6b6343b484b48f2e289 100644
index ce7f8420500006145b768da2e4b68f0e0f8ecff3..90629ac2c0c17100f67e99e93148ff1556add33b 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -160,6 +160,7 @@ class NetworkService;
@@ -150,7 +150,7 @@ index 96c3b9e9b7e10af7103c5ac85422ffcd10bbe5db..4982f8d2641c3d3162db4f553f3b6726
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 7fc4a74cab938978174939c4f1bde3c93fe9a142..e77fec74a2447bc521b45dceb3c116eea1ee348a 100644
index 67ec081ce312c6c1e010d31ecff2d4febb21cffc..c83a13c0c0349e3eaf52e35b308b469d27e63125 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -28,6 +28,7 @@
@@ -173,10 +173,10 @@ index 7fc4a74cab938978174939c4f1bde3c93fe9a142..e77fec74a2447bc521b45dceb3c116ee
// moved on send.
bool is_background_tab =
diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
index 5b9926d436d85f4019a4311d247f24ca44cde192..e4f8517948ec79c6ceb0571c625cbe80cef1651d 100644
index d653afc3f1fa1e9f6524f7e0bed7c32f676baaa0..e12d66d22c1f3617a83c2037a726b49ca5f1b180 100644
--- a/content/web_test/browser/web_test_content_browser_client.cc
+++ b/content/web_test/browser/web_test_content_browser_client.cc
@@ -443,6 +443,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -448,6 +448,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,

6
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View File

@@ -140,10 +140,10 @@ index 33f1168f834d138aefb190b7718271d6962b3532..aeb30a22349e0682586bd1bad20dc5e2
}
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index e854ea87eb6b1e5509e09997aefc6b5889b25b16..932e31e40765b2715b34ac4460dba29197759d11 100644
index 52f33280bcad80ca550f9f11003191e0532431d3..5e1bb3420da6c2a2817469135c54bb15f09a816f 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1770,12 +1770,11 @@ bool Browser::IsWebContentsCreationOverridden(
@@ -1775,12 +1775,11 @@ bool Browser::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -264,7 +264,7 @@ index c5c5a7b63b5b3b62a9517cbef3ae23ce57a3c89c..4f1b7e88d6d2ae89a60311c8aeb1fcee
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 a0e7bcfa3f31ffe4142d80708df255cb6bcb8629..3411741da5d4a703f9b8b98dca817a2646d4c3df 100644
index 8f05fe5a3a784c4250d0a5f4550a2e2260b3425c..983d50970d0f54af1eaf712880bd851138750d61 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3548,8 +3548,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(

4
patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
View File

@@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from
Electrons grit header instead of Chromes
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index badc090fd9562fb198d2d31307e42b623a8bd119..7947263228a7143444e90e17cfc608bb53babe41 100644
index fd42359159612c61f04b96b852dda83b7d769ec4..bc62526aa57e4af91cd4b5d0f95ec83f373db884 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6280,6 +6280,7 @@ static_library("browser") {
@@ -6284,6 +6284,7 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",

2
patches/chromium/dcheck.patch
View File

@@ -17,7 +17,7 @@ only one or two specific checks fail. Then it's better to simply comment out the
failing checks and allow the rest of the target to have them enabled.
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
index 842764be673c200dad214e4abc30263fae65239a..98ae95c5e5eeca7baa48e1b6085b9cc60444a522 100644
index d5dca380f541a145edc314508801d6c88449ffe6..011e70ceaeb35b48ff523b21098ac52581723f5b 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -1400,8 +1400,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(

4
patches/chromium/disable_color_correct_rendering.patch
View File

@@ -241,7 +241,7 @@ index 2425c2b99a949c3181e2b69ea8d607f103442e34..86c91453231ca4762f50387b9be51393
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
sandbox::policy::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index ab2f82e651fb35c360765b5f1b8db143eb78b1e5..f94166d8cf95b9f6fcba7da2f0bc494a7cff0d6c 100644
index 89ff474b56e58af071c9401a76e8c4b33c4ef308..dfd44f817ca7fdcea7efd889c2d77131a3849c5a 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -213,6 +213,7 @@
@@ -252,7 +252,7 @@ index ab2f82e651fb35c360765b5f1b8db143eb78b1e5..f94166d8cf95b9f6fcba7da2f0bc494a
#include "ui/gl/gl_switches.h"
#include "ui/native_theme/native_theme_features.h"
#include "url/origin.h"
@@ -3158,6 +3159,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
@@ -3160,6 +3161,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = {

6
patches/chromium/disable_hidden.patch
View File

@@ -6,7 +6,7 @@ Subject: disable_hidden.patch
Electron uses this to disable background throttling for hidden windows.
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 6412dbfb5ded4d6ad92400c130aee9519969ee9b..f06e0502ef1ae948a14462328369b2b4b7843a6a 100644
index 54e73c5b1f6d40931bfac2c3befaa43e4a840702..edf3420fa9730612b677fcab77762c95f0dccee7 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -709,6 +709,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -20,10 +20,10 @@ index 6412dbfb5ded4d6ad92400c130aee9519969ee9b..f06e0502ef1ae948a14462328369b2b4
blink::mojom::PointerLockResult::kWrongDocument);
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index 668051f673f4a84f8e6c08bf8e26ea7afba8128c..130af6322ebfb1bd71046cb57ac1d2c66c468785 100644
index b9cc307b717a6095355ca05bcf646dd41c25d378..6bcc748d7b41fbda8719357bb9a8cf61f5dc73f8 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -840,6 +840,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
@@ -841,6 +841,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
mojom::CreateFrameWidgetParamsPtr
BindAndGenerateCreateFrameWidgetParamsForNewWindow();

2
patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
View File

@@ -11,7 +11,7 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index d265ad81c69b54aff24df0e35398ca26e01c1b93..4ac16e2e92920774fab9617008db7deb36f3e3f3 100644
index d4b8726a512bb3332b4df4b0498c9e7f43afa035..f7e059ad69fb3aa45bf56a9895992bfbf71e6e21 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2628,7 +2628,7 @@ blink::WebLocalFrame* RenderFrameImpl::GetWebFrame() {

4
patches/chromium/enable_reset_aspect_ratio.patch
View File

@@ -6,10 +6,10 @@ Subject: feat: enable setting aspect ratio to 0
Make SetAspectRatio accept 0 as valid input, which would reset to null.
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 135182e96c04acc9fe8b5bf2117a27e9bdd78fb3..f92a7d7eef35625f797ac9cb911bff72e47be30d 100644
index c8c26cfacffb6cbdc799eb8ca45d839bd1d8413a..4e93695ae1e43dcc095e74d2fac33f4ac3d36e6b 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -483,7 +483,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@@ -484,7 +484,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
}
void DesktopWindowTreeHostWin::SetAspectRatio(const gfx::SizeF& aspect_ratio) {

10
patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
View File

@@ -13,10 +13,10 @@ uses internally for things like menus and devtools.
We can remove this patch once it has in some shape been upstreamed.
diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
index 99fd81acb2535470dd148c283bba91cb5e778f6e..45957a0b3519675358fce1082574e7ac4fba43d1 100644
index 63baac7dfc28f34193493f287208990bb00f0f51..5497bb92f408323e853451faea34fee8254eb2d4 100644
--- a/ui/native_theme/native_theme.cc
+++ b/ui/native_theme/native_theme.cc
@@ -323,6 +323,8 @@ base::Optional<SkColor> NativeTheme::GetColorProviderColor(
@@ -332,6 +332,8 @@ base::Optional<SkColor> NativeTheme::GetColorProviderColor(
}
bool NativeTheme::ShouldUseDarkColors() const {
@@ -26,7 +26,7 @@ index 99fd81acb2535470dd148c283bba91cb5e778f6e..45957a0b3519675358fce1082574e7ac
}
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
index ac5cc40afbba43951600b384b8b6031b80895117..c524a1d089324cf86c8d380c2148ec9377fe0dcf 100644
index b4f22b9e71887f904471e73a99d91e41d0465550..0384c43462ba009c87509555ec9aa01cf75ba47c 100644
--- a/ui/native_theme/native_theme.h
+++ b/ui/native_theme/native_theme.h
@@ -403,6 +403,22 @@ class NATIVE_THEME_EXPORT NativeTheme {
@@ -52,7 +52,7 @@ index ac5cc40afbba43951600b384b8b6031b80895117..c524a1d089324cf86c8d380c2148ec93
// Returns a shared instance of the native theme that should be used for web
// rendering. Do not use it in a normal application context (i.e. browser).
// The returned object should not be deleted by the caller. This function is
@@ -569,6 +585,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
@@ -572,6 +588,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
bool forced_colors_ = false;
PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
@@ -61,7 +61,7 @@ index ac5cc40afbba43951600b384b8b6031b80895117..c524a1d089324cf86c8d380c2148ec93
SEQUENCE_CHECKER(sequence_checker_);
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index 9ef5d287bb612e8f93f87eb569a6226847e72bc2..1522201d184cf114379da22253ca25240cd78959 100644
index 13a1f3763d137667220325237c419257e9868a8d..78fd1055ea24b4589c2b66c40a7778f12999aad4 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc
@@ -749,6 +749,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {

2
patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
View File

@@ -13,7 +13,7 @@ This patch can be removed once app.allowRendererProcessReuse is forced
to true as then Chromiums assumptions around processes become correct.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index dde26e94cb89fa64f68f42d6749890fab1b8e305..31131896492031d2a19ee93018d309309649320b 100644
index fd4ad27a49532b2f8ce13563d4886532afd45b64..f959f4c8de7206b570f4c25837059c3f8f4334b1 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3015,11 +3015,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {

22
patches/chromium/frame_host_manager.patch
View File

@@ -42,7 +42,7 @@ index 65e627f2fa89352b0be27b5813d71a622bf1d326..113f4fd00f1cf994b39f64c9da387855
// another SiteInstance for the same site.
void RegisterSiteInstance(SiteInstanceImpl* site_instance);
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index 53a7295d80eb9cf598c5246542f762fc721ce970..98d15d54b7cdd6de1f72458921c65cc186e883a0 100644
index f705963e54b5d8bcf8ee9fb0f437236c4580ae7d..5410686bcce7272811dc7a1a44f80a8bf1c2b249 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -1558,6 +1558,21 @@ void NavigationRequest::BeginNavigation() {
@@ -67,7 +67,7 @@ index 53a7295d80eb9cf598c5246542f762fc721ce970..98d15d54b7cdd6de1f72458921c65cc1
// Select an appropriate RenderFrameHost.
std::string frame_host_choice_reason;
render_frame_host_ =
@@ -6099,6 +6114,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
@@ -6113,6 +6128,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
{WILL_START_REQUEST, {
WILL_REDIRECT_REQUEST,
WILL_PROCESS_RESPONSE,
@@ -75,7 +75,7 @@ index 53a7295d80eb9cf598c5246542f762fc721ce970..98d15d54b7cdd6de1f72458921c65cc1
READY_TO_COMMIT,
DID_COMMIT,
CANCELING,
@@ -6112,10 +6128,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
@@ -6126,10 +6142,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
WILL_FAIL_REQUEST,
}},
{WILL_PROCESS_RESPONSE, {
@@ -91,7 +91,7 @@ index 53a7295d80eb9cf598c5246542f762fc721ce970..98d15d54b7cdd6de1f72458921c65cc1
NOT_STARTED,
DID_COMMIT,
diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h
index 194a284c068f60f9b3078110a6331eda7c5912b6..a53eb07d1c4bb0a47bdde4ca28b213a89cc97d20 100644
index 0465c8072ee9996a27ba9ed00a56396a37df3a78..fbadf6474a037f9aeba4da0f48872892e2e8e1a4 100644
--- a/content/browser/renderer_host/navigation_request.h
+++ b/content/browser/renderer_host/navigation_request.h
@@ -140,6 +140,10 @@ class CONTENT_EXPORT NavigationRequest
@@ -106,10 +106,10 @@ index 194a284c068f60f9b3078110a6331eda7c5912b6..a53eb07d1c4bb0a47bdde4ca28b213a8
READY_TO_COMMIT,
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index af497e6916d72bfbd40fe9f131be6022482ef810..74f9fe3a0a0de20d48bc8b2d397109381ea66481 100644
index ea4aa73aa4943b5bc9a8cc5f16e0a40fa671afe6..d71447dd6d176467e8169276c823043e8f0745f3 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -2859,6 +2859,16 @@ scoped_refptr<SiteInstance>
@@ -2850,6 +2850,16 @@ scoped_refptr<SiteInstance>
RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
NavigationRequest* request,
std::string* reason) {
@@ -126,7 +126,7 @@ index af497e6916d72bfbd40fe9f131be6022482ef810..74f9fe3a0a0de20d48bc8b2d39710938
SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
// All children of MHTML documents must be MHTML documents. They all live in
@@ -2886,10 +2896,59 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2877,10 +2887,59 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
//
// TODO(clamy): We should also consider as a candidate SiteInstance the
// speculative SiteInstance that was computed on redirects.
@@ -190,7 +190,7 @@ index af497e6916d72bfbd40fe9f131be6022482ef810..74f9fe3a0a0de20d48bc8b2d39710938
// Account for renderer-initiated reload as well.
// Needed as a workaround for https://crbug.com/1045524, remove it when it is
@@ -2922,6 +2981,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2913,6 +2972,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request->ResetStateForSiteInstanceChange();
}
@@ -228,10 +228,10 @@ index 6505a8f6e514061ff9839681cc903a37e8ad8e65..2f2440688d1c1379a38e0290d297d937
size_t GetRelatedActiveContentsCount() override;
bool RequiresDedicatedProcess() override;
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 59c747a6f63a53eff7e2ca8d46a859f615638e3f..d6f3048ab90731424558f671b4ce78fa58fc40ff 100644
index 421a6c9acc4079df2c5de7322d1566039a17222c..dc38c85baf1c8e3cd67617b92be9a8957238e8aa 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -71,6 +71,21 @@
@@ -72,6 +72,21 @@
namespace content {
@@ -254,7 +254,7 @@ index 59c747a6f63a53eff7e2ca8d46a859f615638e3f..d6f3048ab90731424558f671b4ce78fa
const MainFunctionParams& parameters) {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 584a98da0ccde8b87171c6b6343b484b48f2e289..44fe14bbffbce400ec2ab14e053939588bc92382 100644
index 90629ac2c0c17100f67e99e93148ff1556add33b..c20b3a3bd785511c2cdb73dd15ad65aed47dea57 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -260,8 +260,45 @@ class CONTENT_EXPORT ContentBrowserClient {

4
patches/chromium/gin_enable_disable_v8_platform.patch
View File

@@ -38,10 +38,10 @@ index f23af2d9738f3aa76e3a49301e1c3216ee4a64b4..ede178acabc63c3c33d6ce93efd5632b
v8::Isolate* isolate() { return isolate_; }
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index 2a171b00426968443d931007316f79055689a323..633f6d71c1f765c9fd5e956564399fdd8c6afefb 100644
index b84759c06734b55a3ba8fd27674accdb956006c5..05befd073932e665ab261102fac4b677d557a84b 100644
--- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc
@@ -198,12 +198,14 @@ enum LoadV8FileResult {
@@ -217,12 +217,14 @@ void SetV8FlagsFormatted(const char* format, ...) {
} // namespace
// static

4
patches/chromium/gtk_visibility.patch
View File

@@ -6,13 +6,13 @@ Subject: gtk_visibility.patch
Allow electron to depend on GTK in the GN build.
diff --git a/build/config/linux/gtk/BUILD.gn b/build/config/linux/gtk/BUILD.gn
index 724dbcfdcfcc..d576477308fe 100644
index 724dbcfdcfcc9656fb0cd12fbfc227c12196be9c..d576477308fe7213ceb0db90cec39d395fe8bf38 100644
--- a/build/config/linux/gtk/BUILD.gn
+++ b/build/config/linux/gtk/BUILD.gn
@@ -33,6 +33,8 @@ group("gtk") {
"//ui/gtk/wayland",
"//ui/gtk/x",
+ "//electron:*",
+
# These are all for WebRTC.

2
patches/chromium/mas_disable_remote_accessibility.patch
View File

@@ -236,7 +236,7 @@ index 69d612b69a91228c55bd71ed15244dc7d19ea4b7..a3078e7372bf1e928dcd8c0f023ae8e5
// Used to force the NSApplication's focused accessibility element to be the
// views::Views accessibility tree when the NSView for this is focused.
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
index 6f0bb3f3cb02b75616af2328a36f306999aac18f..29dbe20924c588d1645d973c6338af971dbf7816 100644
index e99153231711896214b238c4af48cf55e4183da9..d8caf59f2493ed6563b65015893381aa53f61b42 100644
--- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
+++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
@@ -284,14 +284,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,

2
patches/chromium/notification_provenance.patch
View File

@@ -108,7 +108,7 @@ index 60558d5f40b765ed3ca2f7d1abc1b95f7518fee9..ab44370dc89f64fe2b86089fd9781b71
mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 04945e5812f7c460245e4aa944057689aa8ed243..7dd941e8ba7a55b9e22166fedcb68eb7e978f835 100644
index 28ec3064b63016618fe1e57bb6127866b5151d0c..7c1dce03dfb3caad7e28759421824667204fc78d 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2106,7 +2106,7 @@ void RenderProcessHostImpl::CreateNotificationService(

14
patches/chromium/picture-in-picture.patch
View File

@@ -9,7 +9,7 @@ don't get errors for Chrome's generated resources, which are non-existent
because we don't generate them in our build.
diff --git a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
index 9c861140fec4..f9dd34d2ad34 100644
index 9c861140fec428cd6d3f0375e81d91d94b0444b6..f9dd34d2ad342b507e2b40298fbd8221fbbf14e3 100644
--- a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
+++ b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
@@ -5,7 +5,7 @@
@@ -22,7 +22,7 @@ index 9c861140fec4..f9dd34d2ad34 100644
#include "ui/gfx/color_palette.h"
#include "ui/gfx/paint_vector_icon.h"
diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
index 28c00fd4f326..98e77d49684a 100644
index 28c00fd4f326dd7d5efa839cd7540e2f9f824904..98e77d49684ab6a267cf80122c9a9a79cea377ac 100644
--- a/chrome/browser/ui/views/overlay/close_image_button.cc
+++ b/chrome/browser/ui/views/overlay/close_image_button.cc
@@ -6,7 +6,7 @@
@@ -35,7 +35,7 @@ index 28c00fd4f326..98e77d49684a 100644
#include "ui/gfx/color_palette.h"
#include "ui/gfx/paint_vector_icon.h"
diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
index 2acb4062aa4b..b2c01e88d75a 100644
index 2acb4062aa4bb39dd6bdeb1b0758ea089740636a..b2c01e88d75a1f2e8d21be5579f986be04502e8a 100644
--- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
@@ -15,9 +15,11 @@
@@ -78,7 +78,7 @@ index 2acb4062aa4b..b2c01e88d75a 100644
Browser* browser =
chrome::FindBrowserWithWebContents(controller->GetWebContents());
diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
index b146450f115c..df0443d82ad9 100644
index b146450f115cec9717fdb9280ed894963a11c667..df0443d82ad9a42f6965387630ac3eb7231c4994 100644
--- a/chrome/browser/ui/views/overlay/playback_image_button.cc
+++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
@@ -6,7 +6,7 @@
@@ -91,7 +91,7 @@ index b146450f115c..df0443d82ad9 100644
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/paint_vector_icon.h"
diff --git a/chrome/browser/ui/views/overlay/resize_handle_button.cc b/chrome/browser/ui/views/overlay/resize_handle_button.cc
index a3236fd87a09..0237ed5903ab 100644
index a3236fd87a096bebcd66a3d9c2525ba7ef8f15bf..0237ed5903abe4577d0a5a1850bb6e27a8d99010 100644
--- a/chrome/browser/ui/views/overlay/resize_handle_button.cc
+++ b/chrome/browser/ui/views/overlay/resize_handle_button.cc
@@ -6,7 +6,7 @@
@@ -104,7 +104,7 @@ index a3236fd87a09..0237ed5903ab 100644
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/color_palette.h"
diff --git a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
index e2f0491e511d..5f2509a09f94 100644
index e2f0491e511d9873b1e0c15f3d5ce8770dc7d941..5f2509a09f94c756d7af3474da2c1d85bbee67d4 100644
--- a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
+++ b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
@@ -5,7 +5,7 @@
@@ -117,7 +117,7 @@ index e2f0491e511d..5f2509a09f94 100644
#include "ui/gfx/color_palette.h"
#include "ui/views/background.h"
diff --git a/chrome/browser/ui/views/overlay/track_image_button.cc b/chrome/browser/ui/views/overlay/track_image_button.cc
index 8b9911c9819f..e8eb76a94a45 100644
index 8b9911c9819f334c9c634e986e6809ed6e1140c5..e8eb76a94a459bc293f47ad08099bc707527dd7b 100644
--- a/chrome/browser/ui/views/overlay/track_image_button.cc
+++ b/chrome/browser/ui/views/overlay/track_image_button.cc
@@ -6,7 +6,7 @@

4
patches/chromium/put_back_deleted_colors_for_autofill.patch
View File

@@ -8,7 +8,7 @@ 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/gtk/native_theme_gtk.cc b/ui/gtk/native_theme_gtk.cc
index c08edc56c3b5592e7f5df2754808a81c69622315..e80075e89642dd6b3a37985b1c6e533bfb3a0e50 100644
index 0fede8f4c2823e5bd07f507d89249a2119dcb858..d361cc4114ab0deb91885b08b7792cdb0e7d005b 100644
--- a/ui/gtk/native_theme_gtk.cc
+++ b/ui/gtk/native_theme_gtk.cc
@@ -369,6 +369,29 @@ base::Optional<SkColor> SkColorFromColorId(ui::NativeTheme::ColorId color_id) {
@@ -136,7 +136,7 @@ index 60197576c71e86cd3ad17e83bfc699509c365d6c..426504eec69da7100c6484271fb35f1a
OP(kColorId_ThrobberSpinningColor), \
OP(kColorId_ThrobberWaitingColor), \
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index 74357892f7a732de2c8dd6ed018569892c60fd4b..9ef5d287bb612e8f93f87eb569a6226847e72bc2 100644
index 68b798fc755a3ec3130e43254b6ec306d30a19fa..13a1f3763d137667220325237c419257e9868a8d 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc
@@ -659,6 +659,18 @@ base::Optional<SkColor> NativeThemeWin::GetPlatformHighContrastColor(

6
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View File

@@ -30,7 +30,7 @@ index 4a60eef424879cf96003bc2522887dc8c7630254..51bcc78ecd8f5f40e90a5e9077ac59b3
// RenderWidgetHost on the main frame, and false otherwise.
virtual bool IsWidgetForMainFrame(RenderWidgetHostImpl*);
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index f06e0502ef1ae948a14462328369b2b4b7843a6a..8589d0d04456af39fadc2d7fb393625a3745237e 100644
index edf3420fa9730612b677fcab77762c95f0dccee7..c8dab824fb0e4292b24b82b5955bf0d31c7841ff 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1930,6 +1930,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
@@ -43,7 +43,7 @@ index f06e0502ef1ae948a14462328369b2b4b7843a6a..8589d0d04456af39fadc2d7fb393625a
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 24979412cf08fdec93d256bcf16d7dd1abdf4ff6..a0e7bcfa3f31ffe4142d80708df255cb6bcb8629 100644
index a614848cb66184b3b57de1b16ad8e3d023a1bb3a..8f05fe5a3a784c4250d0a5f4550a2e2260b3425c 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4144,6 +4144,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -59,7 +59,7 @@ index 24979412cf08fdec93d256bcf16d7dd1abdf4ff6..a0e7bcfa3f31ffe4142d80708df255cb
RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index a45ad650fa97fead42b2c2eb527514a8f50295af..82e145e6a571727d907e85c7edc0e41c27b438e7 100644
index f2720f2a6c7cfb40c63973a9a32befb6bf9a106c..1cd08738ab3ac9f3fd10c0ac0360a1408e126552 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -959,6 +959,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,

4
patches/chromium/revert_remove_contentrendererclient_shouldfork.patch
View File

@@ -88,10 +88,10 @@ index f259835ef4cabb8923f8b0fe9b3f6ae8f2b2b79f..a538b9ebcfa232b90fc7713e6569608a
// |url|. If the function returns a valid |new_url|, the request must be
// updated to use it.
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index ae77e7566d47aa86513dc9671dd9a67c684e74f1..d265ad81c69b54aff24df0e35398ca26e01c1b93 100644
index db755b81622a00429141493d9877c73cce23d164..d4b8726a512bb3332b4df4b0498c9e7f43afa035 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -5318,6 +5318,22 @@ void RenderFrameImpl::BeginNavigation(
@@ -5332,6 +5332,22 @@ void RenderFrameImpl::BeginNavigation(
// we can do a per-frame check here rather than a process-wide check.
bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) ||
(enabled_bindings_ & kWebUIBindingsPolicyMask);

2
patches/chromium/scroll_bounce_flag.patch
View File

@@ -6,7 +6,7 @@ Subject: scroll_bounce_flag.patch
Patch to make scrollBounce option work.
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 645666d0715d0ff2c18166eebbe79adebe5eabd0..c898d8056f5a45c55f0cb16e4adf916e22d3e843 100644
index 3885ab653f7636a0bdc3be9d0d9bcc3232ecddbb..99215ac223c398f518519f64bf84ac7d145abd5e 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1271,7 +1271,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {

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 7dd941e8ba7a55b9e22166fedcb68eb7e978f835..ab2f82e651fb35c360765b5f1b8db143eb78b1e5 100644
index 7c1dce03dfb3caad7e28759421824667204fc78d..89ff474b56e58af071c9401a76e8c4b33c4ef308 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -391,10 +391,18 @@ class RendererSandboxedProcessLauncherDelegate

2
patches/chromium/web_contents.patch
View File

@@ -9,7 +9,7 @@ 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 3411741da5d4a703f9b8b98dca817a2646d4c3df..dde26e94cb89fa64f68f42d6749890fab1b8e305 100644
index 983d50970d0f54af1eaf712880bd851138750d61..fd4ad27a49532b2f8ce13563d4886532afd45b64 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2727,6 +2727,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {

10
patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
View File

@@ -19,7 +19,7 @@ that clearly establishes the worker script is ready for evaluation with the scop
initialized.
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index a538b9ebcfa2..53917132e03f 100644
index a538b9ebcfa232b90fc7713e6569608a16c57ed3..53917132e03fc1767083ec4aaa6b8d4a06a0cf07 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -377,6 +377,11 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -35,7 +35,7 @@ index a538b9ebcfa2..53917132e03f 100644
// from the worker thread.
virtual void WillDestroyWorkerContextOnWorkerThread(
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 8b2287e02017..f0ebbb0fc851 100644
index 8b2287e020172e17c5dc5fa28a19ac7a251d4732..f0ebbb0fc851f85811bef5aeb22f4d7414e3c84b 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -922,6 +922,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
@@ -52,7 +52,7 @@ index 8b2287e02017..f0ebbb0fc851 100644
const blink::WebSecurityOrigin& script_origin) {
return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
index 4e3805bbef80..ad1551231a34 100644
index 4e3805bbef80957ff7d2c42282eaf9f8fedac46c..ad1551231a3411c86969b4108d66b3dc22c73e21 100644
--- a/content/renderer/renderer_blink_platform_impl.h
+++ b/content/renderer/renderer_blink_platform_impl.h
@@ -194,6 +194,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -65,7 +65,7 @@ index 4e3805bbef80..ad1551231a34 100644
bool AllowScriptExtensionForServiceWorker(
const blink::WebSecurityOrigin& script_origin) override;
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index 911708b508fb..792ea5e1159f 100644
index 911708b508fb38c0f22b3ceaa92fc6a66308ac17..792ea5e1159f17354a5e6fd838f3e789469d37cd 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -684,6 +684,8 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -78,7 +78,7 @@ index 911708b508fb..792ea5e1159f 100644
virtual bool AllowScriptExtensionForServiceWorker(
const WebSecurityOrigin& script_origin) {
diff --git a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
index a52865104b5d..48364b2a48cf 100644
index a52865104b5df3faaf0e861e921c3cd5c4766998..48364b2a48cfb1d80415f3cbf89403bff602e056 100644
--- a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
+++ b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
@@ -257,6 +257,7 @@ void WorkerOrWorkletScriptController::PrepareForEvaluation() {

2
patches/v8/build_gn.patch
View File

@@ -9,7 +9,7 @@ necessary for native modules to load.
Also, some fixes relating to mksnapshot on ARM.
diff --git a/BUILD.gn b/BUILD.gn
index 1ba55f26d3026714bd471c3ef0bade09a9cb5090..60b29542ccf3006d1351decafb7b1cf2727371f3 100644
index addd232adca8641eb76c63d742941b3c97d37042..a88f65c38ad3b3a47c15bb958368b056239dd9a9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -467,7 +467,7 @@ config("internal_config") {

2
patches/v8/do_not_export_private_v8_symbols_on_windows.patch
View File

@@ -12,7 +12,7 @@ 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 e5ef105a8b2000cefb15bd6917c81aab833e5edb..1d78cbb9b248546d3c9361f892b3e30b811e1cce 100644
index b89135d8bf01c96a7f02c96b24780ce744ff1b98..9091afa1f07198ca6db6e5be2475391bef39809b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -467,6 +467,10 @@ config("internal_config") {

2
patches/v8/expose_mksnapshot.patch
View File

@@ -6,7 +6,7 @@ Subject: expose_mksnapshot.patch
Needed in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn
index 60b29542ccf3006d1351decafb7b1cf2727371f3..e5ef105a8b2000cefb15bd6917c81aab833e5edb 100644
index a88f65c38ad3b3a47c15bb958368b056239dd9a9..b89135d8bf01c96a7f02c96b24780ce744ff1b98 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -5105,7 +5105,6 @@ if (current_toolchain == v8_generator_toolchain) {

6
patches/v8/workaround_an_undefined_symbol_error.patch
View File

@@ -12,10 +12,10 @@ By moving some functions out of the the arm64-assembler header file,
this error no longer seems to happen.
diff --git a/src/codegen/arm64/assembler-arm64.cc b/src/codegen/arm64/assembler-arm64.cc
index a61041171a4f535dc40caf68122e3b051e46fe01..7b7d074ab1209e8e65faf7df0201c6e0b65fdf24 100644
index 0551877403175d71bc55553a630847334eab8516..6550a53f2660553d71a10ac103e1b724dcab3a20 100644
--- a/src/codegen/arm64/assembler-arm64.cc
+++ b/src/codegen/arm64/assembler-arm64.cc
@@ -3628,6 +3628,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
@@ -3629,6 +3629,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
ImmMoveWide(static_cast<int>(imm)) | ShiftMoveWide(shift));
}
@@ -39,7 +39,7 @@ index a61041171a4f535dc40caf68122e3b051e46fe01..7b7d074ab1209e8e65faf7df0201c6e0
const Operand& operand, FlagsUpdate S, AddSubOp op) {
DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits());
diff --git a/src/codegen/arm64/assembler-arm64.h b/src/codegen/arm64/assembler-arm64.h
index a1c578869c753db91f5467bfaacc396c08d33715..b459cea6dc03a3bddd04b7043304ba43610bbfa7 100644
index aa2ffb26cdfc24ef4282e34208575399ab3cb27a..6284ca4046e910362e1647c04b130de06cab163a 100644
--- a/src/codegen/arm64/assembler-arm64.h
+++ b/src/codegen/arm64/assembler-arm64.h
@@ -2117,11 +2117,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {