| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "services/ui/public/cpp/client_compositor_frame_sink.h" | 5 #include "services/ui/public/cpp/client_compositor_frame_sink.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "cc/base/switches.h" | 10 #include "cc/base/switches.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 MakeRequest(&compositor_frame_sink), | 31 MakeRequest(&compositor_frame_sink), |
| 32 compositor_frame_sink_client.PassInterface())); | 32 compositor_frame_sink_client.PassInterface())); |
| 33 return base::WrapUnique(new ClientCompositorFrameSink( | 33 return base::WrapUnique(new ClientCompositorFrameSink( |
| 34 frame_sink_id, std::move(context_provider), gpu_memory_buffer_manager, | 34 frame_sink_id, std::move(context_provider), gpu_memory_buffer_manager, |
| 35 compositor_frame_sink.PassInterface(), | 35 compositor_frame_sink.PassInterface(), |
| 36 std::move(compositor_frame_sink_client_request))); | 36 std::move(compositor_frame_sink_client_request))); |
| 37 } | 37 } |
| 38 | 38 |
| 39 ClientCompositorFrameSink::~ClientCompositorFrameSink() {} | 39 ClientCompositorFrameSink::~ClientCompositorFrameSink() {} |
| 40 | 40 |
| 41 void ClientCompositorFrameSink::SetSurfaceChangedCallback( |
| 42 const SurfaceChangedCallback& callback) { |
| 43 DCHECK(!surface_changed_callback_); |
| 44 surface_changed_callback_ = callback; |
| 45 } |
| 46 |
| 41 bool ClientCompositorFrameSink::BindToClient( | 47 bool ClientCompositorFrameSink::BindToClient( |
| 42 cc::CompositorFrameSinkClient* client) { | 48 cc::CompositorFrameSinkClient* client) { |
| 43 if (!cc::CompositorFrameSink::BindToClient(client)) | 49 if (!cc::CompositorFrameSink::BindToClient(client)) |
| 44 return false; | 50 return false; |
| 45 | 51 |
| 46 DCHECK(!thread_checker_); | 52 DCHECK(!thread_checker_); |
| 47 thread_checker_.reset(new base::ThreadChecker()); | 53 thread_checker_.reset(new base::ThreadChecker()); |
| 48 compositor_frame_sink_.Bind(std::move(compositor_frame_sink_info_)); | 54 compositor_frame_sink_.Bind(std::move(compositor_frame_sink_info_)); |
| 49 client_binding_.reset( | 55 client_binding_.reset( |
| 50 new mojo::Binding<cc::mojom::MojoCompositorFrameSinkClient>( | 56 new mojo::Binding<cc::mojom::MojoCompositorFrameSinkClient>( |
| (...skipping 23 matching lines...) Expand all Loading... |
| 74 void ClientCompositorFrameSink::SubmitCompositorFrame( | 80 void ClientCompositorFrameSink::SubmitCompositorFrame( |
| 75 cc::CompositorFrame frame) { | 81 cc::CompositorFrame frame) { |
| 76 DCHECK(thread_checker_); | 82 DCHECK(thread_checker_); |
| 77 DCHECK(thread_checker_->CalledOnValidThread()); | 83 DCHECK(thread_checker_->CalledOnValidThread()); |
| 78 if (!compositor_frame_sink_) | 84 if (!compositor_frame_sink_) |
| 79 return; | 85 return; |
| 80 | 86 |
| 81 DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, | 87 DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, |
| 82 frame.metadata.begin_frame_ack.sequence_number); | 88 frame.metadata.begin_frame_ack.sequence_number); |
| 83 | 89 |
| 90 bool surface_changed = false; |
| 84 gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size(); | 91 gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size(); |
| 85 if (!enable_surface_synchronization_ && | 92 if (!enable_surface_synchronization_ && |
| 86 (!local_surface_id_.is_valid() || | 93 (!local_surface_id_.is_valid() || |
| 87 frame_size != last_submitted_frame_size_)) { | 94 frame_size != last_submitted_frame_size_)) { |
| 88 local_surface_id_ = id_allocator_.GenerateId(); | 95 local_surface_id_ = id_allocator_.GenerateId(); |
| 96 last_submitted_frame_size_ = frame_size; |
| 97 surface_changed = true; |
| 89 } | 98 } |
| 90 compositor_frame_sink_->SubmitCompositorFrame(local_surface_id_, | 99 compositor_frame_sink_->SubmitCompositorFrame(local_surface_id_, |
| 91 std::move(frame)); | 100 std::move(frame)); |
| 92 last_submitted_frame_size_ = frame_size; | 101 if (surface_changed && surface_changed_callback_) { |
| 102 surface_changed_callback_.Run( |
| 103 cc::SurfaceId(frame_sink_id_, local_surface_id_), frame_size); |
| 104 } |
| 93 } | 105 } |
| 94 | 106 |
| 95 ClientCompositorFrameSink::ClientCompositorFrameSink( | 107 ClientCompositorFrameSink::ClientCompositorFrameSink( |
| 96 const cc::FrameSinkId& frame_sink_id, | 108 const cc::FrameSinkId& frame_sink_id, |
| 97 scoped_refptr<cc::ContextProvider> context_provider, | 109 scoped_refptr<cc::ContextProvider> context_provider, |
| 98 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, | 110 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
| 99 cc::mojom::MojoCompositorFrameSinkPtrInfo compositor_frame_sink_info, | 111 cc::mojom::MojoCompositorFrameSinkPtrInfo compositor_frame_sink_info, |
| 100 cc::mojom::MojoCompositorFrameSinkClientRequest client_request) | 112 cc::mojom::MojoCompositorFrameSinkClientRequest client_request) |
| 101 : cc::CompositorFrameSink(std::move(context_provider), | 113 : cc::CompositorFrameSink(std::move(context_provider), |
| 102 nullptr, | 114 nullptr, |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 ClientCompositorFrameSinkBinding::TakeFrameSinkRequest() { | 169 ClientCompositorFrameSinkBinding::TakeFrameSinkRequest() { |
| 158 return std::move(compositor_frame_sink_request_); | 170 return std::move(compositor_frame_sink_request_); |
| 159 } | 171 } |
| 160 | 172 |
| 161 cc::mojom::MojoCompositorFrameSinkClientPtrInfo | 173 cc::mojom::MojoCompositorFrameSinkClientPtrInfo |
| 162 ClientCompositorFrameSinkBinding::TakeFrameSinkClient() { | 174 ClientCompositorFrameSinkBinding::TakeFrameSinkClient() { |
| 163 return std::move(compositor_frame_sink_client_); | 175 return std::move(compositor_frame_sink_client_); |
| 164 } | 176 } |
| 165 | 177 |
| 166 } // namespace ui | 178 } // namespace ui |
| OLD | NEW |