1234567891011121314151617181920212223242526272829303132333435363738394041424344 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Cheng Zhao <[email protected]>
- 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 4b3f3c7e97e73ad6d0166ad114f4168d9ed00e11..59e58d693c971742951434f6582140d9179235f2 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 @@ BrowserCompositorMac::~BrowserCompositorMac() {
- 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();
|