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

Unified Diff: content/browser/renderer_host/delegated_frame_host.cc

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/delegated_frame_host.cc
diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc
index 9cc1f75b152df46bdd38e48fa1e4be6b035df8de..6fa829ccda17477eb3fce0b0507e58fd1e2ddc25 100644
--- a/content/browser/renderer_host/delegated_frame_host.cc
+++ b/content/browser/renderer_host/delegated_frame_host.cc
@@ -380,10 +380,8 @@ void DelegatedFrameHost::AttemptFrameSubscriberCapture(
}
}
-void DelegatedFrameHost::DidCreateNewRendererCompositorFrameSink(
- cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink) {
+void DelegatedFrameHost::DidCreateNewRendererCompositorFrameSink() {
ResetCompositorFrameSinkSupport();
- renderer_compositor_frame_sink_ = renderer_compositor_frame_sink;
CreateCompositorFrameSinkSupport();
has_frame_ = false;
}
@@ -418,8 +416,8 @@ void DelegatedFrameHost::SubmitCompositorFrame(
frame.metadata.latency_info.begin(),
frame.metadata.latency_info.end());
- renderer_compositor_frame_sink_->DidReceiveCompositorFrameAck(resources);
-
+ client_->DelegatedFrameHostSendReclaimCompositorResources(
+ true /* is_swap_ack*/, resources);
skipped_frames_ = true;
BeginFrameDidNotSwap(ack);
return;
@@ -498,12 +496,14 @@ void DelegatedFrameHost::ClearDelegatedFrame() {
void DelegatedFrameHost::DidReceiveCompositorFrameAck(
const cc::ReturnedResourceArray& resources) {
- renderer_compositor_frame_sink_->DidReceiveCompositorFrameAck(resources);
+ client_->DelegatedFrameHostSendReclaimCompositorResources(
+ true /* is_swap_ack */, resources);
}
void DelegatedFrameHost::ReclaimResources(
const cc::ReturnedResourceArray& resources) {
- renderer_compositor_frame_sink_->ReclaimResources(resources);
+ client_->DelegatedFrameHostSendReclaimCompositorResources(
+ false /* is_swap_ack */, resources);
}
void DelegatedFrameHost::WillDrawSurface(const cc::LocalSurfaceId& id,
« no previous file with comments | « content/browser/renderer_host/delegated_frame_host.h ('k') | content/browser/renderer_host/delegated_frame_host_client_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698