OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/gpu/renderer_compositor_frame_sink.h" | 5 #include "content/renderer/gpu/renderer_compositor_frame_sink.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, | 133 DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, |
134 frame.metadata.begin_frame_ack.sequence_number); | 134 frame.metadata.begin_frame_ack.sequence_number); |
135 auto new_surface_properties = | 135 auto new_surface_properties = |
136 RenderWidgetSurfaceProperties::FromCompositorFrame(frame); | 136 RenderWidgetSurfaceProperties::FromCompositorFrame(frame); |
137 if (!local_surface_id_.is_valid() || | 137 if (!local_surface_id_.is_valid() || |
138 new_surface_properties != current_surface_properties_) { | 138 new_surface_properties != current_surface_properties_) { |
139 local_surface_id_ = id_allocator_.GenerateId(); | 139 local_surface_id_ = id_allocator_.GenerateId(); |
140 current_surface_properties_ = new_surface_properties; | 140 current_surface_properties_ = new_surface_properties; |
141 } | 141 } |
142 | 142 |
143 sink_->SubmitCompositorFrame(local_surface_id_, std::move(frame)); | 143 { |
| 144 std::unique_ptr<FrameSwapMessageQueue::SendMessageScope> |
| 145 send_message_scope = |
| 146 frame_swap_message_queue_->AcquireSendMessageScope(); |
| 147 std::vector<std::unique_ptr<IPC::Message>> messages; |
| 148 frame_swap_message_queue_->DrainMessages(&messages); |
| 149 std::vector<IPC::Message> messages_to_send; |
| 150 FrameSwapMessageQueue::TransferMessages(&messages, &messages_to_send); |
| 151 uint32_t frame_token = 0; |
| 152 if (!messages_to_send.empty()) |
| 153 frame_token = frame_swap_message_queue_->AllocateFrameToken(); |
| 154 frame.metadata.frame_token = frame_token; |
| 155 sink_->SubmitCompositorFrame(local_surface_id_, std::move(frame)); |
| 156 if (frame_token) { |
| 157 message_sender_->Send(new ViewHostMsg_FrameSwapMessages( |
| 158 routing_id_, frame_token, messages_to_send)); |
| 159 } |
| 160 // ~send_message_scope. |
| 161 } |
144 } | 162 } |
145 | 163 |
146 void RendererCompositorFrameSink::DidNotProduceFrame( | 164 void RendererCompositorFrameSink::DidNotProduceFrame( |
147 const cc::BeginFrameAck& ack) { | 165 const cc::BeginFrameAck& ack) { |
148 DCHECK(!ack.has_damage); | 166 DCHECK(!ack.has_damage); |
149 DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, ack.sequence_number); | 167 DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, ack.sequence_number); |
150 sink_->DidNotProduceFrame(ack); | 168 sink_->DidNotProduceFrame(ack); |
151 } | 169 } |
152 | 170 |
153 void RendererCompositorFrameSink::OnMessageReceived( | 171 void RendererCompositorFrameSink::OnMessageReceived( |
(...skipping 24 matching lines...) Expand all Loading... |
178 void RendererCompositorFrameSink::ReclaimResources( | 196 void RendererCompositorFrameSink::ReclaimResources( |
179 const cc::ReturnedResourceArray& resources) { | 197 const cc::ReturnedResourceArray& resources) { |
180 client_->ReclaimResources(resources); | 198 client_->ReclaimResources(resources); |
181 } | 199 } |
182 | 200 |
183 void RendererCompositorFrameSink::OnNeedsBeginFrames(bool needs_begin_frames) { | 201 void RendererCompositorFrameSink::OnNeedsBeginFrames(bool needs_begin_frames) { |
184 sink_->SetNeedsBeginFrame(needs_begin_frames); | 202 sink_->SetNeedsBeginFrame(needs_begin_frames); |
185 } | 203 } |
186 | 204 |
187 } // namespace content | 205 } // namespace content |
OLD | NEW |