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

Unified Diff: components/display_compositor/gpu_compositor_frame_sink.cc

Issue 2703503002: WIP: move OffscreenCanvas into new display compositor
Patch Set: Refine connection lost Created 3 years, 10 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: components/display_compositor/gpu_compositor_frame_sink.cc
diff --git a/components/display_compositor/gpu_compositor_frame_sink.cc b/components/display_compositor/gpu_compositor_frame_sink.cc
index ac1584bc911155da467f1ed27e6918a6d92d9ab5..69936a1c23c9edbd4ae6340bd0041c84ab5a2889 100644
--- a/components/display_compositor/gpu_compositor_frame_sink.cc
+++ b/components/display_compositor/gpu_compositor_frame_sink.cc
@@ -11,19 +11,10 @@ namespace display_compositor {
GpuCompositorFrameSink::GpuCompositorFrameSink(
GpuCompositorFrameSinkDelegate* delegate,
std::unique_ptr<cc::CompositorFrameSinkSupport> support,
- cc::mojom::MojoCompositorFrameSinkPrivateRequest
- compositor_frame_sink_private_request,
cc::mojom::MojoCompositorFrameSinkClientPtr client)
: delegate_(delegate),
support_(std::move(support)),
- client_(std::move(client)),
- compositor_frame_sink_private_binding_(
- this,
- std::move(compositor_frame_sink_private_request)) {
- compositor_frame_sink_private_binding_.set_connection_error_handler(
- base::Bind(&GpuCompositorFrameSink::OnPrivateConnectionLost,
- base::Unretained(this)));
-}
+ client_(std::move(client)) {}
GpuCompositorFrameSink::~GpuCompositorFrameSink() {}
@@ -55,16 +46,6 @@ void GpuCompositorFrameSink::DidReceiveCompositorFrameAck() {
client_->DidReceiveCompositorFrameAck();
}
-void GpuCompositorFrameSink::AddChildFrameSink(
- const cc::FrameSinkId& child_frame_sink_id) {
- support_->AddChildFrameSink(child_frame_sink_id);
-}
-
-void GpuCompositorFrameSink::RemoveChildFrameSink(
- const cc::FrameSinkId& child_frame_sink_id) {
- support_->RemoveChildFrameSink(child_frame_sink_id);
-}
-
void GpuCompositorFrameSink::OnBeginFrame(const cc::BeginFrameArgs& args) {
if (client_)
client_->OnBeginFrame(args);
@@ -82,17 +63,10 @@ void GpuCompositorFrameSink::WillDrawSurface() {
}
void GpuCompositorFrameSink::OnClientConnectionLost() {
- client_connection_lost_ = true;
+ SetClientConnectionLost(true);
// Request destruction of |this| only if both connections are lost.
delegate_->OnClientConnectionLost(support_->frame_sink_id(),
- private_connection_lost_);
-}
-
-void GpuCompositorFrameSink::OnPrivateConnectionLost() {
- private_connection_lost_ = true;
- // Request destruction of |this| only if both connections are lost.
- delegate_->OnPrivateConnectionLost(support_->frame_sink_id(),
- client_connection_lost_);
+ GetPrivateConnectionLost());
}
} // namespace display_compositor

Powered by Google App Engine
This is Rietveld 408576698