2016-07-06 21:34:09 +02:00
|
|
|
diff --git content/browser/renderer_host/browser_compositor_view_mac.h content/browser/renderer_host/browser_compositor_view_mac.h
|
2018-07-31 21:21:39 +02:00
|
|
|
index 0d13a9a16d65..3eeca6a01e6f 100644
|
2016-07-06 21:34:09 +02:00
|
|
|
--- content/browser/renderer_host/browser_compositor_view_mac.h
|
|
|
|
+++ content/browser/renderer_host/browser_compositor_view_mac.h
|
2018-07-24 00:32:02 +02:00
|
|
|
@@ -59,6 +59,8 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
|
2016-07-21 23:21:32 +02:00
|
|
|
|
|
|
|
// These will not return nullptr until Destroy is called.
|
|
|
|
DelegatedFrameHost* GetDelegatedFrameHost();
|
|
|
|
+ ui::Layer* GetRootLayer() { return root_layer_.get(); }
|
2018-07-02 19:11:49 +02:00
|
|
|
+ ui::Compositor* GetCompositor();
|
2016-07-06 21:34:09 +02:00
|
|
|
|
2017-09-06 23:40:58 +02:00
|
|
|
// Ensure that the currect compositor frame be cleared (even if it is
|
|
|
|
// potentially visible).
|
2016-07-06 21:34:09 +02:00
|
|
|
diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm
|
2018-07-31 21:21:39 +02:00
|
|
|
index f9e9ad67c887..e0d0264299d7 100644
|
2016-07-06 21:34:09 +02:00
|
|
|
--- content/browser/renderer_host/browser_compositor_view_mac.mm
|
|
|
|
+++ content/browser/renderer_host/browser_compositor_view_mac.mm
|
2018-07-31 21:21:39 +02:00
|
|
|
@@ -244,6 +244,12 @@ DelegatedFrameHost* BrowserCompositorMac::GetDelegatedFrameHost() {
|
2018-07-02 19:11:49 +02:00
|
|
|
return delegated_frame_host_.get();
|
2016-07-06 21:34:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ui::Compositor* BrowserCompositorMac::GetCompositor() {
|
|
|
|
+ if (recyclable_compositor_)
|
|
|
|
+ return recyclable_compositor_->compositor();
|
|
|
|
+ return nullptr;
|
|
|
|
+}
|
|
|
|
+
|
2018-07-02 19:11:49 +02:00
|
|
|
void BrowserCompositorMac::ClearCompositorFrame() {
|
|
|
|
// Make sure that we no longer hold a compositor lock by un-suspending the
|
|
|
|
// compositor. This ensures that we are able to swap in a new blank frame to
|