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: bump chromium to 80.0.3987.128 (#22419)

Browse Source
This commit is contained in:
Jeremy Apthorp
2020-02-27 14:42:39 -08:00
committed by GitHub
parent 882ce295ee
commit 854dcb3247
15 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@@ -11,7 +11,7 @@ gclient_gn_args = [
vars = {
'chromium_version':
'80.0.3987.86',
'80.0.3987.128',
'node_version':
'v12.13.0',
'nan_version':

10
patches/chromium/can_create_window.patch
View File

@@ -5,10 +5,10 @@ Subject: can_create_window.patch
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 186de613d8b833e0ef357145b8dd5e6247157c79..61cad9e4d603943535ed978c39e258b9bb7198c2 100644
index bbd42aad3d42311dfff47e725a5deddb4ed04134..797ee4073cfc7b78038d0c007922783a55b89683 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -4374,6 +4374,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -4375,6 +4375,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,
@@ -17,7 +17,7 @@ index 186de613d8b833e0ef357145b8dd5e6247157c79..61cad9e4d603943535ed978c39e258b9
&no_javascript_access);
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index 9e966549368e241d7b6acfc0899751c6f72b95bc..4de3b9200c59dc54aabbd13a69470d57c0cf2c89 100644
index 822413b2824cc25ea5c699056a22623b7ac1f92a..79444323a6c8c7ab7e2abf0bd45b59e2699def31 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -301,6 +301,10 @@ struct CreateNewWindowParams {
@@ -66,7 +66,7 @@ index b70473936db044506e6d7ada4520920f0774eff7..fa942dd135ecfc6fe735b4ae52410ec0
bool opener_suppressed,
bool* no_javascript_access);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 556a107ed038752a242a137eec014453cd0f6de2..2ebac7d02b9645b9fa6256bb4e4104c7f14b300f 100644
index 7bf0464c14f81b5c607c541f8ec7e5b4c860a25c..c90fd39058e3e0ab98727a71836e549ee794f7bd 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -71,6 +71,7 @@
@@ -77,7 +77,7 @@ index 556a107ed038752a242a137eec014453cd0f6de2..2ebac7d02b9645b9fa6256bb4e4104c7
#include "content/renderer/media/audio/audio_device_factory.h"
#include "content/renderer/render_frame_impl.h"
#include "content/renderer/render_frame_proxy.h"
@@ -1334,6 +1335,8 @@ WebView* RenderViewImpl::CreateView(
@@ -1336,6 +1337,8 @@ WebView* RenderViewImpl::CreateView(
}
params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);

6
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 d730660c086f..ba9b098d848e 100644
index aefba4a5a3ca9b7cd0b91693727ea77900dc714b..c9cf6c65386b6a600dab37663f3eef411956a96d 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -5049,6 +5049,7 @@ jumbo_split_static_library("browser") {
@@ -5125,6 +5125,7 @@ jumbo_static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",
@@ -32,7 +32,7 @@ index 48ac0a24efde0cb7d3ba71c8b8bdf5178f606e80..e2beefc276098fdc8f1cdab2e0edb8fa
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
diff --git a/components/language/core/browser/BUILD.gn b/components/language/core/browser/BUILD.gn
index f28230ea94fe..c10eea103852 100644
index f28230ea94fece5ae8ca7ac27a14da48f40fadbb..c10eea103852b9411a644e1fe20a7e20a38bf187 100644
--- a/components/language/core/browser/BUILD.gn
+++ b/components/language/core/browser/BUILD.gn
@@ -31,6 +31,7 @@ static_library("browser") {

2
patches/chromium/command-ismediakey.patch
View File

@@ -73,7 +73,7 @@ index 1145e1f3d79482b5bb468c3128431ac674310e5f..e319e7a3e34e05b0e96d4a2dbb456355
} // namespace ui
diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerators/media_keys_listener_mac.mm
index 85378bb565de617b1bd611d28c8714361747a357..94a899e76586d2c7bb199828bfa4aa1ef9ccfcbc 100644
index 85378bb565de617b1bd611d28c8714361747a357..d67d558b91b49835dfa927893093948093c54f7a 100644
--- a/ui/base/accelerators/media_keys_listener_mac.mm
+++ b/ui/base/accelerators/media_keys_listener_mac.mm
@@ -11,6 +11,7 @@

4
patches/chromium/disable_color_correct_rendering.patch
View File

@@ -252,10 +252,10 @@ index f942380764aef7e86a0de112e9b70aed960acade..fefb63c75936a67b66aecffec5a3be04
service_manager::switches::kDisableInProcessStackTraces,
service_manager::switches::kDisableSeccompFilterSandbox,
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index db473d9f155806d19d2fd4734821836bd8939267..12fd20c501c2643c79965bae534d904148e3d373 100644
index e26b780100821783413e613a1295c831a3670071..4dc57f496513f8d1aeb29a0f408842ecbc2e620a 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -2952,6 +2952,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
@@ -2885,6 +2885,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
settings.main_frame_before_activation_enabled =
cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);

4
patches/chromium/disable_hidden.patch
View File

@@ -5,7 +5,7 @@ Subject: disable_hidden.patch
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index e2e3d649a0024ff1fd2fd0749c4fc6057a87aa6e..a542ffd01da4794ce32d79866e2af24c468f0498 100644
index 2427458b6b28163fd22427b6df811e8995fb5e7a..d67531f8b5739c17a886993beda4bd12ec43c78b 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -647,6 +647,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -19,7 +19,7 @@ index e2e3d649a0024ff1fd2fd0749c4fc6057a87aa6e..a542ffd01da4794ce32d79866e2af24c
TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::WasHidden");
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index 15a23f9540896fcb76796da1de8552e319d82f32..59a675ae58b5a46e63e187184b4359a62b6368e2 100644
index 459d06cd7f5e83c5ec8fa06abfe4661a612f3c62..cbeee0407ae9fe2b5e354fb103b0e6c7024b70d8 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -187,6 +187,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl

8
patches/chromium/expose_setuseragent_on_networkcontext.patch
View File

@@ -33,10 +33,10 @@ index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a28970
DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings);
};
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index ab40cd29a51e95b64507d558875c89059bbb38e8..f177ab517a106e8d9277a75b27f9dc6c9930d302 100644
index a3b4372d74c2cc792f3f26d03200a41ca8aafa73..97f707ece42711a9d22ca204f48755493abb26d6 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -980,6 +980,13 @@ void NetworkContext::SetNetworkConditions(
@@ -969,6 +969,13 @@ void NetworkContext::SetNetworkConditions(
std::move(network_conditions));
}
@@ -51,10 +51,10 @@ index ab40cd29a51e95b64507d558875c89059bbb38e8..f177ab517a106e8d9277a75b27f9dc6c
// 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 829a26f486e1e7c7a24f1d273e9af48df5fbd9b1..e9f22a8f1bf8d2299e275c985b4cbb93d35607a2 100644
index ffa991ec6020841a33df7870326b52f0ae943846..b82094db17360ffb5c32b347f1b5ba100fa48699 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -233,6 +233,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -230,6 +230,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
mojom::NetworkConditionsPtr conditions) override;

