123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: deepak1556 <[email protected]>
- 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 8a8f88c0beed2afda87543b8933bde342ecb0588..2ed68bd47ccadea20acad67d6a106e257e2c7cd0 100644
- --- a/content/browser/renderer_host/render_view_host_impl.cc
- +++ b/content/browser/renderer_host/render_view_host_impl.cc
- @@ -716,6 +716,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 d44652650891eff7cd6111bc6d6454a009942cb6..16522609163ba6bc422fc30a8d145a25877c407e 100644
- --- a/content/browser/renderer_host/render_view_host_impl.h
- +++ b/content/browser/renderer_host/render_view_host_impl.h
- @@ -140,6 +140,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 9b7814890a4f513e8b9e07fbac370a40af6dac15..ee2b3bc3aabf7f5a8e3d2ad57675537f21aafaa6 100644
- --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
- +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
- @@ -562,8 +562,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 1043f13dd1d47ba58e2cf5311d2ed2387ba97b14..fd48c793a0d447a4a6777f94c5b580fdf9b5b2d9 100644
- --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
- +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
- @@ -2407,6 +2407,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 &&
- @@ -3875,20 +3879,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 6a180620e00c77d0f4be346d1296f62feb714abb..c0ccf14faa52ab190c5848e8e9b597bcf637d4c0 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;
- @@ -909,6 +910,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;
|