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

chore: remove unused patch chunk from bad merge (#29248)

Browse source 
* chore: remove unused patch chunk from bad merge

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
Jeremy Rose 2021-05-23 19:36:38 -07:00 committed by GitHub
parent 7209702278
commit 32d8809283
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/chromium/.patches
View file

@ -64,7 +64,7 @@ revert_remove_contentrendererclient_shouldfork.patch
ignore_rc_check.patch ignore_rc_check.patch
remove_usage_of_incognito_apis_in_the_spellchecker.patch remove_usage_of_incognito_apis_in_the_spellchecker.patch
chore_use_electron_resources_not_chrome_for_spellchecker.patch chore_use_electron_resources_not_chrome_for_spellchecker.patch
feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch allow_disabling_blink_scheduler_throttling_per_renderview.patch
hack_plugin_response_interceptor_to_point_to_electron.patch hack_plugin_response_interceptor_to_point_to_electron.patch
feat_add_support_for_overriding_the_base_spellchecker_download_url.patch feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
feat_enable_offscreen_rendering_with_viz_compositor.patch feat_enable_offscreen_rendering_with_viz_compositor.patch

16
patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch → patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
View file

@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com> From: deepak1556 <hop2deep@gmail.com>
Date: Mon, 18 May 2020 11:12:26 -0700 Date: Mon, 18 May 2020 11:12:26 -0700
Subject: feat: allow disabling blink scheduler throttling per RenderView Subject: allow disabling blink scheduler throttling per RenderView
This allows us to disable throttling for hidden windows. This allows us to disable throttling for hidden windows.
@ -113,7 +113,7 @@ index e5d12060da4fd6366313a28f4a99ac52ce119803..ff5dda58a3db3efeea952f0ae75cf855
mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() { mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
index e536aeacc79dcc5cf45674fbc4d288a8265a7548..ad45ff800911f4d937e1268a8b6a6d40e2cd6cfc 100644 index e536aeacc79dcc5cf45674fbc4d288a8265a7548..c06214e3c714c96acd104208c7495397e924bc12 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.h --- a/third_party/blink/renderer/core/exported/web_view_impl.h
+++ b/third_party/blink/renderer/core/exported/web_view_impl.h +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
@@ -403,6 +403,7 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -403,6 +403,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@ -124,17 +124,7 @@ index e536aeacc79dcc5cf45674fbc4d288a8265a7548..ad45ff800911f4d937e1268a8b6a6d40
void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state, void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
bool is_initial_state) override; bool is_initial_state) override;
mojom::blink::PageVisibilityState GetVisibilityState() override; mojom::blink::PageVisibilityState GetVisibilityState() override;
@@ -823,11 +824,18 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -828,6 +829,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float zoom_factor_override_ = 0.f;
+ // TODO(bokan): Temporary debugging added to diagnose
+ // https://crbug.com/992315. Somehow we're synchronously calling
+ // WebViewImpl::Close while handling an input event.
+ bool debug_inside_input_handling_ = false;
+
FloatSize elastic_overscroll_;
// If true, we send IPC messages when |preferred_size_| changes. // If true, we send IPC messages when |preferred_size_| changes.
bool send_preferred_size_changes_ = false; bool send_preferred_size_changes_ = false;