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

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

Issue 2801603009: Deserialize frame_token in CompositorFrameMetadata's struct traits (Closed)
Patch Set: Update unit test 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 | « cc/ipc/compositor_frame_metadata_struct_traits.cc ('k') | no next file » | 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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 selection.end.set_visible(false); 367 selection.end.set_visible(false);
368 selection.end.set_type(gfx::SelectionBound::RIGHT); 368 selection.end.set_type(gfx::SelectionBound::RIGHT);
369 ui::LatencyInfo latency_info; 369 ui::LatencyInfo latency_info;
370 latency_info.AddLatencyNumber( 370 latency_info.AddLatencyNumber(
371 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337, 7331); 371 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337, 7331);
372 std::vector<ui::LatencyInfo> latency_infos = {latency_info}; 372 std::vector<ui::LatencyInfo> latency_infos = {latency_info};
373 std::vector<SurfaceId> referenced_surfaces; 373 std::vector<SurfaceId> referenced_surfaces;
374 SurfaceId id(FrameSinkId(1234, 4321), 374 SurfaceId id(FrameSinkId(1234, 4321),
375 LocalSurfaceId(5678, base::UnguessableToken::Create())); 375 LocalSurfaceId(5678, base::UnguessableToken::Create()));
376 referenced_surfaces.push_back(id); 376 referenced_surfaces.push_back(id);
377 uint32_t frame_token = 0xdeadbeef;
377 378
378 CompositorFrameMetadata input; 379 CompositorFrameMetadata input;
379 input.device_scale_factor = device_scale_factor; 380 input.device_scale_factor = device_scale_factor;
380 input.root_scroll_offset = root_scroll_offset; 381 input.root_scroll_offset = root_scroll_offset;
381 input.page_scale_factor = page_scale_factor; 382 input.page_scale_factor = page_scale_factor;
382 input.scrollable_viewport_size = scrollable_viewport_size; 383 input.scrollable_viewport_size = scrollable_viewport_size;
383 input.root_layer_size = root_layer_size; 384 input.root_layer_size = root_layer_size;
384 input.min_page_scale_factor = min_page_scale_factor; 385 input.min_page_scale_factor = min_page_scale_factor;
385 input.max_page_scale_factor = max_page_scale_factor; 386 input.max_page_scale_factor = max_page_scale_factor;
386 input.root_overflow_x_hidden = root_overflow_x_hidden; 387 input.root_overflow_x_hidden = root_overflow_x_hidden;
387 input.root_overflow_y_hidden = root_overflow_y_hidden; 388 input.root_overflow_y_hidden = root_overflow_y_hidden;
388 input.may_contain_video = may_contain_video; 389 input.may_contain_video = may_contain_video;
389 input.is_resourceless_software_draw_with_scroll_or_animation = 390 input.is_resourceless_software_draw_with_scroll_or_animation =
390 is_resourceless_software_draw_with_scroll_or_animation; 391 is_resourceless_software_draw_with_scroll_or_animation;
391 input.top_controls_height = top_bar_height; 392 input.top_controls_height = top_bar_height;
392 input.top_controls_shown_ratio = top_bar_shown_ratio; 393 input.top_controls_shown_ratio = top_bar_shown_ratio;
393 input.bottom_controls_height = bottom_bar_height; 394 input.bottom_controls_height = bottom_bar_height;
394 input.bottom_controls_shown_ratio = bottom_bar_shown_ratio; 395 input.bottom_controls_shown_ratio = bottom_bar_shown_ratio;
395 input.root_background_color = root_background_color; 396 input.root_background_color = root_background_color;
396 input.selection = selection; 397 input.selection = selection;
397 input.latency_info = latency_infos; 398 input.latency_info = latency_infos;
398 input.referenced_surfaces = referenced_surfaces; 399 input.referenced_surfaces = referenced_surfaces;
400 input.frame_token = frame_token;
399 401
400 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy(); 402 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
401 CompositorFrameMetadata output; 403 CompositorFrameMetadata output;
402 proxy->EchoCompositorFrameMetadata(std::move(input), &output); 404 proxy->EchoCompositorFrameMetadata(std::move(input), &output);
403 EXPECT_EQ(device_scale_factor, output.device_scale_factor); 405 EXPECT_EQ(device_scale_factor, output.device_scale_factor);
404 EXPECT_EQ(root_scroll_offset, output.root_scroll_offset); 406 EXPECT_EQ(root_scroll_offset, output.root_scroll_offset);
405 EXPECT_EQ(page_scale_factor, output.page_scale_factor); 407 EXPECT_EQ(page_scale_factor, output.page_scale_factor);
406 EXPECT_EQ(scrollable_viewport_size, output.scrollable_viewport_size); 408 EXPECT_EQ(scrollable_viewport_size, output.scrollable_viewport_size);
407 EXPECT_EQ(root_layer_size, output.root_layer_size); 409 EXPECT_EQ(root_layer_size, output.root_layer_size);
408 EXPECT_EQ(min_page_scale_factor, output.min_page_scale_factor); 410 EXPECT_EQ(min_page_scale_factor, output.min_page_scale_factor);
(...skipping 11 matching lines...) Expand all
420 EXPECT_EQ(selection, output.selection); 422 EXPECT_EQ(selection, output.selection);
421 EXPECT_EQ(latency_infos.size(), output.latency_info.size()); 423 EXPECT_EQ(latency_infos.size(), output.latency_info.size());
422 ui::LatencyInfo::LatencyComponent component; 424 ui::LatencyInfo::LatencyComponent component;
423 EXPECT_TRUE(output.latency_info[0].FindLatency( 425 EXPECT_TRUE(output.latency_info[0].FindLatency(
424 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337, 426 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337,
425 &component)); 427 &component));
426 EXPECT_EQ(7331, component.sequence_number); 428 EXPECT_EQ(7331, component.sequence_number);
427 EXPECT_EQ(referenced_surfaces.size(), output.referenced_surfaces.size()); 429 EXPECT_EQ(referenced_surfaces.size(), output.referenced_surfaces.size());
428 for (uint32_t i = 0; i < referenced_surfaces.size(); ++i) 430 for (uint32_t i = 0; i < referenced_surfaces.size(); ++i)
429 EXPECT_EQ(referenced_surfaces[i], output.referenced_surfaces[i]); 431 EXPECT_EQ(referenced_surfaces[i], output.referenced_surfaces[i]);
432 EXPECT_EQ(frame_token, output.frame_token);
430 } 433 }
431 434
432 TEST_F(StructTraitsTest, CopyOutputRequest_BitmapRequest) { 435 TEST_F(StructTraitsTest, CopyOutputRequest_BitmapRequest) {
433 const gfx::Rect area(5, 7, 44, 55); 436 const gfx::Rect area(5, 7, 44, 55);
434 const auto source = 437 const auto source =
435 base::UnguessableToken::Deserialize(0xdeadbeef, 0xdeadf00d); 438 base::UnguessableToken::Deserialize(0xdeadbeef, 0xdeadf00d);
436 gfx::Size size(9, 8); 439 gfx::Size size(9, 8);
437 auto bitmap = base::MakeUnique<SkBitmap>(); 440 auto bitmap = base::MakeUnique<SkBitmap>();
438 bitmap->allocN32Pixels(size.width(), size.height()); 441 bitmap->allocN32Pixels(size.width(), size.height());
439 base::RunLoop run_loop; 442 base::RunLoop run_loop;
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id()); 1231 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id());
1229 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id()); 1232 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id());
1230 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id()); 1233 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id());
1231 EXPECT_EQ(color_space, out_quad->color_space); 1234 EXPECT_EQ(color_space, out_quad->color_space);
1232 EXPECT_EQ(resource_offset, out_quad->resource_offset); 1235 EXPECT_EQ(resource_offset, out_quad->resource_offset);
1233 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier); 1236 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier);
1234 EXPECT_EQ(bits_per_channel, out_quad->bits_per_channel); 1237 EXPECT_EQ(bits_per_channel, out_quad->bits_per_channel);
1235 } 1238 }
1236 1239
1237 } // namespace cc 1240 } // namespace cc
OLDNEW
« no previous file with comments | « cc/ipc/compositor_frame_metadata_struct_traits.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698