| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ui/events/blink/input_scroll_elasticity_controller.h" |
| 6 |
| 5 #include "cc/input/input_handler.h" | 7 #include "cc/input/input_handler.h" |
| 6 #include "content/renderer/input/input_scroll_elasticity_controller.h" | |
| 7 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 8 #include "third_party/WebKit/public/web/WebInputEvent.h" | 9 #include "third_party/WebKit/public/web/WebInputEvent.h" |
| 9 | 10 |
| 10 namespace content { | 11 namespace ui { |
| 11 namespace { | 12 namespace { |
| 12 | 13 |
| 13 enum Phase { | 14 enum Phase { |
| 14 PhaseNone = blink::WebMouseWheelEvent::PhaseNone, | 15 PhaseNone = blink::WebMouseWheelEvent::PhaseNone, |
| 15 PhaseBegan = blink::WebMouseWheelEvent::PhaseBegan, | 16 PhaseBegan = blink::WebMouseWheelEvent::PhaseBegan, |
| 16 PhaseStationary = blink::WebMouseWheelEvent::PhaseStationary, | 17 PhaseStationary = blink::WebMouseWheelEvent::PhaseStationary, |
| 17 PhaseChanged = blink::WebMouseWheelEvent::PhaseChanged, | 18 PhaseChanged = blink::WebMouseWheelEvent::PhaseChanged, |
| 18 PhaseEnded = blink::WebMouseWheelEvent::PhaseEnded, | 19 PhaseEnded = blink::WebMouseWheelEvent::PhaseEnded, |
| 19 PhaseCancelled = blink::WebMouseWheelEvent::PhaseCancelled, | 20 PhaseCancelled = blink::WebMouseWheelEvent::PhaseCancelled, |
| 20 PhaseMayBegin = blink::WebMouseWheelEvent::PhaseMayBegin, | 21 PhaseMayBegin = blink::WebMouseWheelEvent::PhaseMayBegin, |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 while (1) { | 378 while (1) { |
| 378 TickCurrentTimeAndAnimate(); | 379 TickCurrentTimeAndAnimate(); |
| 379 if (helper_.StretchAmount().IsZero()) | 380 if (helper_.StretchAmount().IsZero()) |
| 380 break; | 381 break; |
| 381 ticks_to_zero += 1; | 382 ticks_to_zero += 1; |
| 382 } | 383 } |
| 383 EXPECT_GT(ticks_to_zero, 3); | 384 EXPECT_GT(ticks_to_zero, 3); |
| 384 } | 385 } |
| 385 | 386 |
| 386 } // namespace | 387 } // namespace |
| 387 } // namespace content | 388 } // namespace ui |
| OLD | NEW |