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

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: content-offset -> top-controls-shown renaming and respond to bokan's comments 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 TEST_F(StructTraitsTest, CompositorFrameMetadata) { 136 TEST_F(StructTraitsTest, CompositorFrameMetadata) {
137 const float device_scale_factor = 2.6f; 137 const float device_scale_factor = 2.6f;
138 const gfx::Vector2dF root_scroll_offset(1234.5f, 6789.1f); 138 const gfx::Vector2dF root_scroll_offset(1234.5f, 6789.1f);
139 const float page_scale_factor = 1337.5f; 139 const float page_scale_factor = 1337.5f;
140 const gfx::SizeF scrollable_viewport_size(1337.7f, 1234.5f); 140 const gfx::SizeF scrollable_viewport_size(1337.7f, 1234.5f);
141 const gfx::SizeF root_layer_size(1234.5f, 5432.1f); 141 const gfx::SizeF root_layer_size(1234.5f, 5432.1f);
142 const float min_page_scale_factor = 3.5f; 142 const float min_page_scale_factor = 3.5f;
143 const float max_page_scale_factor = 4.6f; 143 const float max_page_scale_factor = 4.6f;
144 const bool root_overflow_x_hidden = true; 144 const bool root_overflow_x_hidden = true;
145 const bool root_overflow_y_hidden = true; 145 const bool root_overflow_y_hidden = true;
146 const gfx::Vector2dF location_bar_offset(1234.5f, 5432.1f); 146 const gfx::Vector2dF top_bar_translate(1234.5f, 5432.1f);
147 const gfx::Vector2dF location_bar_content_translation(1234.5f, 5432.1f); 147 const gfx::Vector2dF top_bar_shown(1234.5f, 5432.1f);
148 const gfx::Vector2dF bottom_bar_translate(1234.5f, 5432.1f);
149 const gfx::Vector2dF bottom_bar_shown(1234.5f, 5432.1f);
148 const uint32_t root_background_color = 1337; 150 const uint32_t root_background_color = 1337;
149 Selection<gfx::SelectionBound> selection; 151 Selection<gfx::SelectionBound> selection;
150 selection.start.SetEdge(gfx::PointF(1234.5f, 67891.f), 152 selection.start.SetEdge(gfx::PointF(1234.5f, 67891.f),
151 gfx::PointF(5432.1f, 1987.6f)); 153 gfx::PointF(5432.1f, 1987.6f));
152 selection.start.set_visible(true); 154 selection.start.set_visible(true);
153 selection.start.set_type(gfx::SelectionBound::CENTER); 155 selection.start.set_type(gfx::SelectionBound::CENTER);
154 selection.end.SetEdge(gfx::PointF(1337.5f, 52124.f), 156 selection.end.SetEdge(gfx::PointF(1337.5f, 52124.f),
155 gfx::PointF(1234.3f, 8765.6f)); 157 gfx::PointF(1234.3f, 8765.6f));
156 selection.end.set_visible(false); 158 selection.end.set_visible(false);
157 selection.end.set_type(gfx::SelectionBound::RIGHT); 159 selection.end.set_type(gfx::SelectionBound::RIGHT);
(...skipping 11 matching lines...) Expand all
169 CompositorFrameMetadata input; 171 CompositorFrameMetadata input;
170 input.device_scale_factor = device_scale_factor; 172 input.device_scale_factor = device_scale_factor;
171 input.root_scroll_offset = root_scroll_offset; 173 input.root_scroll_offset = root_scroll_offset;
172 input.page_scale_factor = page_scale_factor; 174 input.page_scale_factor = page_scale_factor;
173 input.scrollable_viewport_size = scrollable_viewport_size; 175 input.scrollable_viewport_size = scrollable_viewport_size;
174 input.root_layer_size = root_layer_size; 176 input.root_layer_size = root_layer_size;
175 input.min_page_scale_factor = min_page_scale_factor; 177 input.min_page_scale_factor = min_page_scale_factor;
176 input.max_page_scale_factor = max_page_scale_factor; 178 input.max_page_scale_factor = max_page_scale_factor;
177 input.root_overflow_x_hidden = root_overflow_x_hidden; 179 input.root_overflow_x_hidden = root_overflow_x_hidden;
178 input.root_overflow_y_hidden = root_overflow_y_hidden; 180 input.root_overflow_y_hidden = root_overflow_y_hidden;
179 input.location_bar_offset = location_bar_offset; 181 input.top_bar_translate = top_bar_translate;
180 input.location_bar_content_translation = location_bar_content_translation; 182 input.top_bar_shown = top_bar_shown;
183 input.bottom_bar_translate = bottom_bar_translate;
184 input.bottom_bar_shown = bottom_bar_shown;
181 input.root_background_color = root_background_color; 185 input.root_background_color = root_background_color;
182 input.selection = selection; 186 input.selection = selection;
183 input.latency_info = latency_infos; 187 input.latency_info = latency_infos;
184 input.satisfies_sequences = satisfies_sequences; 188 input.satisfies_sequences = satisfies_sequences;
185 input.referenced_surfaces = referenced_surfaces; 189 input.referenced_surfaces = referenced_surfaces;
186 190
187 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy(); 191 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
188 CompositorFrameMetadata output; 192 CompositorFrameMetadata output;
189 proxy->EchoCompositorFrameMetadata(input, &output); 193 proxy->EchoCompositorFrameMetadata(input, &output);
190 EXPECT_EQ(device_scale_factor, output.device_scale_factor); 194 EXPECT_EQ(device_scale_factor, output.device_scale_factor);
191 EXPECT_EQ(root_scroll_offset, output.root_scroll_offset); 195 EXPECT_EQ(root_scroll_offset, output.root_scroll_offset);
192 EXPECT_EQ(page_scale_factor, output.page_scale_factor); 196 EXPECT_EQ(page_scale_factor, output.page_scale_factor);
193 EXPECT_EQ(scrollable_viewport_size, output.scrollable_viewport_size); 197 EXPECT_EQ(scrollable_viewport_size, output.scrollable_viewport_size);
194 EXPECT_EQ(root_layer_size, output.root_layer_size); 198 EXPECT_EQ(root_layer_size, output.root_layer_size);
195 EXPECT_EQ(min_page_scale_factor, output.min_page_scale_factor); 199 EXPECT_EQ(min_page_scale_factor, output.min_page_scale_factor);
196 EXPECT_EQ(max_page_scale_factor, output.max_page_scale_factor); 200 EXPECT_EQ(max_page_scale_factor, output.max_page_scale_factor);
197 EXPECT_EQ(root_overflow_x_hidden, output.root_overflow_x_hidden); 201 EXPECT_EQ(root_overflow_x_hidden, output.root_overflow_x_hidden);
198 EXPECT_EQ(root_overflow_y_hidden, output.root_overflow_y_hidden); 202 EXPECT_EQ(root_overflow_y_hidden, output.root_overflow_y_hidden);
199 EXPECT_EQ(location_bar_offset, output.location_bar_offset); 203 EXPECT_EQ(top_bar_translate, output.top_bar_translate);
200 EXPECT_EQ(location_bar_content_translation, 204 EXPECT_EQ(top_bar_shown, output.top_bar_shown);
201 output.location_bar_content_translation); 205 EXPECT_EQ(bottom_bar_translate, output.bottom_bar_translate);
206 EXPECT_EQ(bottom_bar_shown, output.bottom_bar_shown);
202 EXPECT_EQ(root_background_color, output.root_background_color); 207 EXPECT_EQ(root_background_color, output.root_background_color);
203 EXPECT_EQ(selection, output.selection); 208 EXPECT_EQ(selection, output.selection);
204 EXPECT_EQ(latency_infos.size(), output.latency_info.size()); 209 EXPECT_EQ(latency_infos.size(), output.latency_info.size());
205 ui::LatencyInfo::LatencyComponent component; 210 ui::LatencyInfo::LatencyComponent component;
206 EXPECT_TRUE(output.latency_info[0].FindLatency( 211 EXPECT_TRUE(output.latency_info[0].FindLatency(
207 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337, 212 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337,
208 &component)); 213 &component));
209 EXPECT_EQ(7331, component.sequence_number); 214 EXPECT_EQ(7331, component.sequence_number);
210 EXPECT_EQ(satisfies_sequences.size(), output.satisfies_sequences.size()); 215 EXPECT_EQ(satisfies_sequences.size(), output.satisfies_sequences.size());
211 for (uint32_t i = 0; i < satisfies_sequences.size(); ++i) 216 for (uint32_t i = 0; i < satisfies_sequences.size(); ++i)
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 EXPECT_EQ(y_plane_resource_id, out_quad->y_plane_resource_id()); 732 EXPECT_EQ(y_plane_resource_id, out_quad->y_plane_resource_id());
728 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id()); 733 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id());
729 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id()); 734 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id());
730 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id()); 735 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id());
731 EXPECT_EQ(color_space, out_quad->color_space); 736 EXPECT_EQ(color_space, out_quad->color_space);
732 EXPECT_EQ(resource_offset, out_quad->resource_offset); 737 EXPECT_EQ(resource_offset, out_quad->resource_offset);
733 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier); 738 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier);
734 } 739 }
735 740
736 } // namespace cc 741 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698