Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(829)

Unified Diff: content/browser/renderer_host/browser_compositor_view_mac.h

Issue 2835403004: Revert "Use MojoCompositorFrameSink in RendererCompositorFrameSink"
Patch Set: Rebased Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/browser_compositor_view_mac.h
diff --git a/content/browser/renderer_host/browser_compositor_view_mac.h b/content/browser/renderer_host/browser_compositor_view_mac.h
index 1c73b7f3a9dd22c58d310608f293f195eb240eee..54eee88bd9db184ea0c01c7ca1cb433441da2fb7 100644
--- a/content/browser/renderer_host/browser_compositor_view_mac.h
+++ b/content/browser/renderer_host/browser_compositor_view_mac.h
@@ -26,6 +26,9 @@ class BrowserCompositorMacClient {
public:
virtual NSView* BrowserCompositorMacGetNSView() const = 0;
virtual SkColor BrowserCompositorMacGetGutterColor(SkColor color) const = 0;
+ virtual void BrowserCompositorMacSendReclaimCompositorResources(
+ bool is_swap_ack,
+ const cc::ReturnedResourceArray& resources) = 0;
virtual void BrowserCompositorMacSendBeginFrame(
const cc::BeginFrameArgs& args) = 0;
};
@@ -56,8 +59,7 @@ class BrowserCompositorMac : public DelegatedFrameHostClient {
// ui::Compositor.
ui::AcceleratedWidgetMac* GetAcceleratedWidgetMac();
- void DidCreateNewRendererCompositorFrameSink(
- cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink);
+ void DidCreateNewRendererCompositorFrameSink();
void SubmitCompositorFrame(const cc::LocalSurfaceId& local_surface_id,
cc::CompositorFrame frame);
void OnBeginFrameDidNotSwap(const cc::BeginFrameAck& ack);
@@ -103,6 +105,9 @@ class BrowserCompositorMac : public DelegatedFrameHostClient {
bool DelegatedFrameCanCreateResizeLock() const override;
std::unique_ptr<CompositorResizeLock> DelegatedFrameHostCreateResizeLock()
override;
+ void DelegatedFrameHostSendReclaimCompositorResources(
+ bool is_swap_ack,
+ const cc::ReturnedResourceArray& resources) override;
void OnBeginFrame(const cc::BeginFrameArgs& args) override;
bool IsAutoResizeEnabled() const override;
@@ -164,8 +169,6 @@ class BrowserCompositorMac : public DelegatedFrameHostClient {
std::unique_ptr<ui::Layer> root_layer_;
bool has_transparent_background_ = false;
- cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink_ =
- nullptr;
base::WeakPtrFactory<BrowserCompositorMac> weak_factory_;
};

Powered by Google App Engine
This is Rietveld 408576698