diff --git content/browser/renderer_host/browser_compositor_view_mac.h content/browser/renderer_host/browser_compositor_view_mac.h index 7426062f7381..1ed9dedff31b 100644 --- content/browser/renderer_host/browser_compositor_view_mac.h +++ content/browser/renderer_host/browser_compositor_view_mac.h @@ -53,11 +53,13 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient { // These will not return nullptr until Destroy is called. DelegatedFrameHost* GetDelegatedFrameHost(); + ui::Layer* GetRootLayer() { return root_layer_.get(); } // Ensure that the currect compositor frame be cleared (even if it is // potentially visible). void ClearCompositorFrame(); + ui::Compositor* GetCompositor(); gfx::AcceleratedWidget GetAcceleratedWidget(); void DidCreateNewRendererCompositorFrameSink( viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink); diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm index 7fcc24c15c37..d5949c6baddb 100644 --- content/browser/renderer_host/browser_compositor_view_mac.mm +++ content/browser/renderer_host/browser_compositor_view_mac.mm @@ -208,6 +208,12 @@ BrowserCompositorMac::~BrowserCompositorMac() { g_spare_recyclable_compositors.Get().clear(); } +ui::Compositor* BrowserCompositorMac::GetCompositor() { + if (recyclable_compositor_) + return recyclable_compositor_->compositor(); + return nullptr; +} + gfx::AcceleratedWidget BrowserCompositorMac::GetAcceleratedWidget() { if (recyclable_compositor_) { return recyclable_compositor_->accelerated_widget_mac() @@ -261,7 +267,9 @@ bool BrowserCompositorMac::UpdateNSViewAndDisplay() { accelerated_widget_mac_ns_view_->AcceleratedWidgetGetNSView(); display::Display new_display = display::Screen::GetScreen()->GetDisplayNearestView(ns_view); - gfx::Size new_size_dip([ns_view bounds].size); + // TODO(cef): Get display info from callbacks. |ns_view| will be nullptr. + gfx::Size new_size_dip(ns_view ? gfx::Size([ns_view bounds].size) : + root_layer_->bounds().size()); if (new_size_dip == dfh_size_dip_ && new_display == dfh_display_) return false; diff --git ui/accelerated_widget_mac/accelerated_widget_mac.mm ui/accelerated_widget_mac/accelerated_widget_mac.mm index 8306398431d9..5ab4fef9ac0f 100644 --- ui/accelerated_widget_mac/accelerated_widget_mac.mm +++ ui/accelerated_widget_mac/accelerated_widget_mac.mm @@ -71,6 +71,10 @@ void AcceleratedWidgetMac::SetNSView(AcceleratedWidgetMacNSView* view) { DCHECK(view && !view_); view_ = view; + // Will be nullptr for CEF. + if (!view_->AcceleratedWidgetGetNSView()) + return; + CALayer* background_layer = [view_->AcceleratedWidgetGetNSView() layer]; DCHECK(background_layer); [flipped_layer_ setBounds:[background_layer bounds]];