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

Side by Side Diff: cc/ipc/struct_traits_unittest.cc

Issue 2779633002: [cc] Remove remaining_frames from BeginFrameAck. (Closed)
Patch Set: Created 3 years, 8 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 unified diff | Download patch
« no previous file with comments | « android_webview/browser/test/rendering_test.cc ('k') | cc/output/begin_frame_args.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "base/run_loop.h" 6 #include "base/run_loop.h"
7 #include "cc/input/selection.h" 7 #include "cc/input/selection.h"
8 #include "cc/ipc/copy_output_request_struct_traits.h" 8 #include "cc/ipc/copy_output_request_struct_traits.h"
9 #include "cc/ipc/traits_test_service.mojom.h" 9 #include "cc/ipc/traits_test_service.mojom.h"
10 #include "cc/output/copy_output_result.h" 10 #include "cc/output/copy_output_result.h"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 EXPECT_EQ(deadline, output.deadline); 194 EXPECT_EQ(deadline, output.deadline);
195 EXPECT_EQ(interval, output.interval); 195 EXPECT_EQ(interval, output.interval);
196 EXPECT_EQ(type, output.type); 196 EXPECT_EQ(type, output.type);
197 EXPECT_EQ(on_critical_path, output.on_critical_path); 197 EXPECT_EQ(on_critical_path, output.on_critical_path);
198 } 198 }
199 199
200 TEST_F(StructTraitsTest, BeginFrameAck) { 200 TEST_F(StructTraitsTest, BeginFrameAck) {
201 const uint32_t source_id = 5; 201 const uint32_t source_id = 5;
202 const uint64_t sequence_number = 10; 202 const uint64_t sequence_number = 10;
203 const uint64_t latest_confirmed_sequence_number = 8; 203 const uint64_t latest_confirmed_sequence_number = 8;
204 const uint32_t remaining_frames = 1;
205 const bool has_damage = true; 204 const bool has_damage = true;
206 BeginFrameAck input; 205 BeginFrameAck input;
207 input.source_id = source_id; 206 input.source_id = source_id;
208 input.sequence_number = sequence_number; 207 input.sequence_number = sequence_number;
209 input.latest_confirmed_sequence_number = latest_confirmed_sequence_number; 208 input.latest_confirmed_sequence_number = latest_confirmed_sequence_number;
210 input.remaining_frames = remaining_frames;
211 input.has_damage = has_damage; 209 input.has_damage = has_damage;
212 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy(); 210 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
213 BeginFrameAck output; 211 BeginFrameAck output;
214 proxy->EchoBeginFrameAck(input, &output); 212 proxy->EchoBeginFrameAck(input, &output);
215 EXPECT_EQ(source_id, output.source_id); 213 EXPECT_EQ(source_id, output.source_id);
216 EXPECT_EQ(sequence_number, output.sequence_number); 214 EXPECT_EQ(sequence_number, output.sequence_number);
217 EXPECT_EQ(latest_confirmed_sequence_number, 215 EXPECT_EQ(latest_confirmed_sequence_number,
218 output.latest_confirmed_sequence_number); 216 output.latest_confirmed_sequence_number);
219 // |remaining_frames| and |has_damage| are not transmitted. 217 // |has_damage| is not transmitted.
220 EXPECT_EQ(0u, output.remaining_frames);
221 EXPECT_FALSE(output.has_damage); 218 EXPECT_FALSE(output.has_damage);
222 } 219 }
223 220
224 // Note that this is a fairly trivial test of CompositorFrame serialization as 221 // Note that this is a fairly trivial test of CompositorFrame serialization as
225 // most of the heavy lifting has already been done by CompositorFrameMetadata, 222 // most of the heavy lifting has already been done by CompositorFrameMetadata,
226 // RenderPass, and QuadListBasic unit tests. 223 // RenderPass, and QuadListBasic unit tests.
227 TEST_F(StructTraitsTest, CompositorFrame) { 224 TEST_F(StructTraitsTest, CompositorFrame) {
228 std::unique_ptr<RenderPass> render_pass = RenderPass::Create(); 225 std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
229 render_pass->SetNew(1, gfx::Rect(5, 6), gfx::Rect(2, 3), gfx::Transform()); 226 render_pass->SetNew(1, gfx::Rect(5, 6), gfx::Rect(2, 3), gfx::Transform());
230 227
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 resource.buffer_format = tr_buffer_format; 269 resource.buffer_format = tr_buffer_format;
273 resource.filter = tr_filter; 270 resource.filter = tr_filter;
274 resource.size = tr_size; 271 resource.size = tr_size;
275 272
276 // CompositorFrameMetadata constants. 273 // CompositorFrameMetadata constants.
277 const float device_scale_factor = 2.6f; 274 const float device_scale_factor = 2.6f;
278 const gfx::Vector2dF root_scroll_offset(1234.5f, 6789.1f); 275 const gfx::Vector2dF root_scroll_offset(1234.5f, 6789.1f);
279 const float page_scale_factor = 1337.5f; 276 const float page_scale_factor = 1337.5f;
280 const gfx::SizeF scrollable_viewport_size(1337.7f, 1234.5f); 277 const gfx::SizeF scrollable_viewport_size(1337.7f, 1234.5f);
281 const uint32_t content_source_id = 3; 278 const uint32_t content_source_id = 3;
282 const BeginFrameAck begin_frame_ack(5, 10, 8, 0, false); 279 const BeginFrameAck begin_frame_ack(5, 10, 8, false);
283 280
284 CompositorFrame input; 281 CompositorFrame input;
285 input.metadata.device_scale_factor = device_scale_factor; 282 input.metadata.device_scale_factor = device_scale_factor;
286 input.metadata.root_scroll_offset = root_scroll_offset; 283 input.metadata.root_scroll_offset = root_scroll_offset;
287 input.metadata.page_scale_factor = page_scale_factor; 284 input.metadata.page_scale_factor = page_scale_factor;
288 input.metadata.scrollable_viewport_size = scrollable_viewport_size; 285 input.metadata.scrollable_viewport_size = scrollable_viewport_size;
289 input.render_pass_list.push_back(std::move(render_pass)); 286 input.render_pass_list.push_back(std::move(render_pass));
290 input.resource_list.push_back(resource); 287 input.resource_list.push_back(resource);
291 input.metadata.content_source_id = content_source_id; 288 input.metadata.content_source_id = content_source_id;
292 input.metadata.begin_frame_ack = begin_frame_ack; 289 input.metadata.begin_frame_ack = begin_frame_ack;
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
1231 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id()); 1228 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id());
1232 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id()); 1229 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id());
1233 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id()); 1230 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id());
1234 EXPECT_EQ(color_space, out_quad->color_space); 1231 EXPECT_EQ(color_space, out_quad->color_space);
1235 EXPECT_EQ(resource_offset, out_quad->resource_offset); 1232 EXPECT_EQ(resource_offset, out_quad->resource_offset);
1236 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier); 1233 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier);
1237 EXPECT_EQ(bits_per_channel, out_quad->bits_per_channel); 1234 EXPECT_EQ(bits_per_channel, out_quad->bits_per_channel);
1238 } 1235 }
1239 1236
1240 } // namespace cc 1237 } // namespace cc
OLDNEW
« no previous file with comments | « android_webview/browser/test/rendering_test.cc ('k') | cc/output/begin_frame_args.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698