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

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

Issue 2780713004: Hide compositor_frame_sink_id from RenderWidgetHostView* (Closed)
Patch Set: Added a comment in android Created 3 years, 9 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.mm
diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
index cd9bf321a4ef55c560cc3a19bd771e4e0acf18bf..2581a01b5f7a766375a7ac010452729c1b7ad9ec 100644
--- a/content/browser/renderer_host/browser_compositor_view_mac.mm
+++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
@@ -268,8 +268,11 @@ void BrowserCompositorMac::CopyFromCompositingSurfaceToVideoFrame(
src_subrect, std::move(target), callback_with_decrement);
}
-void BrowserCompositorMac::SwapCompositorFrame(
- uint32_t compositor_frame_sink_id,
+void BrowserCompositorMac::DidCreateNewRendererCompositorFrameSink() {
+ delegated_frame_host_->DidCreateNewRendererCompositorFrameSink();
+}
+
+void BrowserCompositorMac::SubmitCompositorFrame(
const cc::LocalSurfaceId& local_surface_id,
cc::CompositorFrame frame) {
// Compute the frame size based on the root render pass rect size.
@@ -282,8 +285,8 @@ void BrowserCompositorMac::SwapCompositorFrame(
recyclable_compositor_->compositor()->SetScaleAndSize(scale_factor,
pixel_size);
}
- delegated_frame_host_->SwapDelegatedFrame(compositor_frame_sink_id,
- local_surface_id, std::move(frame));
+ delegated_frame_host_->SubmitCompositorFrame(local_surface_id,
+ std::move(frame));
}
void BrowserCompositorMac::OnBeginFrameDidNotSwap(
@@ -435,11 +438,10 @@ void BrowserCompositorMac::DelegatedFrameHostResizeLockWasReleased() {
}
void BrowserCompositorMac::DelegatedFrameHostSendReclaimCompositorResources(
- int compositor_frame_sink_id,
bool is_swap_ack,
const cc::ReturnedResourceArray& resources) {
- client_->BrowserCompositorMacSendReclaimCompositorResources(
- compositor_frame_sink_id, is_swap_ack, resources);
+ client_->BrowserCompositorMacSendReclaimCompositorResources(is_swap_ack,
+ resources);
}
void BrowserCompositorMac::OnBeginFrame(const cc::BeginFrameArgs& args) {
« no previous file with comments | « content/browser/renderer_host/browser_compositor_view_mac.h ('k') | content/browser/renderer_host/delegated_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698