mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
24c2f2fa38
- CefURLRequest::Create is no longer supported in the renderer process (see https://crbug.com/891872). Use CefFrame::CreateURLRequest instead. - Mac platform definitions have been changed from `MACOSX` to `MAC` (see https://crbug.com/1105907) and related CMake macro names have been updated. The old `OS_MACOSX` define is still set in code and CMake for backwards compatibility. - Linux ARM build is currently broken (see https://crbug.com/1123214).
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 5d8eae87ed64..427c11ceb549 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 07e91e20d4c1..565e98f015eb 100644
|
|
--- content/browser/renderer_host/browser_compositor_view_mac.mm
|
|
+++ content/browser/renderer_host/browser_compositor_view_mac.mm
|
|
@@ -85,6 +85,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(
|