mirror of
https://github.com/electron/electron.git
synced 2026-01-08 23:18:06 -05:00
* chore: bump chromium in DEPS to 120.0.6049.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6050.0 * chore: update patches * 4910494: Reland "[autopip] Show autopip UI for video pip" https://chromium-review.googlesource.com/c/chromium/src/+/4910494 * 4812338: Move partition_alloc into a "partition_alloc" dir. https://chromium-review.googlesource.com/c/chromium/src/+/4812338 * [Extensions Cleanup] Remove mojom ViewType::kExtensionDialog https://chromium-review.googlesource.com/c/chromium/src/+/4909897 * 4894923: Force enable raw_ptrs pointer arithmetic check. https://chromium-review.googlesource.com/c/chromium/src/+/4894923 * gin: Prevent wrappables from being constructed from author code. https://chromium-review.googlesource.com/c/chromium/src/+/4905829 * chore: update patches * chore: bump chromium in DEPS to 120.0.6052.0 * chore: bump chromium in DEPS to 120.0.6054.0 * chore: bump chromium in DEPS to 120.0.6056.0 * chore: fix patches * 4918545: Reland "[autopip] Add permissions embargo" https://chromium-review.googlesource.com/c/chromium/src/+/4918545 * 4881761: UI bindings for visual logging with structured metrics. https://chromium-review.googlesource.com/c/chromium/src/+/4881761 * chore: bump chromium in DEPS to 120.0.6058.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6060.0 * chore: bump chromium in DEPS to 120.0.6061.0 * chore: bump chromium in DEPS to 120.0.6062.0 * chore: gen libc++ filenames * chore: update patches * 4911894: Move //c/b/ui/views/eye_dropper to //components https://chromium-review.googlesource.com/c/chromium/src/+/4911894 * chore: bump chromium in DEPS to 120.0.6064.0 * chore: bump chromium in DEPS to 120.0.6066.0 * chore: bump chromium in DEPS to 120.0.6068.0 * chore: bump chromium in DEPS to 120.0.6070.0 * chore: remove temp_prevent_unused_function_error.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4931270 * chore: add TransferDragSecurityInfo() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4928028 * mark TransferDragSecurityInfo() as NOTREACHED A follow-up to previous commit. I think this is commit is correct (i.e. that this function shouldn't get called) but am not positive, so I'm including it in a standalone commit in case we need to revert. * chore: update signature of OnPrivateNetworkAccessPermissionRequired() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4919478 Our impl is a no-op, so updating the signature is the only change. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6072.0 * chore: update patches * chore: sync ParseMatchPattern() param order with upstream change Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4944243 * chore: update fix_crash_loading_non-standard_schemes_in_iframes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4939602 * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6073.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6074.0 * chore: update disable_color_correct_rendering.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4908053 no manual changes; patch applied with fuzz 1 * chore: update fix_handle_no_top_level_aura_window_in_webcontentsimpl.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4936315 minor manual sync to upstream code shear * chore: rebuild patches * chore: update ClearHttpAuthCache arguments Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4937937 adding ClearDataFilterPtr arg. Upstream added this arg, which is already present in other NetworkContext methods. Our code uses `nullptr` there. * chore: bump chromium in DEPS to 120.0.6076.0 * chore: update mas_disable_remote_accessibility.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4865412 minor manual sync to upstream code shear * chore: update disable_color_correct_rendering.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4942936 minor manual sync to upstream code shear * fix: move x11_util.h include to top of source file This is a short-term fix to unblock the roll. I will follow up a better fix in a standalone PR. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6077.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6078.0 * chore: update patches * refactor: add BrowserProcessImpl::os_crypt_async() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4455776 This is one to keep an eye on. This commit copies the upstream impl, which appears to be an interim step with more upstream code changes still forthcoming. Xref: https://bugs.chromium.org/p/chromium/issues/detail?id=1373092 * fixup! refactor: add BrowserProcessImpl::os_crypt_async() chore: make 'gn check' happy * chore: remove ensure_messageports_get_gced_when_not_referenced.patch Xref: ensure_messageports_get_gced_when_not_referenced.patch no longer needed because upstreamed * chore: remove webrtc/pipewire_capturer_make_restore_tokens_re-usable_more_than_one_time.patch Xref: https://webrtc-review.googlesource.com/c/src/+/322621 no longer needed because upstreamed * chore: add //components/compose:buildflags dep Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4912601 needed by browser/ui/browser_dialogs.h * chore: update filenames.libcxx.gni node ./script/gen-libc++-filenames.js * test: fix UI.InspectorView -> UI.InspectorView.instance() --------- 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: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
182 lines
9.0 KiB
Diff
182 lines
9.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Mon, 18 May 2020 11:12:26 -0700
|
|
Subject: allow disabling blink scheduler throttling per RenderView
|
|
|
|
This allows us to disable throttling for hidden windows.
|
|
|
|
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
|
|
index 5175f4199154bd53c6a73e279cad4e0284b4a0c0..c05b00e9fd01334575535c9768db1976e28ccdc2 100644
|
|
--- a/content/browser/renderer_host/render_view_host_impl.cc
|
|
+++ b/content/browser/renderer_host/render_view_host_impl.cc
|
|
@@ -715,6 +715,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
|
|
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
|
|
}
|
|
|
|
+void RenderViewHostImpl::SetSchedulerThrottling(bool allowed) {
|
|
+ if (auto& broadcast = GetAssociatedPageBroadcast())
|
|
+ broadcast->SetSchedulerThrottling(allowed);
|
|
+}
|
|
+
|
|
bool RenderViewHostImpl::IsMainFrameActive() {
|
|
return is_active();
|
|
}
|
|
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
|
|
index 2d5431caee0b44828ae35a861cda8b15b587123f..5db98459e35767aee91c9b901c10f2f59ac1456b 100644
|
|
--- a/content/browser/renderer_host/render_view_host_impl.h
|
|
+++ b/content/browser/renderer_host/render_view_host_impl.h
|
|
@@ -139,6 +139,7 @@ class CONTENT_EXPORT RenderViewHostImpl
|
|
void EnablePreferredSizeMode() override;
|
|
void WriteIntoTrace(perfetto::TracedProto<TraceProto> context) const override;
|
|
|
|
+ void SetSchedulerThrottling(bool allowed) override;
|
|
void SendWebPreferencesToRenderer();
|
|
void SendRendererPreferencesToRenderer(
|
|
const blink::RendererPreferences& preferences);
|
|
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
|
index eb478c177e5bd490778447c1bab81a33ca3972f0..374a1cb2ee2f35cca91da890a3edb2e06e13721d 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
|
@@ -564,8 +564,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
|
|
// OnShowWithPageVisibility will not call NotifyHostAndDelegateOnWasShown,
|
|
// which updates `visibility_`, unless the host is hidden. Make sure no update
|
|
// is needed.
|
|
- DCHECK(host_->is_hidden() || visibility_ == Visibility::VISIBLE);
|
|
- OnShowWithPageVisibility(page_visibility);
|
|
+ if (host_->is_hidden() || visibility_ == Visibility::VISIBLE)
|
|
+ OnShowWithPageVisibility(page_visibility);
|
|
}
|
|
|
|
void RenderWidgetHostViewAura::NotifyHostAndDelegateOnWasShown(
|
|
diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
|
|
index 9979c25ecd57e68331b628a518368635db5c2027..f65bfbbb663a5bb0511ffa389d3163e0fdeb4d1f 100644
|
|
--- a/content/public/browser/render_view_host.h
|
|
+++ b/content/public/browser/render_view_host.h
|
|
@@ -76,6 +76,9 @@ class CONTENT_EXPORT RenderViewHost {
|
|
virtual void WriteIntoTrace(
|
|
perfetto::TracedProto<TraceProto> context) const = 0;
|
|
|
|
+ // Disable/Enable scheduler throttling.
|
|
+ virtual void SetSchedulerThrottling(bool allowed) {}
|
|
+
|
|
private:
|
|
// This interface should only be implemented inside content.
|
|
friend class RenderViewHostImpl;
|
|
diff --git a/content/test/test_page_broadcast.h b/content/test/test_page_broadcast.h
|
|
index 73c0f64aa84061381a98ba60906835258f881468..41bdf7e231eca4617dbe53737a3925039bf77c4f 100644
|
|
--- a/content/test/test_page_broadcast.h
|
|
+++ b/content/test/test_page_broadcast.h
|
|
@@ -45,6 +45,7 @@ class TestPageBroadcast : public blink::mojom::PageBroadcast {
|
|
override;
|
|
void UpdatePageBrowsingContextGroup(const blink::BrowsingContextGroupInfo&
|
|
browsing_context_group_info) override;
|
|
+ void SetSchedulerThrottling(bool allowed) override {}
|
|
|
|
mojo::AssociatedReceiver<blink::mojom::PageBroadcast> receiver_;
|
|
};
|
|
diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
|
|
index d3877e946b1d65eba5bb45efe786fbcc7925ca6e..73bd5056baf7e4278b7260e550e2b8516be72f20 100644
|
|
--- a/third_party/blink/public/mojom/page/page.mojom
|
|
+++ b/third_party/blink/public/mojom/page/page.mojom
|
|
@@ -155,4 +155,7 @@ interface PageBroadcast {
|
|
// in `browsing_context_group_info`.
|
|
UpdatePageBrowsingContextGroup(
|
|
blink.mojom.BrowsingContextGroupInfo browsing_context_group_info);
|
|
+
|
|
+ // Whether to enable the Renderer scheduler background throttling.
|
|
+ SetSchedulerThrottling(bool allowed);
|
|
};
|
|
diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
|
|
index 8a18ecf567cd3a6a2fb1627083a5544a93198bf4..6bb4074e033e045de164bc776f75f152ea7be16f 100644
|
|
--- a/third_party/blink/public/web/web_view.h
|
|
+++ b/third_party/blink/public/web/web_view.h
|
|
@@ -371,6 +371,7 @@ class BLINK_EXPORT WebView {
|
|
// Scheduling -----------------------------------------------------------
|
|
|
|
virtual PageScheduler* Scheduler() const = 0;
|
|
+ virtual void SetSchedulerThrottling(bool allowed) {}
|
|
|
|
// 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 ed24fcdfc8cfe1e6c04482c890655f11ff261f6c..68ef0766a4fe8254f5e632b218b4e879c7b4d1c6 100644
|
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
|
@@ -2413,6 +2413,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
|
|
TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
|
|
"old_state", old_state, "new_state", new_state);
|
|
|
|
+ // If backgroundThrottling is disabled, the page is always visible.
|
|
+ if (!scheduler_throttling_allowed_)
|
|
+ new_state->visibility = mojom::blink::PageVisibilityState::kVisible;
|
|
+
|
|
bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
|
|
!old_state->is_in_back_forward_cache;
|
|
bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
|
|
@@ -3894,20 +3898,34 @@ PageScheduler* WebViewImpl::Scheduler() const {
|
|
return GetPage()->GetPageScheduler();
|
|
}
|
|
|
|
+void WebViewImpl::SetSchedulerThrottling(bool allowed) {
|
|
+ DCHECK(GetPage());
|
|
+ scheduler_throttling_allowed_ = allowed;
|
|
+ GetPage()->GetPageScheduler()->SetPageVisible(allowed ?
|
|
+ (GetVisibilityState() == mojom::blink::PageVisibilityState::kVisible) : true);
|
|
+}
|
|
+
|
|
void WebViewImpl::SetVisibilityState(
|
|
mojom::blink::PageVisibilityState visibility_state,
|
|
bool is_initial_state) {
|
|
DCHECK(GetPage());
|
|
- GetPage()->SetVisibilityState(visibility_state, is_initial_state);
|
|
- // Do not throttle if the page should be painting.
|
|
- GetPage()->GetPageScheduler()->SetPageVisible(
|
|
- visibility_state == mojom::blink::PageVisibilityState::kVisible ||
|
|
- visibility_state ==
|
|
- mojom::blink::PageVisibilityState::kHiddenButPainting);
|
|
- // Notify observers of the change.
|
|
- if (!is_initial_state) {
|
|
- for (auto& observer : observers_)
|
|
- observer.OnPageVisibilityChanged(visibility_state);
|
|
+
|
|
+ // If backgroundThrottling is disabled, the page is always visible.
|
|
+ if (!scheduler_throttling_allowed_) {
|
|
+ GetPage()->SetVisibilityState(mojom::blink::PageVisibilityState::kVisible, is_initial_state);
|
|
+ GetPage()->GetPageScheduler()->SetPageVisible(true);
|
|
+ } else {
|
|
+ bool is_visible =
|
|
+ (visibility_state == mojom::blink::PageVisibilityState::kVisible ||
|
|
+ visibility_state ==
|
|
+ mojom::blink::PageVisibilityState::kHiddenButPainting);
|
|
+ GetPage()->SetVisibilityState(visibility_state, is_initial_state);
|
|
+ GetPage()->GetPageScheduler()->SetPageVisible(is_visible);
|
|
+ // Notify observers of the change.
|
|
+ if (!is_initial_state) {
|
|
+ for (auto& observer : observers_)
|
|
+ observer.OnPageVisibilityChanged(visibility_state);
|
|
+ }
|
|
}
|
|
}
|
|
|
|
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 76456104656f863d7e5fb816a3e026c00ca8861d..24ba8dbbfc360ab12f28c2452c72c9f78307968c 100644
|
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.h
|
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.h
|
|
@@ -445,6 +445,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
|
LocalDOMWindow* PagePopupWindow() const;
|
|
|
|
PageScheduler* Scheduler() const override;
|
|
+ void SetSchedulerThrottling(bool allowed) override;
|
|
void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
|
|
bool is_initial_state) override;
|
|
mojom::blink::PageVisibilityState GetVisibilityState() override;
|
|
@@ -912,6 +913,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
|
// If true, we send IPC messages when |preferred_size_| changes.
|
|
bool send_preferred_size_changes_ = false;
|
|
|
|
+ bool scheduler_throttling_allowed_ = true;
|
|
+
|
|
// Whether the preferred size may have changed and |UpdatePreferredSize| needs
|
|
// to be called.
|
|
bool needs_preferred_size_update_ = true;
|