8
patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
View File

@@ -9,7 +9,7 @@ production use cases. This is unlikely to be upstreamed as the change
is entirely in //chrome.
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
index 0fb84989f9b2f84ec2a2589dda3d91cf59c0adda..9ff5b33d2885c5532e1496711c27a01c8502725c 100644
index 8f1c8d53401694d522ee82f20a3e2aaba2734191..67ec4e285d9bf6b9de300845b2c53bda435e5784 100644
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -48,6 +48,9 @@ namespace {
@@ -22,7 +22,7 @@ index 0fb84989f9b2f84ec2a2589dda3d91cf59c0adda..9ff5b33d2885c5532e1496711c27a01c
// Close the file.
void CloseDictionary(base::File file) {
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
@@ -247,6 +250,10 @@ void SpellcheckHunspellDictionary::SetDownloadURLForTesting(const GURL url) {
@@ -248,6 +251,10 @@ void SpellcheckHunspellDictionary::SetDownloadURLForTesting(const GURL url) {
g_download_url_for_testing.Get() = url;
}
@@ -33,7 +33,7 @@ index 0fb84989f9b2f84ec2a2589dda3d91cf59c0adda..9ff5b33d2885c5532e1496711c27a01c
GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
if (g_download_url_for_testing.Get() != GURL())
return g_download_url_for_testing.Get();
@@ -254,6 +261,9 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
@@ -255,6 +262,9 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
std::string bdict_file = dictionary_file_.path.BaseName().MaybeAsASCII();
DCHECK(!bdict_file.empty());
@@ -44,7 +44,7 @@ index 0fb84989f9b2f84ec2a2589dda3d91cf59c0adda..9ff5b33d2885c5532e1496711c27a01c
"https://redirector.gvt1.com/edgedl/chrome/dict/";
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
index 4af3201238dfec14bd5a4241b662ca52799e6862..4662bdc08b54304a7f8b2995f60fea9dc5617fff 100644
index 074e9516d72239d530a2919d0018472a3539d048..633ec3a96b39824fc9bcf374e59eb80148a2ae27 100644
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
@@ -85,6 +85,8 @@ class SpellcheckHunspellDictionary

8
patches/chromium/feat_allow_disbaling_blink_scheduler_throttling_per_renderview.patch
View File

@@ -60,7 +60,7 @@ index 95679ab2915ad496ca0018aa13874b84eb11d7fd..c278e0fc072409677beafc7f252ebcf6
//
// Returns the current WebKit preferences. Note: WebPreferences is cached, so
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 2ebac7d02b9645b9fa6256bb4e4104c7f14b300f..8195c7edb7bcbc6c770a5dd5278b305cbce535f5 100644
index c90fd39058e3e0ab98727a71836e549ee794f7bd..ecbd941c58250d664f240dc3394eccf088d4c405 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1252,6 +1252,8 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
@@ -72,7 +72,7 @@ index 2ebac7d02b9645b9fa6256bb4e4104c7f14b300f..8195c7edb7bcbc6c770a5dd5278b305c
IPC_MESSAGE_HANDLER(ViewMsg_UpdateTargetURL_ACK, OnUpdateTargetURLAck)
IPC_MESSAGE_HANDLER(ViewMsg_UpdateWebPreferences, OnUpdateWebPreferences)
IPC_MESSAGE_HANDLER(ViewMsg_ClosePage, OnClosePage)
@@ -1844,6 +1846,12 @@ void RenderViewImpl::OnSetPageScale(float page_scale_factor) {
@@ -1828,6 +1830,12 @@ void RenderViewImpl::OnSetPageScale(float page_scale_factor) {
webview()->SetPageScaleFactor(page_scale_factor);
}
@@ -86,10 +86,10 @@ index 2ebac7d02b9645b9fa6256bb4e4104c7f14b300f..8195c7edb7bcbc6c770a5dd5278b305c
PageVisibilityState visibility_state,
bool initial_setting) {
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 87994092a9b0e7ea0d33675c502408a5a47eac87..5d08253ed69e9a180251ad9693335c4ad43adba6 100644
index 0dab88b784c6add42fc192ce5742b7df8a9260b3..10109052630967db13ac1e48bc8cb389ad437dc0 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -450,6 +450,7 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
@@ -449,6 +449,7 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
void OnSetInitialFocus(bool reverse);
void OnSetRendererPrefs(
const blink::mojom::RendererPreferences& renderer_prefs);

4
patches/chromium/fix_add_executable_to_chromedriver_s_rpath_for_electron_8.patch
View File

@@ -13,10 +13,10 @@ in Electron's BUILD.gn because one of Chromedriver's deps
is not on.
diff --git a/chrome/test/chromedriver/BUILD.gn b/chrome/test/chromedriver/BUILD.gn
index 1ce029a1ba3ec9da3527008d8c2b38446ab4b2f3..de2cc3074fef3d75f041ec8230bd18d3827192cc 100644
index 2caa79d19ed0e6a16c39086ebb5e049eb50959be..f1db93f7da98f59c115acac2d22ea003d14a8b20 100644
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -330,6 +330,13 @@ executable("chromedriver") {
@@ -331,6 +331,13 @@ executable("chromedriver") {
"//net/traffic_annotation:test_support",
"//services/network/public/mojom",
]

4
patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
View File

@@ -13,10 +13,10 @@ 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 70d735dcc38734edaaf6221cd40c49beb6d2e37e..9cd7368966c20b9e9306c41e455c002d686d3013 100644
index c2a579ed267f4081f44e9f2da2cfc90ae08bf750..36d84bd8a0a80b9801701c48e863762251a99026 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2347,11 +2347,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
@@ -2336,11 +2336,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
WebContentsImpl* outermost = GetOutermostWebContents();
if (event.button == blink::WebPointerProperties::Button::kBack &&
outermost->controller_.CanGoBack()) {

12
patches/chromium/mas_disable_remote_layer.patch
View File

@@ -6,7 +6,7 @@ Subject: mas_disable_remote_layer.patch
Disable remote layer APIs (CAContext and CALayerHost) for MAS build.
diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.h b/gpu/ipc/service/image_transport_surface_overlay_mac.h
index f343b7e0e04a..d0ecefd4333c 100644
index f65ad035e90cc6d9196416c7d974d6156eb7438d..9edb62e713e8d5da1f2a99a7b4795b46e42e4a41 100644
--- a/gpu/ipc/service/image_transport_surface_overlay_mac.h
+++ b/gpu/ipc/service/image_transport_surface_overlay_mac.h
@@ -20,7 +20,9 @@
@@ -30,7 +30,7 @@ index f343b7e0e04a..d0ecefd4333c 100644
gfx::Size pixel_size_;
diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
index 10b345d3727c..b52f03be6351 100644
index c1af03a268dc409b043ce3a085a7365f07e0f9e7..b883883ad52b0d625ec7be6e3b0c86503ab33582 100644
--- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm
+++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
@@ -63,6 +63,7 @@
@@ -49,7 +49,7 @@ index 10b345d3727c..b52f03be6351 100644
return true;
}
@@ -136,7 +138,9 @@
@@ -139,7 +141,9 @@
"GLImpl", static_cast<int>(gl::GetGLImplementation()),
"width", pixel_size_.width());
if (use_remote_layer_api_) {
@@ -60,7 +60,7 @@ index 10b345d3727c..b52f03be6351 100644
IOSurfaceRef io_surface =
ca_layer_tree_coordinator_->GetIOSurfaceForDisplay();
diff --git a/ui/accelerated_widget_mac/display_ca_layer_tree.mm b/ui/accelerated_widget_mac/display_ca_layer_tree.mm
index 60abe639bd9c..c38eed5fbdef 100644
index 60abe639bd9c9cf6885f811c741a45eeb683ec58..c38eed5fbdefc96a3d60e4ab70d3b007264ccb3c 100644
--- a/ui/accelerated_widget_mac/display_ca_layer_tree.mm
+++ b/ui/accelerated_widget_mac/display_ca_layer_tree.mm
@@ -98,6 +98,7 @@ - (void)setContentsChanged;
@@ -82,7 +82,7 @@ index 60abe639bd9c..c38eed5fbdef 100644
void DisplayCALayerTree::GotIOSurfaceFrame(
diff --git a/ui/base/cocoa/remote_layer_api.h b/ui/base/cocoa/remote_layer_api.h
index 2057fe69d1bb..2aba330fc488 100644
index 2057fe69d1bb4a2eb0b1dabc5473a30d676847fe..2aba330fc488660ef874caae26a06e6847cdaf93 100644
--- a/ui/base/cocoa/remote_layer_api.h
+++ b/ui/base/cocoa/remote_layer_api.h
@@ -13,6 +13,7 @@
@@ -103,7 +103,7 @@ index 2057fe69d1bb..2aba330fc488 100644
// This function will check if all of the interfaces listed above are supported
diff --git a/ui/base/cocoa/remote_layer_api.mm b/ui/base/cocoa/remote_layer_api.mm
index bbaf9f466f49..8c846ce9523a 100644
index bbaf9f466f4999acb5bfccf3b9565fd8f556ca2f..8c846ce9523a4b2f6fbdbdbeae4f94b45ac3c115 100644
--- a/ui/base/cocoa/remote_layer_api.mm
+++ b/ui/base/cocoa/remote_layer_api.mm
@@ -12,6 +12,7 @@

10
patches/chromium/mas_no_private_api.patch
View File

@@ -50,7 +50,7 @@ index 743d1364bcd13e24ecbe5ced730161d15b8c3e93..a5529ac8841b79f230f0fa8eae2b3cb2
// is concerned.
@property(nonatomic, readonly) NSString* subrole;
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index 47e4242f6113514e96a550f05b1e9a6226a4d7a0..32abf8944ec2ea6ac66ea5e521bc2e5a99c3c46e 100644
index e82b89ff5e92c4ff1e62fd8592915ae331a1adc5..917660269257bb51716e902d5ad70578793a4bb1 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -207,6 +207,7 @@
@@ -253,7 +253,7 @@ index 47e4242f6113514e96a550f05b1e9a6226a4d7a0..32abf8944ec2ea6ac66ea5e521bc2e5a
if ([attribute
isEqualToString:
NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
@@ -3079,6 +3107,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition(
@@ -3087,6 +3115,7 @@ AXPlatformRange range(std::move(lineStartPosition),
return @(child->GetIndexInParent());
}
@@ -262,10 +262,10 @@ index 47e4242f6113514e96a550f05b1e9a6226a4d7a0..32abf8944ec2ea6ac66ea5e521bc2e5a
return nil;
}
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
index 2b5b72b16611e0b0340a8d20c360a9d00200b70f..037f62ea1d9ad3a6593de80c6f4c7adf48b0a8e6 100644
index 05e9b67b3e4d356ce4c90b2da577f169f8aeae0a..2833b50e78add4caa1d5927b697d91e728ee0a06 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -529,6 +529,7 @@ void PostAnnouncementNotification(NSString* announcement) {
@@ -532,6 +532,7 @@ void PostAnnouncementNotification(NSString* announcement) {
[user_info setObject:native_focus_object
forKey:NSAccessibilityTextChangeElement];
@@ -273,7 +273,7 @@ index 2b5b72b16611e0b0340a8d20c360a9d00200b70f..037f62ea1d9ad3a6593de80c6f4c7adf
id selected_text = [native_focus_object selectedTextMarkerRange];
if (selected_text) {
NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
@@ -536,6 +537,7 @@ void PostAnnouncementNotification(NSString* announcement) {
@@ -539,6 +540,7 @@ void PostAnnouncementNotification(NSString* announcement) {
[user_info setObject:selected_text
forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
}

20
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
View File

@@ -5,7 +5,7 @@ Subject: network_service_allow_remote_certificate_verification_logic.patch
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index b1740e9c8a2f818e7c5e017aa8a6dafc01f8c75f..ab40cd29a51e95b64507d558875c89059bbb38e8 100644
index 83d6b8a9e1d99f78437b690fe321974a7d9ac0a1..a3b4372d74c2cc792f3f26d03200a41ca8aafa73 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -92,6 +92,11 @@
@@ -100,7 +100,7 @@ index b1740e9c8a2f818e7c5e017aa8a6dafc01f8c75f..ab40cd29a51e95b64507d558875c8905
constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
NetworkContext::PendingCertVerify::PendingCertVerify() = default;
@@ -512,6 +590,13 @@ void NetworkContext::SetClient(
@@ -501,6 +579,13 @@ void NetworkContext::SetClient(
client_.Bind(std::move(client));
}
@@ -114,7 +114,7 @@ index b1740e9c8a2f818e7c5e017aa8a6dafc01f8c75f..ab40cd29a51e95b64507d558875c8905
void NetworkContext::CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) {
@@ -1642,6 +1727,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -1629,6 +1714,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
base::CommandLine::ForCurrentProcess();
std::unique_ptr<net::CertVerifier> cert_verifier;
@@ -122,7 +122,7 @@ index b1740e9c8a2f818e7c5e017aa8a6dafc01f8c75f..ab40cd29a51e95b64507d558875c8905
if (g_cert_verifier_for_testing) {
cert_verifier = std::make_unique<WrappedTestingCertVerifier>();
} else {
@@ -1694,8 +1780,8 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -1676,8 +1762,8 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
}
#endif
#if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED)
@@ -133,7 +133,7 @@ index b1740e9c8a2f818e7c5e017aa8a6dafc01f8c75f..ab40cd29a51e95b64507d558875c8905
std::make_unique<net::CoalescingCertVerifier>(
std::make_unique<net::MultiThreadedCertVerifier>(
params_->use_builtin_cert_verifier
@@ -1705,12 +1791,19 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -1687,12 +1773,19 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
cert_net_fetcher_))));
}
#endif
@@ -158,10 +158,10 @@ index b1740e9c8a2f818e7c5e017aa8a6dafc01f8c75f..ab40cd29a51e95b64507d558875c8905
std::unique_ptr<NetworkServiceNetworkDelegate> network_delegate =
std::make_unique<NetworkServiceNetworkDelegate>(
diff --git a/services/network/network_context.h b/services/network/network_context.h
index 55d2de8f1e5d538f3168808c0b3c2a19520cf824..829a26f486e1e7c7a24f1d273e9af48df5fbd9b1 100644
index 419191ac79fe3fd9bf481aa05d75f8e23dfa5393..ffa991ec6020841a33df7870326b52f0ae943846 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -87,6 +87,7 @@ class DomainReliabilityMonitor;
@@ -84,6 +84,7 @@ class DomainReliabilityMonitor;
namespace network {
class CertVerifierWithTrustAnchors;
@@ -169,7 +169,7 @@ index 55d2de8f1e5d538f3168808c0b3c2a19520cf824..829a26f486e1e7c7a24f1d273e9af48d
class CookieManager;
class ExpectCTReporter;
class HostResolver;
@@ -183,6 +184,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -180,6 +181,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
void CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) override;
@@ -178,7 +178,7 @@ index 55d2de8f1e5d538f3168808c0b3c2a19520cf824..829a26f486e1e7c7a24f1d273e9af48d
void ResetURLLoaderFactories() override;
void GetCookieManager(
mojo::PendingReceiver<mojom::CookieManager> receiver) override;
@@ -612,6 +615,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -607,6 +610,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
std::unique_ptr<network::NSSTempCertsCacheChromeOS> nss_temp_certs_cache_;
#endif
@@ -186,7 +186,7 @@ index 55d2de8f1e5d538f3168808c0b3c2a19520cf824..829a26f486e1e7c7a24f1d273e9af48d
+
// CertNetFetcher used by the context's CertVerifier. May be nullptr if
// CertNetFetcher is not used by the current platform.
scoped_refptr<cert_verifier::CertNetFetcherURLLoader> cert_net_fetcher_;
scoped_refptr<net::CertNetFetcherURLRequest> cert_net_fetcher_;
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 662496d972418f367bf608ba43233526d86363fc..1ba183b6e6caf064fd003d1cf5e8af4ebc4ba869 100644
--- a/services/network/public/mojom/network_context.mojom

6
patches/chromium/web_contents.patch
View File

@@ -5,10 +5,10 @@ Subject: web_contents.patch
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 6f2ee557fb41ec1035f9a9418b86e7f47f15195c..d4ade703052e0bb26d21d901c91a12201a5c5403 100644
index 08c2fda816c1c2c983849b5172946662515ed4d9..c2a579ed267f4081f44e9f2da2cfc90ae08bf750 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2045,6 +2045,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2068,6 +2068,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@@ -21,7 +21,7 @@ index 6f2ee557fb41ec1035f9a9418b86e7f47f15195c..d4ade703052e0bb26d21d901c91a1220
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2055,6 +2061,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2078,6 +2084,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}