OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "cc/input/top_controls_manager.h" | 5 #include "cc/input/top_controls_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/time/time.h" | 12 #include "base/time/time.h" |
13 #include "cc/input/top_controls_manager_client.h" | 13 #include "cc/input/top_controls_manager_client.h" |
14 #include "cc/layers/layer_impl.h" | 14 #include "cc/layers/layer_impl.h" |
15 #include "cc/test/fake_impl_proxy.h" | 15 #include "cc/test/fake_impl_proxy.h" |
16 #include "cc/test/fake_layer_tree_host_impl.h" | 16 #include "cc/test/fake_layer_tree_host_impl.h" |
17 #include "cc/test/test_shared_bitmap_manager.h" | 17 #include "cc/test/test_shared_bitmap_manager.h" |
18 #include "cc/test/test_task_graph_runner.h" | 18 #include "cc/test/test_task_graph_runner.h" |
19 #include "cc/trees/layer_tree_impl.h" | 19 #include "cc/trees/layer_tree_impl.h" |
20 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
21 #include "ui/gfx/frame_time.h" | |
22 #include "ui/gfx/geometry/vector2d_f.h" | 21 #include "ui/gfx/geometry/vector2d_f.h" |
23 | 22 |
24 namespace cc { | 23 namespace cc { |
25 namespace { | 24 namespace { |
26 | 25 |
27 class MockTopControlsManagerClient : public TopControlsManagerClient { | 26 class MockTopControlsManagerClient : public TopControlsManagerClient { |
28 public: | 27 public: |
29 MockTopControlsManagerClient(float top_controls_height, | 28 MockTopControlsManagerClient(float top_controls_height, |
30 float top_controls_show_threshold, | 29 float top_controls_show_threshold, |
31 float top_controls_hide_threshold) | 30 float top_controls_hide_threshold) |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 manager->ScrollEnd(); | 151 manager->ScrollEnd(); |
153 | 152 |
154 manager->ScrollBegin(); | 153 manager->ScrollBegin(); |
155 manager->ScrollBy(gfx::Vector2dF(0.f, -15.f)); | 154 manager->ScrollBy(gfx::Vector2dF(0.f, -15.f)); |
156 EXPECT_FLOAT_EQ(-85.f, manager->ControlsTopOffset()); | 155 EXPECT_FLOAT_EQ(-85.f, manager->ControlsTopOffset()); |
157 EXPECT_FLOAT_EQ(15.f, manager->ContentTopOffset()); | 156 EXPECT_FLOAT_EQ(15.f, manager->ContentTopOffset()); |
158 manager->ScrollEnd(); | 157 manager->ScrollEnd(); |
159 | 158 |
160 EXPECT_TRUE(manager->animation()); | 159 EXPECT_TRUE(manager->animation()); |
161 | 160 |
162 base::TimeTicks time = gfx::FrameTime::Now(); | 161 base::TimeTicks time = base::TimeTicks::Now(); |
163 float previous; | 162 float previous; |
164 while (manager->animation()) { | 163 while (manager->animation()) { |
165 previous = manager->TopControlsShownRatio(); | 164 previous = manager->TopControlsShownRatio(); |
166 time = base::TimeDelta::FromMicroseconds(100) + time; | 165 time = base::TimeDelta::FromMicroseconds(100) + time; |
167 manager->Animate(time); | 166 manager->Animate(time); |
168 EXPECT_LT(manager->TopControlsShownRatio(), previous); | 167 EXPECT_LT(manager->TopControlsShownRatio(), previous); |
169 } | 168 } |
170 EXPECT_FALSE(manager->animation()); | 169 EXPECT_FALSE(manager->animation()); |
171 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); | 170 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); |
172 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); | 171 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
173 } | 172 } |
174 | 173 |
175 TEST(TopControlsManagerTest, PartialShownShowAnimation) { | 174 TEST(TopControlsManagerTest, PartialShownShowAnimation) { |
176 MockTopControlsManagerClient client(100.f, 0.5f, 0.5f); | 175 MockTopControlsManagerClient client(100.f, 0.5f, 0.5f); |
177 TopControlsManager* manager = client.manager(); | 176 TopControlsManager* manager = client.manager(); |
178 manager->ScrollBegin(); | 177 manager->ScrollBegin(); |
179 manager->ScrollBy(gfx::Vector2dF(0.f, 300.f)); | 178 manager->ScrollBy(gfx::Vector2dF(0.f, 300.f)); |
180 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); | 179 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); |
181 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); | 180 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
182 manager->ScrollEnd(); | 181 manager->ScrollEnd(); |
183 | 182 |
184 manager->ScrollBegin(); | 183 manager->ScrollBegin(); |
185 manager->ScrollBy(gfx::Vector2dF(0.f, -70.f)); | 184 manager->ScrollBy(gfx::Vector2dF(0.f, -70.f)); |
186 EXPECT_FLOAT_EQ(-30.f, manager->ControlsTopOffset()); | 185 EXPECT_FLOAT_EQ(-30.f, manager->ControlsTopOffset()); |
187 EXPECT_FLOAT_EQ(70.f, manager->ContentTopOffset()); | 186 EXPECT_FLOAT_EQ(70.f, manager->ContentTopOffset()); |
188 manager->ScrollEnd(); | 187 manager->ScrollEnd(); |
189 | 188 |
190 EXPECT_TRUE(manager->animation()); | 189 EXPECT_TRUE(manager->animation()); |
191 | 190 |
192 base::TimeTicks time = gfx::FrameTime::Now(); | 191 base::TimeTicks time = base::TimeTicks::Now(); |
193 float previous; | 192 float previous; |
194 while (manager->animation()) { | 193 while (manager->animation()) { |
195 previous = manager->TopControlsShownRatio(); | 194 previous = manager->TopControlsShownRatio(); |
196 time = base::TimeDelta::FromMicroseconds(100) + time; | 195 time = base::TimeDelta::FromMicroseconds(100) + time; |
197 manager->Animate(time); | 196 manager->Animate(time); |
198 EXPECT_GT(manager->TopControlsShownRatio(), previous); | 197 EXPECT_GT(manager->TopControlsShownRatio(), previous); |
199 } | 198 } |
200 EXPECT_FALSE(manager->animation()); | 199 EXPECT_FALSE(manager->animation()); |
201 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); | 200 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); |
202 EXPECT_FLOAT_EQ(100.f, manager->ContentTopOffset()); | 201 EXPECT_FLOAT_EQ(100.f, manager->ContentTopOffset()); |
203 } | 202 } |
204 | 203 |
205 TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdShows) { | 204 TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdShows) { |
206 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f); | 205 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f); |
207 TopControlsManager* manager = client.manager(); | 206 TopControlsManager* manager = client.manager(); |
208 | 207 |
209 manager->ScrollBegin(); | 208 manager->ScrollBegin(); |
210 | 209 |
211 manager->ScrollBy(gfx::Vector2dF(0.f, 20.f)); | 210 manager->ScrollBy(gfx::Vector2dF(0.f, 20.f)); |
212 EXPECT_FLOAT_EQ(-20.f, manager->ControlsTopOffset()); | 211 EXPECT_FLOAT_EQ(-20.f, manager->ControlsTopOffset()); |
213 EXPECT_FLOAT_EQ(80.f, manager->ContentTopOffset()); | 212 EXPECT_FLOAT_EQ(80.f, manager->ContentTopOffset()); |
214 | 213 |
215 manager->ScrollEnd(); | 214 manager->ScrollEnd(); |
216 EXPECT_TRUE(manager->animation()); | 215 EXPECT_TRUE(manager->animation()); |
217 | 216 |
218 base::TimeTicks time = gfx::FrameTime::Now(); | 217 base::TimeTicks time = base::TimeTicks::Now(); |
219 float previous; | 218 float previous; |
220 while (manager->animation()) { | 219 while (manager->animation()) { |
221 previous = manager->TopControlsShownRatio(); | 220 previous = manager->TopControlsShownRatio(); |
222 time = base::TimeDelta::FromMicroseconds(100) + time; | 221 time = base::TimeDelta::FromMicroseconds(100) + time; |
223 manager->Animate(time); | 222 manager->Animate(time); |
224 EXPECT_GT(manager->TopControlsShownRatio(), previous); | 223 EXPECT_GT(manager->TopControlsShownRatio(), previous); |
225 } | 224 } |
226 EXPECT_FALSE(manager->animation()); | 225 EXPECT_FALSE(manager->animation()); |
227 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); | 226 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); |
228 EXPECT_FLOAT_EQ(100.f, manager->ContentTopOffset()); | 227 EXPECT_FLOAT_EQ(100.f, manager->ContentTopOffset()); |
229 } | 228 } |
230 | 229 |
231 TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdHides) { | 230 TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdHides) { |
232 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f); | 231 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f); |
233 TopControlsManager* manager = client.manager(); | 232 TopControlsManager* manager = client.manager(); |
234 | 233 |
235 manager->ScrollBegin(); | 234 manager->ScrollBegin(); |
236 | 235 |
237 manager->ScrollBy(gfx::Vector2dF(0.f, 30.f)); | 236 manager->ScrollBy(gfx::Vector2dF(0.f, 30.f)); |
238 EXPECT_FLOAT_EQ(-30.f, manager->ControlsTopOffset()); | 237 EXPECT_FLOAT_EQ(-30.f, manager->ControlsTopOffset()); |
239 EXPECT_FLOAT_EQ(70.f, manager->ContentTopOffset()); | 238 EXPECT_FLOAT_EQ(70.f, manager->ContentTopOffset()); |
240 | 239 |
241 manager->ScrollEnd(); | 240 manager->ScrollEnd(); |
242 EXPECT_TRUE(manager->animation()); | 241 EXPECT_TRUE(manager->animation()); |
243 | 242 |
244 base::TimeTicks time = gfx::FrameTime::Now(); | 243 base::TimeTicks time = base::TimeTicks::Now(); |
245 float previous; | 244 float previous; |
246 while (manager->animation()) { | 245 while (manager->animation()) { |
247 previous = manager->TopControlsShownRatio(); | 246 previous = manager->TopControlsShownRatio(); |
248 time = base::TimeDelta::FromMicroseconds(100) + time; | 247 time = base::TimeDelta::FromMicroseconds(100) + time; |
249 manager->Animate(time); | 248 manager->Animate(time); |
250 EXPECT_LT(manager->TopControlsShownRatio(), previous); | 249 EXPECT_LT(manager->TopControlsShownRatio(), previous); |
251 } | 250 } |
252 EXPECT_FALSE(manager->animation()); | 251 EXPECT_FALSE(manager->animation()); |
253 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); | 252 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); |
254 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); | 253 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
255 } | 254 } |
256 | 255 |
257 TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdHides) { | 256 TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdHides) { |
258 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f); | 257 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f); |
259 TopControlsManager* manager = client.manager(); | 258 TopControlsManager* manager = client.manager(); |
260 | 259 |
261 manager->ScrollBy(gfx::Vector2dF(0.f, 200.f)); | 260 manager->ScrollBy(gfx::Vector2dF(0.f, 200.f)); |
262 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); | 261 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); |
263 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); | 262 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
264 | 263 |
265 manager->ScrollBegin(); | 264 manager->ScrollBegin(); |
266 | 265 |
267 manager->ScrollBy(gfx::Vector2dF(0.f, -20.f)); | 266 manager->ScrollBy(gfx::Vector2dF(0.f, -20.f)); |
268 EXPECT_FLOAT_EQ(-80.f, manager->ControlsTopOffset()); | 267 EXPECT_FLOAT_EQ(-80.f, manager->ControlsTopOffset()); |
269 EXPECT_FLOAT_EQ(20.f, manager->ContentTopOffset()); | 268 EXPECT_FLOAT_EQ(20.f, manager->ContentTopOffset()); |
270 | 269 |
271 manager->ScrollEnd(); | 270 manager->ScrollEnd(); |
272 EXPECT_TRUE(manager->animation()); | 271 EXPECT_TRUE(manager->animation()); |
273 | 272 |
274 base::TimeTicks time = gfx::FrameTime::Now(); | 273 base::TimeTicks time = base::TimeTicks::Now(); |
275 float previous; | 274 float previous; |
276 while (manager->animation()) { | 275 while (manager->animation()) { |
277 previous = manager->TopControlsShownRatio(); | 276 previous = manager->TopControlsShownRatio(); |
278 time = base::TimeDelta::FromMicroseconds(100) + time; | 277 time = base::TimeDelta::FromMicroseconds(100) + time; |
279 manager->Animate(time); | 278 manager->Animate(time); |
280 EXPECT_LT(manager->TopControlsShownRatio(), previous); | 279 EXPECT_LT(manager->TopControlsShownRatio(), previous); |
281 } | 280 } |
282 EXPECT_FALSE(manager->animation()); | 281 EXPECT_FALSE(manager->animation()); |
283 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); | 282 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); |
284 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); | 283 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
285 } | 284 } |
286 | 285 |
287 TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdShows) { | 286 TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdShows) { |
288 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f); | 287 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f); |
289 TopControlsManager* manager = client.manager(); | 288 TopControlsManager* manager = client.manager(); |
290 | 289 |
291 manager->ScrollBy(gfx::Vector2dF(0.f, 200.f)); | 290 manager->ScrollBy(gfx::Vector2dF(0.f, 200.f)); |
292 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); | 291 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); |
293 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); | 292 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
294 | 293 |
295 manager->ScrollBegin(); | 294 manager->ScrollBegin(); |
296 | 295 |
297 manager->ScrollBy(gfx::Vector2dF(0.f, -30.f)); | 296 manager->ScrollBy(gfx::Vector2dF(0.f, -30.f)); |
298 EXPECT_FLOAT_EQ(-70.f, manager->ControlsTopOffset()); | 297 EXPECT_FLOAT_EQ(-70.f, manager->ControlsTopOffset()); |
299 EXPECT_FLOAT_EQ(30.f, manager->ContentTopOffset()); | 298 EXPECT_FLOAT_EQ(30.f, manager->ContentTopOffset()); |
300 | 299 |
301 manager->ScrollEnd(); | 300 manager->ScrollEnd(); |
302 EXPECT_TRUE(manager->animation()); | 301 EXPECT_TRUE(manager->animation()); |
303 | 302 |
304 base::TimeTicks time = gfx::FrameTime::Now(); | 303 base::TimeTicks time = base::TimeTicks::Now(); |
305 float previous; | 304 float previous; |
306 while (manager->animation()) { | 305 while (manager->animation()) { |
307 previous = manager->TopControlsShownRatio(); | 306 previous = manager->TopControlsShownRatio(); |
308 time = base::TimeDelta::FromMicroseconds(100) + time; | 307 time = base::TimeDelta::FromMicroseconds(100) + time; |
309 manager->Animate(time); | 308 manager->Animate(time); |
310 EXPECT_GT(manager->TopControlsShownRatio(), previous); | 309 EXPECT_GT(manager->TopControlsShownRatio(), previous); |
311 } | 310 } |
312 EXPECT_FALSE(manager->animation()); | 311 EXPECT_FALSE(manager->animation()); |
313 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); | 312 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); |
314 EXPECT_FLOAT_EQ(100.f, manager->ContentTopOffset()); | 313 EXPECT_FLOAT_EQ(100.f, manager->ContentTopOffset()); |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 EXPECT_FLOAT_EQ(20.f, pending.y()); | 462 EXPECT_FLOAT_EQ(20.f, pending.y()); |
464 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); | 463 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); |
465 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); | 464 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
466 EXPECT_FLOAT_EQ(1.f, client.CurrentTopControlsShownRatio()); | 465 EXPECT_FLOAT_EQ(1.f, client.CurrentTopControlsShownRatio()); |
467 manager->ScrollEnd(); | 466 manager->ScrollEnd(); |
468 } | 467 } |
469 | 468 |
470 | 469 |
471 } // namespace | 470 } // namespace |
472 } // namespace cc | 471 } // namespace cc |
OLD | NEW |