From 8cd600c89dbb9cd6a06bf554b4786030373ad71d Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 29 Oct 2019 09:21:57 -0600 Subject: [PATCH] fix: Disable compositor recycling only for attached views In #19873, we completely disabled compositor recycling. This has adverse effects in our tabbed app where switching tabs (i.e. `BrowserView`s) now results in a flicker because we now also switch compositors. To fix this without regressing the original fix, we now recycle the compositor when the view is removed from a window or explicitly marked as hidden. These can only happen with `BrowserView`s so `BrowserWindow`s are unaffected. --- .../disable_compositor_recycling.patch | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch index 02986572d9169..2b436846859a8 100644 --- a/patches/chromium/disable_compositor_recycling.patch +++ b/patches/chromium/disable_compositor_recycling.patch @@ -5,16 +5,21 @@ Subject: fix: disabling compositor recycling Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron. -diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm -index 8ddd790decc43af9820c97121a3b359e7cbb49ee..41269301e92d96757066229842333c8981994234 100644 ---- a/content/browser/renderer_host/browser_compositor_view_mac.mm -+++ b/content/browser/renderer_host/browser_compositor_view_mac.mm -@@ -203,7 +203,7 @@ - } +diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm +index 32f3f2cceb742065db8b52a9f6aa814cfc30f955..c96b53d3123b933f316865e2af7dfca433b65ce9 100644 +--- a/content/browser/renderer_host/render_widget_host_view_mac.mm ++++ b/content/browser/renderer_host/render_widget_host_view_mac.mm +@@ -486,7 +486,12 @@ + return; - void BrowserCompositorMac::SetRenderWidgetHostIsHidden(bool hidden) { -- render_widget_host_is_hidden_ = hidden; -+ render_widget_host_is_hidden_ = false; - UpdateState(); + host()->WasHidden(); +- browser_compositor_->SetRenderWidgetHostIsHidden(true); ++ // Consider the RWHV occluded only if's explicitly marked hidden or if it ++ // is not attached to window (e.g. unattached BrowserView). Otherwise we ++ // treat it as visible to prevent unnecessary compositor recycling. ++ const bool unattached_or_hidden = ++ ![GetInProcessNSView() window] || [GetInProcessNSView() isHidden]; ++ browser_compositor_->SetRenderWidgetHostIsHidden(unattached_or_hidden); } + void RenderWidgetHostViewMac::SetSize(const gfx::Size& size) {