Chromium Code Reviews| Index: services/ui/public/cpp/compositor_frame_sink.cc |
| diff --git a/services/ui/public/cpp/compositor_frame_sink.cc b/services/ui/public/cpp/compositor_frame_sink.cc |
| index 0f72407095113f6953a8de231effa53fa0c6c01f..3e5c6a34c7bd0308e34c7e2aac64c738a110ca2a 100644 |
| --- a/services/ui/public/cpp/compositor_frame_sink.cc |
| +++ b/services/ui/public/cpp/compositor_frame_sink.cc |
| @@ -48,13 +48,14 @@ void CompositorFrameSink::DetachFromClient() { |
| cc::CompositorFrameSink::DetachFromClient(); |
| } |
| -void CompositorFrameSink::SwapBuffers(cc::CompositorFrame frame) { |
| +void CompositorFrameSink::SubmitCompositorFrame(cc::CompositorFrame frame) { |
| // CompositorFrameSink owns WindowSurface, and so if CompositorFrameSink is |
| // destroyed then SubmitCompositorFrame's callback will never get called. |
| // Thus, base::Unretained is safe here. |
| surface_->SubmitCompositorFrame( |
| - std::move(frame), base::Bind(&CompositorFrameSink::SwapBuffersComplete, |
| - base::Unretained(this))); |
| + std::move(frame), |
| + base::Bind(&CompositorFrameSink::SubmitCompositorFrameAck, |
|
sky
2016/10/11 02:43:25
Any idea why this doesn't supply client_ directly?
danakj
2016/10/13 22:02:48
In similar cases its to use a weakptr but no reaso
|
| + base::Unretained(this))); |
| } |
| void CompositorFrameSink::OnResourcesReturned( |
| @@ -63,8 +64,8 @@ void CompositorFrameSink::OnResourcesReturned( |
| client_->ReclaimResources(resources.To<cc::ReturnedResourceArray>()); |
| } |
| -void CompositorFrameSink::SwapBuffersComplete() { |
| - client_->DidSwapBuffersComplete(); |
| +void CompositorFrameSink::SubmitCompositorFrameAck() { |
| + client_->DidReceiveCompositorFrameAck(); |
| } |
| } // namespace ui |