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

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

Issue 2585543003: Revert of Getting rid of CompositorFrameMetadata::satisfies_sequences (Closed)
Patch Set: Created 4 years 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') | cc/layers/surface_layer.cc » ('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 "cc/input/selection.h" 6 #include "cc/input/selection.h"
7 #include "cc/ipc/traits_test_service.mojom.h" 7 #include "cc/ipc/traits_test_service.mojom.h"
8 #include "cc/quads/debug_border_draw_quad.h" 8 #include "cc/quads/debug_border_draw_quad.h"
9 #include "cc/quads/render_pass.h" 9 #include "cc/quads/render_pass.h"
10 #include "cc/quads/render_pass_draw_quad.h" 10 #include "cc/quads/render_pass_draw_quad.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 selection.end.SetEdge(gfx::PointF(1337.5f, 52124.f), 273 selection.end.SetEdge(gfx::PointF(1337.5f, 52124.f),
274 gfx::PointF(1234.3f, 8765.6f)); 274 gfx::PointF(1234.3f, 8765.6f));
275 selection.end.set_visible(false); 275 selection.end.set_visible(false);
276 selection.end.set_type(gfx::SelectionBound::RIGHT); 276 selection.end.set_type(gfx::SelectionBound::RIGHT);
277 selection.is_editable = true; 277 selection.is_editable = true;
278 selection.is_empty_text_form_control = true; 278 selection.is_empty_text_form_control = true;
279 ui::LatencyInfo latency_info; 279 ui::LatencyInfo latency_info;
280 latency_info.AddLatencyNumber( 280 latency_info.AddLatencyNumber(
281 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337, 7331); 281 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337, 7331);
282 std::vector<ui::LatencyInfo> latency_infos = {latency_info}; 282 std::vector<ui::LatencyInfo> latency_infos = {latency_info};
283 std::vector<uint32_t> satisfies_sequences = {1234, 1337};
283 std::vector<SurfaceId> referenced_surfaces; 284 std::vector<SurfaceId> referenced_surfaces;
284 SurfaceId id(FrameSinkId(1234, 4321), 285 SurfaceId id(FrameSinkId(1234, 4321),
285 LocalFrameId(5678, base::UnguessableToken::Create())); 286 LocalFrameId(5678, base::UnguessableToken::Create()));
286 referenced_surfaces.push_back(id); 287 referenced_surfaces.push_back(id);
287 288
288 CompositorFrameMetadata input; 289 CompositorFrameMetadata input;
289 input.device_scale_factor = device_scale_factor; 290 input.device_scale_factor = device_scale_factor;
290 input.root_scroll_offset = root_scroll_offset; 291 input.root_scroll_offset = root_scroll_offset;
291 input.page_scale_factor = page_scale_factor; 292 input.page_scale_factor = page_scale_factor;
292 input.scrollable_viewport_size = scrollable_viewport_size; 293 input.scrollable_viewport_size = scrollable_viewport_size;
293 input.root_layer_size = root_layer_size; 294 input.root_layer_size = root_layer_size;
294 input.min_page_scale_factor = min_page_scale_factor; 295 input.min_page_scale_factor = min_page_scale_factor;
295 input.max_page_scale_factor = max_page_scale_factor; 296 input.max_page_scale_factor = max_page_scale_factor;
296 input.root_overflow_x_hidden = root_overflow_x_hidden; 297 input.root_overflow_x_hidden = root_overflow_x_hidden;
297 input.root_overflow_y_hidden = root_overflow_y_hidden; 298 input.root_overflow_y_hidden = root_overflow_y_hidden;
298 input.may_contain_video = may_contain_video; 299 input.may_contain_video = may_contain_video;
299 input.is_resourceless_software_draw_with_scroll_or_animation = 300 input.is_resourceless_software_draw_with_scroll_or_animation =
300 is_resourceless_software_draw_with_scroll_or_animation; 301 is_resourceless_software_draw_with_scroll_or_animation;
301 input.top_controls_height = top_bar_height; 302 input.top_controls_height = top_bar_height;
302 input.top_controls_shown_ratio = top_bar_shown_ratio; 303 input.top_controls_shown_ratio = top_bar_shown_ratio;
303 input.bottom_controls_height = bottom_bar_height; 304 input.bottom_controls_height = bottom_bar_height;
304 input.bottom_controls_shown_ratio = bottom_bar_shown_ratio; 305 input.bottom_controls_shown_ratio = bottom_bar_shown_ratio;
305 input.root_background_color = root_background_color; 306 input.root_background_color = root_background_color;
306 input.selection = selection; 307 input.selection = selection;
307 input.latency_info = latency_infos; 308 input.latency_info = latency_infos;
309 input.satisfies_sequences = satisfies_sequences;
308 input.referenced_surfaces = referenced_surfaces; 310 input.referenced_surfaces = referenced_surfaces;
309 311
310 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy(); 312 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
311 CompositorFrameMetadata output; 313 CompositorFrameMetadata output;
312 proxy->EchoCompositorFrameMetadata(input, &output); 314 proxy->EchoCompositorFrameMetadata(input, &output);
313 EXPECT_EQ(device_scale_factor, output.device_scale_factor); 315 EXPECT_EQ(device_scale_factor, output.device_scale_factor);
314 EXPECT_EQ(root_scroll_offset, output.root_scroll_offset); 316 EXPECT_EQ(root_scroll_offset, output.root_scroll_offset);
315 EXPECT_EQ(page_scale_factor, output.page_scale_factor); 317 EXPECT_EQ(page_scale_factor, output.page_scale_factor);
316 EXPECT_EQ(scrollable_viewport_size, output.scrollable_viewport_size); 318 EXPECT_EQ(scrollable_viewport_size, output.scrollable_viewport_size);
317 EXPECT_EQ(root_layer_size, output.root_layer_size); 319 EXPECT_EQ(root_layer_size, output.root_layer_size);
318 EXPECT_EQ(min_page_scale_factor, output.min_page_scale_factor); 320 EXPECT_EQ(min_page_scale_factor, output.min_page_scale_factor);
319 EXPECT_EQ(max_page_scale_factor, output.max_page_scale_factor); 321 EXPECT_EQ(max_page_scale_factor, output.max_page_scale_factor);
320 EXPECT_EQ(root_overflow_x_hidden, output.root_overflow_x_hidden); 322 EXPECT_EQ(root_overflow_x_hidden, output.root_overflow_x_hidden);
321 EXPECT_EQ(root_overflow_y_hidden, output.root_overflow_y_hidden); 323 EXPECT_EQ(root_overflow_y_hidden, output.root_overflow_y_hidden);
322 EXPECT_EQ(may_contain_video, output.may_contain_video); 324 EXPECT_EQ(may_contain_video, output.may_contain_video);
323 EXPECT_EQ(is_resourceless_software_draw_with_scroll_or_animation, 325 EXPECT_EQ(is_resourceless_software_draw_with_scroll_or_animation,
324 output.is_resourceless_software_draw_with_scroll_or_animation); 326 output.is_resourceless_software_draw_with_scroll_or_animation);
325 EXPECT_EQ(top_bar_height, output.top_controls_height); 327 EXPECT_EQ(top_bar_height, output.top_controls_height);
326 EXPECT_EQ(top_bar_shown_ratio, output.top_controls_shown_ratio); 328 EXPECT_EQ(top_bar_shown_ratio, output.top_controls_shown_ratio);
327 EXPECT_EQ(bottom_bar_height, output.bottom_controls_height); 329 EXPECT_EQ(bottom_bar_height, output.bottom_controls_height);
328 EXPECT_EQ(bottom_bar_shown_ratio, output.bottom_controls_shown_ratio); 330 EXPECT_EQ(bottom_bar_shown_ratio, output.bottom_controls_shown_ratio);
329 EXPECT_EQ(root_background_color, output.root_background_color); 331 EXPECT_EQ(root_background_color, output.root_background_color);
330 EXPECT_EQ(selection, output.selection); 332 EXPECT_EQ(selection, output.selection);
331 EXPECT_EQ(latency_infos.size(), output.latency_info.size()); 333 EXPECT_EQ(latency_infos.size(), output.latency_info.size());
332 ui::LatencyInfo::LatencyComponent component; 334 ui::LatencyInfo::LatencyComponent component;
333 EXPECT_TRUE(output.latency_info[0].FindLatency( 335 EXPECT_TRUE(output.latency_info[0].FindLatency(
334 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337, 336 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337,
335 &component)); 337 &component));
336 EXPECT_EQ(7331, component.sequence_number); 338 EXPECT_EQ(7331, component.sequence_number);
339 EXPECT_EQ(satisfies_sequences.size(), output.satisfies_sequences.size());
340 for (uint32_t i = 0; i < satisfies_sequences.size(); ++i)
341 EXPECT_EQ(satisfies_sequences[i], output.satisfies_sequences[i]);
337 EXPECT_EQ(referenced_surfaces.size(), output.referenced_surfaces.size()); 342 EXPECT_EQ(referenced_surfaces.size(), output.referenced_surfaces.size());
338 for (uint32_t i = 0; i < referenced_surfaces.size(); ++i) 343 for (uint32_t i = 0; i < referenced_surfaces.size(); ++i)
339 EXPECT_EQ(referenced_surfaces[i], output.referenced_surfaces[i]); 344 EXPECT_EQ(referenced_surfaces[i], output.referenced_surfaces[i]);
340 } 345 }
341 346
342 TEST_F(StructTraitsTest, FilterOperation) { 347 TEST_F(StructTraitsTest, FilterOperation) {
343 const FilterOperation inputs[] = { 348 const FilterOperation inputs[] = {
344 FilterOperation::CreateBlurFilter(20), 349 FilterOperation::CreateBlurFilter(20),
345 FilterOperation::CreateDropShadowFilter(gfx::Point(4, 4), 4.0f, 350 FilterOperation::CreateDropShadowFilter(gfx::Point(4, 4), 4.0f,
346 SkColorSetARGB(255, 40, 0, 0)), 351 SkColorSetARGB(255, 40, 0, 0)),
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id()); 919 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id());
915 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id()); 920 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id());
916 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id()); 921 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id());
917 EXPECT_EQ(color_space, out_quad->color_space); 922 EXPECT_EQ(color_space, out_quad->color_space);
918 EXPECT_EQ(resource_offset, out_quad->resource_offset); 923 EXPECT_EQ(resource_offset, out_quad->resource_offset);
919 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier); 924 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier);
920 EXPECT_EQ(bits_per_channel, out_quad->bits_per_channel); 925 EXPECT_EQ(bits_per_channel, out_quad->bits_per_channel);
921 } 926 }
922 927
923 } // namespace cc 928 } // namespace cc
OLDNEW
« no previous file with comments | « cc/ipc/compositor_frame_metadata_struct_traits.cc ('k') | cc/layers/surface_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698