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" | |
9 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
10 #include "cc/base/switches.h" | |
11 #include "cc/output/begin_frame_args.h" | 9 #include "cc/output/begin_frame_args.h" |
12 #include "cc/output/compositor_frame.h" | 10 #include "cc/output/compositor_frame.h" |
13 #include "cc/output/compositor_frame_sink_client.h" | 11 #include "cc/output/compositor_frame_sink_client.h" |
14 | 12 |
15 namespace ui { | 13 namespace ui { |
16 | 14 |
17 // static | 15 // static |
18 std::unique_ptr<ClientCompositorFrameSink> ClientCompositorFrameSink::Create( | 16 std::unique_ptr<ClientCompositorFrameSink> ClientCompositorFrameSink::Create( |
19 const cc::FrameSinkId& frame_sink_id, | |
20 scoped_refptr<cc::ContextProvider> context_provider, | 17 scoped_refptr<cc::ContextProvider> context_provider, |
21 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, | 18 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
22 std::unique_ptr<ClientCompositorFrameSinkBinding>* | 19 std::unique_ptr<ClientCompositorFrameSinkBinding>* |
23 compositor_frame_sink_binding) { | 20 compositor_frame_sink_binding, |
| 21 bool enable_surface_synchronization) { |
24 cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink; | 22 cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink; |
25 cc::mojom::MojoCompositorFrameSinkClientPtr compositor_frame_sink_client; | 23 cc::mojom::MojoCompositorFrameSinkClientPtr compositor_frame_sink_client; |
26 cc::mojom::MojoCompositorFrameSinkClientRequest | 24 cc::mojom::MojoCompositorFrameSinkClientRequest |
27 compositor_frame_sink_client_request = | 25 compositor_frame_sink_client_request = |
28 MakeRequest(&compositor_frame_sink_client); | 26 MakeRequest(&compositor_frame_sink_client); |
29 | 27 |
30 compositor_frame_sink_binding->reset(new ClientCompositorFrameSinkBinding( | 28 compositor_frame_sink_binding->reset(new ClientCompositorFrameSinkBinding( |
31 MakeRequest(&compositor_frame_sink), | 29 MakeRequest(&compositor_frame_sink), |
32 compositor_frame_sink_client.PassInterface())); | 30 compositor_frame_sink_client.PassInterface())); |
33 return base::WrapUnique(new ClientCompositorFrameSink( | 31 return base::WrapUnique(new ClientCompositorFrameSink( |
34 frame_sink_id, std::move(context_provider), gpu_memory_buffer_manager, | 32 std::move(context_provider), gpu_memory_buffer_manager, |
35 compositor_frame_sink.PassInterface(), | 33 compositor_frame_sink.PassInterface(), |
36 std::move(compositor_frame_sink_client_request))); | 34 std::move(compositor_frame_sink_client_request), |
| 35 enable_surface_synchronization)); |
37 } | 36 } |
38 | 37 |
39 ClientCompositorFrameSink::~ClientCompositorFrameSink() {} | 38 ClientCompositorFrameSink::~ClientCompositorFrameSink() {} |
40 | 39 |
41 bool ClientCompositorFrameSink::BindToClient( | 40 bool ClientCompositorFrameSink::BindToClient( |
42 cc::CompositorFrameSinkClient* client) { | 41 cc::CompositorFrameSinkClient* client) { |
43 if (!cc::CompositorFrameSink::BindToClient(client)) | 42 if (!cc::CompositorFrameSink::BindToClient(client)) |
44 return false; | 43 return false; |
45 | 44 |
46 DCHECK(!thread_checker_); | 45 DCHECK(!thread_checker_); |
(...skipping 28 matching lines...) Expand all Loading... |
75 cc::CompositorFrame frame) { | 74 cc::CompositorFrame frame) { |
76 DCHECK(thread_checker_); | 75 DCHECK(thread_checker_); |
77 DCHECK(thread_checker_->CalledOnValidThread()); | 76 DCHECK(thread_checker_->CalledOnValidThread()); |
78 if (!compositor_frame_sink_) | 77 if (!compositor_frame_sink_) |
79 return; | 78 return; |
80 | 79 |
81 DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, | 80 DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, |
82 frame.metadata.begin_frame_ack.sequence_number); | 81 frame.metadata.begin_frame_ack.sequence_number); |
83 | 82 |
84 gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size(); | 83 gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size(); |
85 if (!enable_surface_synchronization_ && | 84 if (!local_surface_id_.is_valid() || |
86 (!local_surface_id_.is_valid() || | 85 frame_size != last_submitted_frame_size_) { |
87 frame_size != last_submitted_frame_size_)) { | 86 last_submitted_frame_size_ = frame_size; |
88 local_surface_id_ = id_allocator_.GenerateId(); | 87 if (!enable_surface_synchronization_) |
| 88 local_surface_id_ = id_allocator_.GenerateId(); |
89 } | 89 } |
90 compositor_frame_sink_->SubmitCompositorFrame(local_surface_id_, | 90 compositor_frame_sink_->SubmitCompositorFrame(local_surface_id_, |
91 std::move(frame)); | 91 std::move(frame)); |
92 last_submitted_frame_size_ = frame_size; | |
93 } | 92 } |
94 | 93 |
95 ClientCompositorFrameSink::ClientCompositorFrameSink( | 94 ClientCompositorFrameSink::ClientCompositorFrameSink( |
96 const cc::FrameSinkId& frame_sink_id, | |
97 scoped_refptr<cc::ContextProvider> context_provider, | 95 scoped_refptr<cc::ContextProvider> context_provider, |
98 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, | 96 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
99 cc::mojom::MojoCompositorFrameSinkPtrInfo compositor_frame_sink_info, | 97 cc::mojom::MojoCompositorFrameSinkPtrInfo compositor_frame_sink_info, |
100 cc::mojom::MojoCompositorFrameSinkClientRequest client_request) | 98 cc::mojom::MojoCompositorFrameSinkClientRequest client_request, |
| 99 bool enable_surface_synchronization) |
101 : cc::CompositorFrameSink(std::move(context_provider), | 100 : cc::CompositorFrameSink(std::move(context_provider), |
102 nullptr, | 101 nullptr, |
103 gpu_memory_buffer_manager, | 102 gpu_memory_buffer_manager, |
104 nullptr), | 103 nullptr), |
105 compositor_frame_sink_info_(std::move(compositor_frame_sink_info)), | 104 compositor_frame_sink_info_(std::move(compositor_frame_sink_info)), |
106 client_request_(std::move(client_request)), | 105 client_request_(std::move(client_request)), |
107 frame_sink_id_(frame_sink_id) { | 106 enable_surface_synchronization_(enable_surface_synchronization) {} |
108 enable_surface_synchronization_ = | |
109 base::CommandLine::ForCurrentProcess()->HasSwitch( | |
110 cc::switches::kEnableSurfaceSynchronization); | |
111 } | |
112 | 107 |
113 void ClientCompositorFrameSink::DidReceiveCompositorFrameAck( | 108 void ClientCompositorFrameSink::DidReceiveCompositorFrameAck( |
114 const cc::ReturnedResourceArray& resources) { | 109 const cc::ReturnedResourceArray& resources) { |
115 DCHECK(thread_checker_); | 110 DCHECK(thread_checker_); |
116 DCHECK(thread_checker_->CalledOnValidThread()); | 111 DCHECK(thread_checker_->CalledOnValidThread()); |
117 if (!client_) | 112 if (!client_) |
118 return; | 113 return; |
119 client_->ReclaimResources(resources); | 114 client_->ReclaimResources(resources); |
120 client_->DidReceiveCompositorFrameAck(); | 115 client_->DidReceiveCompositorFrameAck(); |
121 } | 116 } |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
157 ClientCompositorFrameSinkBinding::TakeFrameSinkRequest() { | 152 ClientCompositorFrameSinkBinding::TakeFrameSinkRequest() { |
158 return std::move(compositor_frame_sink_request_); | 153 return std::move(compositor_frame_sink_request_); |
159 } | 154 } |
160 | 155 |
161 cc::mojom::MojoCompositorFrameSinkClientPtrInfo | 156 cc::mojom::MojoCompositorFrameSinkClientPtrInfo |
162 ClientCompositorFrameSinkBinding::TakeFrameSinkClient() { | 157 ClientCompositorFrameSinkBinding::TakeFrameSinkClient() { |
163 return std::move(compositor_frame_sink_client_); | 158 return std::move(compositor_frame_sink_client_); |
164 } | 159 } |
165 | 160 |
166 } // namespace ui | 161 } // namespace ui |
OLD | NEW |