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

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

Issue 2106753004: Introduce bottom controls to CC and let it respond to scrolling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change to height and ratio Created 4 years, 5 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
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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 TEST_F(StructTraitsTest, CompositorFrameMetadata) { 260 TEST_F(StructTraitsTest, CompositorFrameMetadata) {
261 const float device_scale_factor = 2.6f; 261 const float device_scale_factor = 2.6f;
262 const gfx::Vector2dF root_scroll_offset(1234.5f, 6789.1f); 262 const gfx::Vector2dF root_scroll_offset(1234.5f, 6789.1f);
263 const float page_scale_factor = 1337.5f; 263 const float page_scale_factor = 1337.5f;
264 const gfx::SizeF scrollable_viewport_size(1337.7f, 1234.5f); 264 const gfx::SizeF scrollable_viewport_size(1337.7f, 1234.5f);
265 const gfx::SizeF root_layer_size(1234.5f, 5432.1f); 265 const gfx::SizeF root_layer_size(1234.5f, 5432.1f);
266 const float min_page_scale_factor = 3.5f; 266 const float min_page_scale_factor = 3.5f;
267 const float max_page_scale_factor = 4.6f; 267 const float max_page_scale_factor = 4.6f;
268 const bool root_overflow_x_hidden = true; 268 const bool root_overflow_x_hidden = true;
269 const bool root_overflow_y_hidden = true; 269 const bool root_overflow_y_hidden = true;
270 const gfx::Vector2dF location_bar_offset(1234.5f, 5432.1f); 270 const gfx::Vector2dF top_bar_height(1234.5f, 5432.1f);
271 const gfx::Vector2dF location_bar_content_translation(1234.5f, 5432.1f); 271 const float top_bar_shown_ratio(1234.5f, 5432.1f);
272 const gfx::Vector2dF bottom_bar_height(1234.5f, 5432.1f);
273 const float bottom_bar_shown_ratio(1234.5f, 5432.1f);
272 const uint32_t root_background_color = 1337; 274 const uint32_t root_background_color = 1337;
273 Selection<gfx::SelectionBound> selection; 275 Selection<gfx::SelectionBound> selection;
274 selection.start.SetEdge(gfx::PointF(1234.5f, 67891.f), 276 selection.start.SetEdge(gfx::PointF(1234.5f, 67891.f),
275 gfx::PointF(5432.1f, 1987.6f)); 277 gfx::PointF(5432.1f, 1987.6f));
276 selection.start.set_visible(true); 278 selection.start.set_visible(true);
277 selection.start.set_type(gfx::SelectionBound::CENTER); 279 selection.start.set_type(gfx::SelectionBound::CENTER);
278 selection.end.SetEdge(gfx::PointF(1337.5f, 52124.f), 280 selection.end.SetEdge(gfx::PointF(1337.5f, 52124.f),
279 gfx::PointF(1234.3f, 8765.6f)); 281 gfx::PointF(1234.3f, 8765.6f));
280 selection.end.set_visible(false); 282 selection.end.set_visible(false);
281 selection.end.set_type(gfx::SelectionBound::RIGHT); 283 selection.end.set_type(gfx::SelectionBound::RIGHT);
(...skipping 11 matching lines...) Expand all
293 CompositorFrameMetadata input; 295 CompositorFrameMetadata input;
294 input.device_scale_factor = device_scale_factor; 296 input.device_scale_factor = device_scale_factor;
295 input.root_scroll_offset = root_scroll_offset; 297 input.root_scroll_offset = root_scroll_offset;
296 input.page_scale_factor = page_scale_factor; 298 input.page_scale_factor = page_scale_factor;
297 input.scrollable_viewport_size = scrollable_viewport_size; 299 input.scrollable_viewport_size = scrollable_viewport_size;
298 input.root_layer_size = root_layer_size; 300 input.root_layer_size = root_layer_size;
299 input.min_page_scale_factor = min_page_scale_factor; 301 input.min_page_scale_factor = min_page_scale_factor;
300 input.max_page_scale_factor = max_page_scale_factor; 302 input.max_page_scale_factor = max_page_scale_factor;
301 input.root_overflow_x_hidden = root_overflow_x_hidden; 303 input.root_overflow_x_hidden = root_overflow_x_hidden;
302 input.root_overflow_y_hidden = root_overflow_y_hidden; 304 input.root_overflow_y_hidden = root_overflow_y_hidden;
303 input.location_bar_offset = location_bar_offset; 305 input.top_controls_height = top_bar_height;
304 input.location_bar_content_translation = location_bar_content_translation; 306 input.top_controls_shown_ratio = top_bar_shown_ratio;
307 input.bottom_controls_height = bottom_bar_height;
308 input.bottom_controls_shown_ratio = bottom_bar_shown_ratio;
305 input.root_background_color = root_background_color; 309 input.root_background_color = root_background_color;
306 input.selection = selection; 310 input.selection = selection;
307 input.latency_info = latency_infos; 311 input.latency_info = latency_infos;
308 input.satisfies_sequences = satisfies_sequences; 312 input.satisfies_sequences = satisfies_sequences;
309 input.referenced_surfaces = referenced_surfaces; 313 input.referenced_surfaces = referenced_surfaces;
310 314
311 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy(); 315 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
312 CompositorFrameMetadata output; 316 CompositorFrameMetadata output;
313 proxy->EchoCompositorFrameMetadata(input, &output); 317 proxy->EchoCompositorFrameMetadata(input, &output);
314 EXPECT_EQ(device_scale_factor, output.device_scale_factor); 318 EXPECT_EQ(device_scale_factor, output.device_scale_factor);
315 EXPECT_EQ(root_scroll_offset, output.root_scroll_offset); 319 EXPECT_EQ(root_scroll_offset, output.root_scroll_offset);
316 EXPECT_EQ(page_scale_factor, output.page_scale_factor); 320 EXPECT_EQ(page_scale_factor, output.page_scale_factor);
317 EXPECT_EQ(scrollable_viewport_size, output.scrollable_viewport_size); 321 EXPECT_EQ(scrollable_viewport_size, output.scrollable_viewport_size);
318 EXPECT_EQ(root_layer_size, output.root_layer_size); 322 EXPECT_EQ(root_layer_size, output.root_layer_size);
319 EXPECT_EQ(min_page_scale_factor, output.min_page_scale_factor); 323 EXPECT_EQ(min_page_scale_factor, output.min_page_scale_factor);
320 EXPECT_EQ(max_page_scale_factor, output.max_page_scale_factor); 324 EXPECT_EQ(max_page_scale_factor, output.max_page_scale_factor);
321 EXPECT_EQ(root_overflow_x_hidden, output.root_overflow_x_hidden); 325 EXPECT_EQ(root_overflow_x_hidden, output.root_overflow_x_hidden);
322 EXPECT_EQ(root_overflow_y_hidden, output.root_overflow_y_hidden); 326 EXPECT_EQ(root_overflow_y_hidden, output.root_overflow_y_hidden);
323 EXPECT_EQ(location_bar_offset, output.location_bar_offset); 327 EXPECT_EQ(top_bar_height, output.top_controls_height);
324 EXPECT_EQ(location_bar_content_translation, 328 EXPECT_EQ(top_bar_shown_ratio, output.top_controls_shown_ratio);
325 output.location_bar_content_translation); 329 EXPECT_EQ(bottom_bar_height, output.bottom_controls_height);
330 EXPECT_EQ(bottom_bar_shown_ratio, output.bottom_controls_shown_ratio);
326 EXPECT_EQ(root_background_color, output.root_background_color); 331 EXPECT_EQ(root_background_color, output.root_background_color);
327 EXPECT_EQ(selection, output.selection); 332 EXPECT_EQ(selection, output.selection);
328 EXPECT_EQ(latency_infos.size(), output.latency_info.size()); 333 EXPECT_EQ(latency_infos.size(), output.latency_info.size());
329 ui::LatencyInfo::LatencyComponent component; 334 ui::LatencyInfo::LatencyComponent component;
330 EXPECT_TRUE(output.latency_info[0].FindLatency( 335 EXPECT_TRUE(output.latency_info[0].FindLatency(
331 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337, 336 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337,
332 &component)); 337 &component));
333 EXPECT_EQ(7331, component.sequence_number); 338 EXPECT_EQ(7331, component.sequence_number);
334 EXPECT_EQ(satisfies_sequences.size(), output.satisfies_sequences.size()); 339 EXPECT_EQ(satisfies_sequences.size(), output.satisfies_sequences.size());
335 for (uint32_t i = 0; i < satisfies_sequences.size(); ++i) 340 for (uint32_t i = 0; i < satisfies_sequences.size(); ++i)
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 EXPECT_EQ(y_plane_resource_id, out_quad->y_plane_resource_id()); 877 EXPECT_EQ(y_plane_resource_id, out_quad->y_plane_resource_id());
873 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id()); 878 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id());
874 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id()); 879 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id());
875 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id()); 880 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id());
876 EXPECT_EQ(color_space, out_quad->color_space); 881 EXPECT_EQ(color_space, out_quad->color_space);
877 EXPECT_EQ(resource_offset, out_quad->resource_offset); 882 EXPECT_EQ(resource_offset, out_quad->resource_offset);
878 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier); 883 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier);
879 } 884 }
880 885
881 } // namespace cc 886 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698