| 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 | 8 |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 time = base::TimeDelta::FromMicroseconds(100) + time; | 243 time = base::TimeDelta::FromMicroseconds(100) + time; |
| 244 manager->Animate(time); | 244 manager->Animate(time); |
| 245 EXPECT_LT(manager->ControlsTopOffset(), previous_offset); | 245 EXPECT_LT(manager->ControlsTopOffset(), previous_offset); |
| 246 previous_offset = manager->ControlsTopOffset(); | 246 previous_offset = manager->ControlsTopOffset(); |
| 247 } | 247 } |
| 248 EXPECT_FALSE(manager->animation()); | 248 EXPECT_FALSE(manager->animation()); |
| 249 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); | 249 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); |
| 250 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); | 250 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
| 251 } | 251 } |
| 252 | 252 |
| 253 TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdHides) { | 253 TEST(TopControlsManagerTest, DISABLED_PartialShownWithAmbiguousThresholdHides) { |
| 254 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f); | 254 MockTopControlsManagerClient client(100.f, 0.25f, 0.25f); |
| 255 TopControlsManager* manager = client.manager(); | 255 TopControlsManager* manager = client.manager(); |
| 256 | 256 |
| 257 manager->ScrollBy(gfx::Vector2dF(0.f, 200.f)); | 257 manager->ScrollBy(gfx::Vector2dF(0.f, 200.f)); |
| 258 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); | 258 EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset()); |
| 259 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); | 259 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
| 260 | 260 |
| 261 manager->ScrollBegin(); | 261 manager->ScrollBegin(); |
| 262 | 262 |
| 263 manager->ScrollBy(gfx::Vector2dF(0.f, -20.f)); | 263 manager->ScrollBy(gfx::Vector2dF(0.f, -20.f)); |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); | 445 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
| 446 | 446 |
| 447 client.SetTopControlsHeight(0.f); | 447 client.SetTopControlsHeight(0.f); |
| 448 EXPECT_FALSE(manager->animation()); | 448 EXPECT_FALSE(manager->animation()); |
| 449 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); | 449 EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset()); |
| 450 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); | 450 EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
| 451 } | 451 } |
| 452 | 452 |
| 453 } // namespace | 453 } // namespace |
| 454 } // namespace cc | 454 } // namespace cc |
| OLD | NEW |