mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
a584bd187b
- Mac: Xcode 12.2 and the MacOS 11.0 SDK are now required for building. - MacOS 10.10 (Yosemite) is no longer supported (see https://crbug.com/1126056). - Flash is no longer supported (see https://www.chromium.org/flash-roadmap).
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
diff --git content/browser/renderer_host/browser_compositor_view_mac.h content/browser/renderer_host/browser_compositor_view_mac.h
|
|
index 202bd7aa0d57..20067b203d96 100644
|
|
--- content/browser/renderer_host/browser_compositor_view_mac.h
|
|
+++ content/browser/renderer_host/browser_compositor_view_mac.h
|
|
@@ -58,6 +58,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(); }
|
|
+ ui::Compositor* GetCompositor();
|
|
|
|
// Force a new surface id to be allocated. Returns true if the
|
|
// RenderWidgetHostImpl sent the resulting surface id to the renderer.
|
|
diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm
|
|
index a82ed2d5bbcd..59fabfcdfff7 100644
|
|
--- content/browser/renderer_host/browser_compositor_view_mac.mm
|
|
+++ content/browser/renderer_host/browser_compositor_view_mac.mm
|
|
@@ -86,6 +86,12 @@ DelegatedFrameHost* BrowserCompositorMac::GetDelegatedFrameHost() {
|
|
return delegated_frame_host_.get();
|
|
}
|
|
|
|
+ui::Compositor* BrowserCompositorMac::GetCompositor() {
|
|
+ if (recyclable_compositor_)
|
|
+ return recyclable_compositor_->compositor();
|
|
+ return nullptr;
|
|
+}
|
|
+
|
|
bool BrowserCompositorMac::ForceNewSurfaceId() {
|
|
dfh_local_surface_id_allocator_.GenerateId();
|
|
delegated_frame_host_->EmbedSurface(
|