browser_compositor_mac.patch 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Cheng Zhao <[email protected]>
  3. Date: Thu, 20 Sep 2018 17:45:14 -0700
  4. Subject: browser_compositor_mac.patch
  5. diff --git a/content/browser/renderer_host/browser_compositor_view_mac.h b/content/browser/renderer_host/browser_compositor_view_mac.h
  6. index de89d291e5cbc0981cf06170ed35502a1239136d..656f6c38d55d9f9af569bc772254ca13c279eeab 100644
  7. --- a/content/browser/renderer_host/browser_compositor_view_mac.h
  8. +++ b/content/browser/renderer_host/browser_compositor_view_mac.h
  9. @@ -60,6 +60,8 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
  10. // These will not return nullptr until Destroy is called.
  11. DelegatedFrameHost* GetDelegatedFrameHost();
  12. + ui::Layer* GetRootLayer() { return root_layer_.get(); }
  13. +
  14. // Force a new surface id to be allocated. Returns true if the
  15. // RenderWidgetHostImpl sent the resulting surface id to the renderer.
  16. bool ForceNewSurfaceId();
  17. @@ -68,6 +70,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
  18. // no valid frame is available.
  19. const gfx::CALayerParams* GetLastCALayerParams() const;
  20. + ui::Compositor* GetCompositor();
  21. void DidCreateNewRendererCompositorFrameSink(
  22. viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink);
  23. void OnDidNotProduceFrame(const viz::BeginFrameAck& ack);
  24. diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
  25. index 4b3f3c7e97e73ad6d0166ad114f4168d9ed00e11..59e58d693c971742951434f6582140d9179235f2 100644
  26. --- a/content/browser/renderer_host/browser_compositor_view_mac.mm
  27. +++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
  28. @@ -80,6 +80,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
  29. DCHECK_EQ(1u, num_erased);
  30. }
  31. +ui::Compositor* BrowserCompositorMac::GetCompositor() {
  32. + if (recyclable_compositor_)
  33. + return recyclable_compositor_->compositor();
  34. + return nullptr;
  35. +}
  36. +
  37. DelegatedFrameHost* BrowserCompositorMac::GetDelegatedFrameHost() {
  38. DCHECK(delegated_frame_host_);
  39. return delegated_frame_host_.get();