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 "ui/events/blink/input_handler_proxy.h" | 5 #include "ui/events/blink/input_handler_proxy.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 | 10 |
(...skipping 1409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1420 // Bundle overscroll message with triggering event response, saving an IPC. | 1420 // Bundle overscroll message with triggering event response, saving an IPC. |
1421 current_overscroll_params_.reset(new DidOverscrollParams()); | 1421 current_overscroll_params_.reset(new DidOverscrollParams()); |
1422 current_overscroll_params_->accumulated_overscroll = | 1422 current_overscroll_params_->accumulated_overscroll = |
1423 scroll_result.accumulated_root_overscroll; | 1423 scroll_result.accumulated_root_overscroll; |
1424 current_overscroll_params_->latest_overscroll_delta = | 1424 current_overscroll_params_->latest_overscroll_delta = |
1425 scroll_result.unused_scroll_delta; | 1425 scroll_result.unused_scroll_delta; |
1426 current_overscroll_params_->current_fling_velocity = | 1426 current_overscroll_params_->current_fling_velocity = |
1427 ToClientScrollIncrement(current_fling_velocity_); | 1427 ToClientScrollIncrement(current_fling_velocity_); |
1428 current_overscroll_params_->causal_event_viewport_point = | 1428 current_overscroll_params_->causal_event_viewport_point = |
1429 gfx::PointF(causal_event_viewport_point); | 1429 gfx::PointF(causal_event_viewport_point); |
| 1430 current_overscroll_params_->scroll_boundary_behavior = |
| 1431 scroll_result.scroll_boundary_behavior; |
1430 return; | 1432 return; |
1431 } | 1433 } |
1432 | 1434 |
1433 client_->DidOverscroll(scroll_result.accumulated_root_overscroll, | 1435 client_->DidOverscroll(scroll_result.accumulated_root_overscroll, |
1434 scroll_result.unused_scroll_delta, | 1436 scroll_result.unused_scroll_delta, |
1435 ToClientScrollIncrement(current_fling_velocity_), | 1437 ToClientScrollIncrement(current_fling_velocity_), |
1436 gfx::PointF(causal_event_viewport_point)); | 1438 gfx::PointF(causal_event_viewport_point), |
| 1439 scroll_result.scroll_boundary_behavior); |
1437 } | 1440 } |
1438 | 1441 |
1439 bool InputHandlerProxy::CancelCurrentFling() { | 1442 bool InputHandlerProxy::CancelCurrentFling() { |
1440 if (CancelCurrentFlingWithoutNotifyingClient()) { | 1443 if (CancelCurrentFlingWithoutNotifyingClient()) { |
1441 client_->DidStopFlinging(); | 1444 client_->DidStopFlinging(); |
1442 return true; | 1445 return true; |
1443 } | 1446 } |
1444 return false; | 1447 return false; |
1445 } | 1448 } |
1446 | 1449 |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1646 scroll_elasticity_controller_->GetWeakPtr(), gesture_event, | 1649 scroll_elasticity_controller_->GetWeakPtr(), gesture_event, |
1647 scroll_result)); | 1650 scroll_result)); |
1648 } | 1651 } |
1649 | 1652 |
1650 void InputHandlerProxy::SetTickClockForTesting( | 1653 void InputHandlerProxy::SetTickClockForTesting( |
1651 std::unique_ptr<base::TickClock> tick_clock) { | 1654 std::unique_ptr<base::TickClock> tick_clock) { |
1652 tick_clock_ = std::move(tick_clock); | 1655 tick_clock_ = std::move(tick_clock); |
1653 } | 1656 } |
1654 | 1657 |
1655 } // namespace ui | 1658 } // namespace ui |
OLD | NEW |