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

Unified Diff: ui/events/blink/input_handler_proxy_unittest.cc

Issue 1749343004: Implement Wheel Gesture Scrolling on OSX. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ensure only high precision scroll begins are used Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/blink/input_handler_proxy.cc ('k') | ui/events/blink/input_scroll_elasticity_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/blink/input_handler_proxy_unittest.cc
diff --git a/ui/events/blink/input_handler_proxy_unittest.cc b/ui/events/blink/input_handler_proxy_unittest.cc
index 6723a319952fa596f730a66cd20f0323523f6253..b798dc9858c471931b3dc5b5e836a6c333c3ef7e 100644
--- a/ui/events/blink/input_handler_proxy_unittest.cc
+++ b/ui/events/blink/input_handler_proxy_unittest.cc
@@ -104,6 +104,8 @@ class MockInputHandler : public cc::InputHandler {
MOCK_METHOD2(RootScrollBegin,
ScrollStatus(cc::ScrollState*,
cc::InputHandler::ScrollInputType type));
+ MOCK_METHOD1(ScrollAnimatedBegin,
+ ScrollStatus(const gfx::Point& viewport_point));
MOCK_METHOD2(ScrollAnimated,
ScrollStatus(const gfx::Point& viewport_point,
const gfx::Vector2dF& scroll_delta));
@@ -639,9 +641,8 @@ TEST_P(InputHandlerProxyTest, DISABLED_GestureScrollByCoarsePixels) {
gesture_.type = WebInputEvent::GestureScrollBegin;
gesture_.data.scrollBegin.deltaHintUnits =
WebGestureEvent::ScrollUnits::Pixels;
- EXPECT_CALL(mock_input_handler_, ScrollBegin(::testing::_, ::testing::_))
+ EXPECT_CALL(mock_input_handler_, ScrollAnimatedBegin(::testing::_))
.WillOnce(testing::Return(kImplThreadScrollState));
- EXPECT_CALL(mock_input_handler_, ScrollEnd(testing::_));
EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(gesture_));
gesture_.type = WebInputEvent::GestureScrollUpdate;
« no previous file with comments | « ui/events/blink/input_handler_proxy.cc ('k') | ui/events/blink/input_scroll_elasticity_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698