From 2d670c4bd5abb75bfb552745dc1d26a9a0f8627c Mon Sep 17 00:00:00 2001 From: Cezary Kulakowski Date: Tue, 1 Oct 2019 04:53:29 -0400 Subject: [PATCH] fix: remove unnecessary patch Patch which this pr removes adds new version of BrowserCompositorMac::GetCompositor. There is this function in BrowserCompositorMac with specifier const. Chromium's function returns parent's compositor if parent is set. Electron's version doesn't and - as a result - constrained dialogs won't be displayed correctly if they don't have its own compositor. --- patches/chromium/.patches | 1 - patches/chromium/browser_compositor_mac.patch | 44 ------------------- 2 files changed, 45 deletions(-) delete mode 100644 patches/chromium/browser_compositor_mac.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 2a65994d789b5..5327df58c070a 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -5,7 +5,6 @@ accelerator.patch blink_file_path.patch blink_local_frame.patch blink_world_context.patch -browser_compositor_mac.patch can_create_window.patch disable_hidden.patch dom_storage_limits.patch diff --git a/patches/chromium/browser_compositor_mac.patch b/patches/chromium/browser_compositor_mac.patch deleted file mode 100644 index f7390e0b92ed7..0000000000000 --- a/patches/chromium/browser_compositor_mac.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cheng Zhao -Date: Thu, 20 Sep 2018 17:45:14 -0700 -Subject: browser_compositor_mac.patch - - -diff --git a/content/browser/renderer_host/browser_compositor_view_mac.h b/content/browser/renderer_host/browser_compositor_view_mac.h -index de89d291e5cbc0981cf06170ed35502a1239136d..656f6c38d55d9f9af569bc772254ca13c279eeab 100644 ---- a/content/browser/renderer_host/browser_compositor_view_mac.h -+++ b/content/browser/renderer_host/browser_compositor_view_mac.h -@@ -60,6 +60,8 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient, - // These will not return nullptr until Destroy is called. - DelegatedFrameHost* GetDelegatedFrameHost(); - -+ ui::Layer* GetRootLayer() { return root_layer_.get(); } -+ - // Force a new surface id to be allocated. Returns true if the - // RenderWidgetHostImpl sent the resulting surface id to the renderer. - bool ForceNewSurfaceId(); -@@ -68,6 +70,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient, - // no valid frame is available. - const gfx::CALayerParams* GetLastCALayerParams() const; - -+ ui::Compositor* GetCompositor(); - void DidCreateNewRendererCompositorFrameSink( - viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink); - void OnDidNotProduceFrame(const viz::BeginFrameAck& ack); -diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm -index 8ddd790decc43af9820c97121a3b359e7cbb49ee..18019d5794f688ca07b35a665cc9800bb1d3047a 100644 ---- a/content/browser/renderer_host/browser_compositor_view_mac.mm -+++ b/content/browser/renderer_host/browser_compositor_view_mac.mm -@@ -80,6 +80,12 @@ - DCHECK_EQ(1u, num_erased); - } - -+ui::Compositor* BrowserCompositorMac::GetCompositor() { -+ if (recyclable_compositor_) -+ return recyclable_compositor_->compositor(); -+ return nullptr; -+} -+ - DelegatedFrameHost* BrowserCompositorMac::GetDelegatedFrameHost() { - DCHECK(delegated_frame_host_); - return delegated_frame_host_.get();