123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177 |
- 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/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
- index e392efaf2e1ac3cfbef2d787ba40f0491b67f3cc..d45c7570484a7c1bfca25c860a1ddd2d6a9c741d 100644
- --- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc
- +++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
- @@ -163,6 +163,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {
- (network::mojom::AttributionSupport support),
- (override));
-
- + MOCK_METHOD(
- + void,
- + SetSchedulerThrottling,
- + (bool allowed),
- + (override));
- +
- mojo::PendingAssociatedRemote<blink::mojom::PageBroadcast> GetRemote() {
- return receiver_.BindNewEndpointAndPassDedicatedRemote();
- }
- diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
- index f130879c92319b525f5a521c3a083f479b485d2e..af42b58b78beff2349deadf68c51a3d4a310ac58 100644
- --- a/content/browser/renderer_host/render_view_host_impl.cc
- +++ b/content/browser/renderer_host/render_view_host_impl.cc
- @@ -753,6 +753,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 fe60e694fa35e5c46ce49dd9617ad33d73708912..df13884877ac87e414749dfec5db8ff83c1640ba 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 d752bb307866ced284346efa00964ec993e86e2b..5a78e040a182541d879af3d3c477ae30843c5364 100644
- --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
- +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
- @@ -585,8 +585,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.
- - CHECK(host_->is_hidden() || visibility_ == Visibility::VISIBLE);
- - OnShowWithPageVisibility(page_visibility);
- + if (host_->is_hidden() || visibility_ == Visibility::VISIBLE)
- + OnShowWithPageVisibility(page_visibility);
- }
-
- void RenderWidgetHostViewAura::EnsurePlatformVisibility(
- diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
- index 20ca763ff7f55e8176b77349b41917b11e051ae6..a50c122064b5f0092f57e3d508fb19389b72203b 100644
- --- a/content/public/browser/render_view_host.h
- +++ b/content/public/browser/render_view_host.h
- @@ -75,6 +75,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 603798ae0d45836f1bf3e6608761ce1467303310..2d8caa06e418f123d7565b96d40c66fb51617a6d 100644
- --- a/content/test/test_page_broadcast.h
- +++ b/content/test/test_page_broadcast.h
- @@ -50,6 +50,7 @@ class TestPageBroadcast : public blink::mojom::PageBroadcast {
- network::mojom::AttributionSupport support) override;
- void UpdateColorProviders(
- const blink::ColorProviderColorMaps& color_provider_colors) 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 c980f3f76a37a4207bb54f18fbcdb8d0950c8856..91a9dfe56fbbcd1cc873add438947dd29c7e6646 100644
- --- a/third_party/blink/public/mojom/page/page.mojom
- +++ b/third_party/blink/public/mojom/page/page.mojom
- @@ -173,4 +173,7 @@ interface PageBroadcast {
- // 2. The ColorProvider associated with the WebContents changes as a result
- // of theme changes.
- UpdateColorProviders(ColorProviderColorMaps color_provider_colors);
- +
- + // 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 746af7113a66d26de389237ebd90ec9e6a569cc3..f2f14184eafc919a303da6679a516bdd3a825a51 100644
- --- a/third_party/blink/public/web/web_view.h
- +++ b/third_party/blink/public/web/web_view.h
- @@ -368,6 +368,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 b5281ba47164159d10ca16b7641cfdc8a4bfbbef..734c055e1828d790f2abb80243bc10fa1f4d6e5e 100644
- --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
- +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
- @@ -2447,6 +2447,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 &&
- @@ -3969,10 +3973,23 @@ 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);
- +}
- +
- void WebViewImpl::SetVisibilityState(
- mojom::blink::PageVisibilityState visibility_state,
- bool is_initial_state) {
- DCHECK(GetPage());
- +
- + if (!scheduler_throttling_allowed_) {
- + GetPage()->SetVisibilityState(mojom::blink::PageVisibilityState::kVisible, is_initial_state);
- + GetPage()->GetPageScheduler()->SetPageVisible(true);
- + return;
- + }
- +
- GetPage()->SetVisibilityState(visibility_state, is_initial_state);
- // Do not throttle if the page should be painting.
- bool is_visible =
- 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 e85443e4492d31f043b50e4d6e51b1b36ee2c11e..cadc45e27f3d45fbf7a2edc713e1e1f5a714d01e 100644
- --- a/third_party/blink/renderer/core/exported/web_view_impl.h
- +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
- @@ -448,6 +448,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;
- @@ -929,6 +930,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;
|