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 91.0.4472.69 (13-x-y) (#29158)

Browse Source 
* chore: bump chromium in DEPS to 91.0.4472.57

* chore: update patches

* try disabling gpu on WOA to see if it helps with failures

* chore: bump chromium in DEPS to 91.0.4472.69

* update patches

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Electron Bot <electron@github.com>
This commit is contained in:
electron-roller[bot]
2021-05-21 17:30:12 -04:00
committed by GitHub
parent 5c5f041731
commit 1d3cd106d1
10 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@@ -14,7 +14,7 @@ gclient_gn_args = [
vars = {
'chromium_version':
'91.0.4472.38',
'91.0.4472.69',
'node_version':
'v14.16.0',
'nan_version':

2
azure-pipelines-woa.yml
View File

@@ -64,7 +64,7 @@ steps:
set npm_config_arch=arm64
cd electron
# CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
node script/yarn test -- --enable-logging --verbose --disable-features=CalculateNativeWinOcclusion
node script/yarn test -- --enable-logging --verbose --disable-features=CalculateNativeWinOcclusion --disable-gpu
displayName: 'Run Electron tests'
env:
ELECTRON_OUT_DIR: Default

4
patches/chromium/add_setter_for_browsermainloop_result_code.patch
View File

@@ -10,10 +10,10 @@ valid use cases for setting custom exit codes of the main loop. This
exposes a simple setter that embedders can call.
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index e116a3de7fb765758793b3feecab2654193c3a96..0131d97a8b82d2339c99d1b1c6c3faeba2ae35ff 100644
index 69b091698f04209af113af6c586ec8615ff52d41..c54ad51b6cf4b48c522ae79091697b5efa50673c 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -167,6 +167,10 @@ class CONTENT_EXPORT BrowserMainLoop {
@@ -168,6 +168,10 @@ class CONTENT_EXPORT BrowserMainLoop {
int GetResultCode() const { return result_code_; }

2
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View File

@@ -362,7 +362,7 @@ index 7d27e12c4e9a7f32af8a26f672359057a643dd67..7a30ac31f79871f2a9afa0345e0e88af
content::RenderFrameHost* opener,
content::SiteInstance* source_site_instance,
diff --git a/fuchsia/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
index f50f4343ed5a487538ef9ce819cd19300623a3dd..282bca34f82e5a3b27bc66f0cab494e388f35b9e 100644
index 55e40649835e3a1c0d28ad6c175e837f15ba3b95..af017ef21ef3a1d9b6756e035504b645d82944a1 100644
--- a/fuchsia/engine/browser/frame_impl.cc
+++ b/fuchsia/engine/browser/frame_impl.cc
@@ -372,8 +372,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(

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 7311821a8c1e5e187eae1520931ed1d08cd02e62..1639bf39f3947c9655e2abf62b31cc1983f4fe05 100644
index 9fedd83307439aa6a6780de63e6be73ccea101af..d092b1760bd5f719d74c0ed096837abd86caba49 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6279,6 +6279,7 @@ static_library("browser") {
@@ -6281,6 +6281,7 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",

2
patches/chromium/disable_color_correct_rendering.patch
View File

@@ -20,7 +20,7 @@ to deal with color spaces. That is being tracked at
https://crbug.com/634542 and https://crbug.com/711107.
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 1e0da94e14e6180a4971e6e028306a1ae32308df..d180bfd510d348cc6c330fcc125c5aff33d7acb0 100644
index 94c8f648d1bf3cd41a048675dcabc2c5fb61142e..7317e263397ca6697277d232cdd3ea0031aa36eb 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1789,6 +1789,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(

6
patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
View File

@@ -85,10 +85,10 @@ index 209067240ccce0458882ad008363cdb996dd1a80..eaacca18d1488b3a2f7445bb44949ccb
// Visibility -----------------------------------------------------------
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index 4b7adb536a285501bb8dbeccd6bbb813cdf903c6..d7ada5c44ba02449ab11d4cb5a6f201ea6adf9f6 100644
index b236663d8f011f6d831a83f22f4d8353d60dd388..6007654af0e7a3e6c6148aa32b00f5116a44be2b 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -3551,6 +3551,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
@@ -3549,6 +3549,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
return GetPage()->GetPageScheduler();
}
@@ -102,7 +102,7 @@ index 4b7adb536a285501bb8dbeccd6bbb813cdf903c6..d7ada5c44ba02449ab11d4cb5a6f201e
void WebViewImpl::SetVisibilityState(
mojom::blink::PageVisibilityState visibility_state,
bool is_initial_state) {
@@ -3563,7 +3570,8 @@ void WebViewImpl::SetVisibilityState(
@@ -3561,7 +3568,8 @@ void WebViewImpl::SetVisibilityState(
}
GetPage()->SetVisibilityState(visibility_state, is_initial_state);
GetPage()->GetPageScheduler()->SetPageVisible(

8
patches/chromium/frame_host_manager.patch
View File

@@ -42,7 +42,7 @@ index f426d1ebdaa9d13c7e47f22ce617e2b61a862854..26907541dd4268e3f8c82676bdda892b
// 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 bd3a898a230c90aaf6bfd82601ad5279f7b7673e..5ab908d3494bf3eb14c7ed3e70d93e20abc47e03 100644
index 6f1fe2a9f91d78924a65dc3c759a17b0c9de669a..94b14696c271c16094e050f90730a3182b22cb77 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -1569,6 +1569,21 @@ void NavigationRequest::BeginNavigation() {
@@ -67,7 +67,7 @@ index bd3a898a230c90aaf6bfd82601ad5279f7b7673e..5ab908d3494bf3eb14c7ed3e70d93e20
// Select an appropriate RenderFrameHost.
std::string frame_host_choice_reason;
render_frame_host_ =
@@ -6158,6 +6173,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
@@ -6159,6 +6174,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
{WILL_START_REQUEST, {
WILL_REDIRECT_REQUEST,
WILL_PROCESS_RESPONSE,
@@ -75,7 +75,7 @@ index bd3a898a230c90aaf6bfd82601ad5279f7b7673e..5ab908d3494bf3eb14c7ed3e70d93e20
READY_TO_COMMIT,
DID_COMMIT,
CANCELING,
@@ -6171,10 +6187,15 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
@@ -6172,10 +6188,15 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
WILL_FAIL_REQUEST,
}},
{WILL_PROCESS_RESPONSE, {
@@ -92,7 +92,7 @@ index bd3a898a230c90aaf6bfd82601ad5279f7b7673e..5ab908d3494bf3eb14c7ed3e70d93e20
NOT_STARTED,
DID_COMMIT,
diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h
index e1568bf756ea90a08645303b0be986c7cbe848ce..a6fa64a8728b2b95293a10c96c4d0fdd644cd3a0 100644
index a8a5306ae3f6967ae498890eeee05f382a941608..8388178c66bf372d7f3000e5e5fec2dff353adf8 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

4
patches/chromium/moves_background_color_setter_of_webview_to_blinks_webprefs_logic.patch
View File

@@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
done in future work.
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index d7ada5c44ba02449ab11d4cb5a6f201ea6adf9f6..e77a0d718ee398ad9c31736a9cb13e22c00114e9 100644
index 6007654af0e7a3e6c6148aa32b00f5116a44be2b..edcc2009b430480731cbee2d77316c12d32d6a9d 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -155,6 +155,7 @@
@@ -23,7 +23,7 @@ index d7ada5c44ba02449ab11d4cb5a6f201ea6adf9f6..e77a0d718ee398ad9c31736a9cb13e22
#include "third_party/blink/renderer/platform/graphics/image.h"
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
@@ -1770,6 +1771,14 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
@@ -1768,6 +1769,14 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
RuntimeEnabledFeatures::SetTranslateServiceEnabled(
prefs.translate_service_available);

32
patches/chromium/printing.patch
View File

@@ -387,7 +387,7 @@ index 4fde003f2a12794bfcd479ef2797cc6281c5720b..bc3bc4aee26f9373de35366ddb07f7ba
// Tells the RenderFrame to switch the CSS to print media type, render every
// requested page using the print preview document's frame/node, and then
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728d67260b6 100644
index b2f6053c94a272f91849b1f351ede6d64af09d4f..d54c332b7ee80106bb54de2a2123f18d3e11f559 100644
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -38,6 +38,7 @@
@@ -398,17 +398,17 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
#include "printing/units.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
@@ -1172,7 +1173,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
@@ -1176,7 +1177,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
if (!weak_this)
return;
- Print(web_frame, blink::WebNode(), PrintRequestType::kScripted);
+ Print(web_frame, blink::WebNode(), PrintRequestType::kScripted,
+ false /* silent */, base::DictionaryValue() /* new_settings */);
if (!weak_this)
return;
if (weak_this)
web_frame->DispatchAfterPrintEvent();
@@ -1200,7 +1202,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
@@ -1207,7 +1209,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
receivers_.Add(this, std::move(receiver));
}
@@ -417,7 +417,7 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
if (ipc_nesting_level_ > 1)
return;
@@ -1215,7 +1217,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
@@ -1222,7 +1224,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
// that instead.
auto plugin = delegate_->GetPdfElement(frame);
@@ -426,7 +426,7 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
if (!render_frame_gone_)
frame->DispatchAfterPrintEvent();
@@ -1234,7 +1236,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
@@ -1252,7 +1254,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
}
Print(frame, print_preview_context_.source_node(),
@@ -436,7 +436,7 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
if (!render_frame_gone_)
print_preview_context_.DispatchAfterPrintEvent();
// WARNING: |this| may be gone at this point. Do not do any more work here and
@@ -1282,6 +1285,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
@@ -1300,6 +1303,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
if (ipc_nesting_level_ > 1)
return;
@@ -445,7 +445,7 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
print_preview_context_.OnPrintPreview();
if (print_preview_context_.IsForArc()) {
@@ -1817,7 +1822,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -1835,7 +1840,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
return;
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -455,7 +455,7 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
// Check if |this| is still valid.
if (!weak_this)
return;
@@ -1832,7 +1838,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -1850,7 +1856,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
const blink::WebNode& node,
@@ -466,7 +466,7 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
// If still not finished with earlier print request simply ignore.
if (prep_frame_view_)
return;
@@ -1840,7 +1848,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -1858,7 +1866,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
FrameReference frame_ref(frame);
uint32_t expected_page_count = 0;
@@ -475,7 +475,7 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
DidFinishPrinting(FAIL_PRINT_INIT);
return; // Failed to init print page settings.
}
@@ -1859,8 +1867,41 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -1877,8 +1885,41 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
print_pages_params_->params->print_scaling_option;
auto self = weak_ptr_factory_.GetWeakPtr();
@@ -518,7 +518,7 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
// Check if |this| is still valid.
if (!self)
return;
@@ -2109,7 +2150,9 @@ void PrintRenderFrameHelper::IPCProcessed() {
@@ -2127,7 +2168,9 @@ void PrintRenderFrameHelper::IPCProcessed() {
}
}
@@ -529,7 +529,7 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
mojom::PrintPagesParams settings;
settings.params = mojom::PrintParams::New();
GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
@@ -2133,12 +2176,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
@@ -2151,12 +2194,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
return result;
}
@@ -548,7 +548,7 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
notify_browser_of_print_failure_ = false;
GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
return false;
@@ -2494,18 +2539,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
@@ -2527,18 +2572,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
}
bool PrintRenderFrameHelper::CheckForCancel() {
@@ -569,7 +569,7 @@ index fe8687f513bc083e0d7663b55d3b8240aae60625..dfd0c73de87006d97c1243967e5ed728
bool PrintRenderFrameHelper::PreviewPageRendered(
diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
index 8bd08c90b1f05483db8d7a58427a7431edef7868..26a26ceea435f0c09fae4219fd1e907f1f3fe26b 100644
index ae14b4e5da65fb3548d4369216a3c6b90c8d17a1..67962f518035b528dd3e958e6e56c764257894ae 100644
--- a/components/printing/renderer/print_render_frame_helper.h
+++ b/components/printing/renderer/print_render_frame_helper.h
@@ -231,7 +231,7 @@ class PrintRenderFrameHelper