| 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 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1454 // Bundle overscroll message with triggering event response, saving an IPC. | 1454 // Bundle overscroll message with triggering event response, saving an IPC. |
| 1455 current_overscroll_params_.reset(new DidOverscrollParams()); | 1455 current_overscroll_params_.reset(new DidOverscrollParams()); |
| 1456 current_overscroll_params_->accumulated_overscroll = | 1456 current_overscroll_params_->accumulated_overscroll = |
| 1457 scroll_result.accumulated_root_overscroll; | 1457 scroll_result.accumulated_root_overscroll; |
| 1458 current_overscroll_params_->latest_overscroll_delta = | 1458 current_overscroll_params_->latest_overscroll_delta = |
| 1459 scroll_result.unused_scroll_delta; | 1459 scroll_result.unused_scroll_delta; |
| 1460 current_overscroll_params_->current_fling_velocity = | 1460 current_overscroll_params_->current_fling_velocity = |
| 1461 ToClientScrollIncrement(current_fling_velocity_); | 1461 ToClientScrollIncrement(current_fling_velocity_); |
| 1462 current_overscroll_params_->causal_event_viewport_point = | 1462 current_overscroll_params_->causal_event_viewport_point = |
| 1463 gfx::PointF(causal_event_viewport_point); | 1463 gfx::PointF(causal_event_viewport_point); |
| 1464 current_overscroll_params_->scroll_boundary_behavior = |
| 1465 scroll_result.scroll_boundary_behavior; |
| 1464 return; | 1466 return; |
| 1465 } | 1467 } |
| 1466 | 1468 |
| 1467 client_->DidOverscroll(scroll_result.accumulated_root_overscroll, | 1469 client_->DidOverscroll(scroll_result.accumulated_root_overscroll, |
| 1468 scroll_result.unused_scroll_delta, | 1470 scroll_result.unused_scroll_delta, |
| 1469 ToClientScrollIncrement(current_fling_velocity_), | 1471 ToClientScrollIncrement(current_fling_velocity_), |
| 1470 gfx::PointF(causal_event_viewport_point)); | 1472 gfx::PointF(causal_event_viewport_point), |
| 1473 scroll_result.scroll_boundary_behavior); |
| 1471 } | 1474 } |
| 1472 | 1475 |
| 1473 bool InputHandlerProxy::CancelCurrentFling() { | 1476 bool InputHandlerProxy::CancelCurrentFling() { |
| 1474 if (CancelCurrentFlingWithoutNotifyingClient()) { | 1477 if (CancelCurrentFlingWithoutNotifyingClient()) { |
| 1475 client_->DidStopFlinging(); | 1478 client_->DidStopFlinging(); |
| 1476 return true; | 1479 return true; |
| 1477 } | 1480 } |
| 1478 return false; | 1481 return false; |
| 1479 } | 1482 } |
| 1480 | 1483 |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1684 scroll_elasticity_controller_->GetWeakPtr(), gesture_event, | 1687 scroll_elasticity_controller_->GetWeakPtr(), gesture_event, |
| 1685 scroll_result)); | 1688 scroll_result)); |
| 1686 } | 1689 } |
| 1687 | 1690 |
| 1688 void InputHandlerProxy::SetTickClockForTesting( | 1691 void InputHandlerProxy::SetTickClockForTesting( |
| 1689 std::unique_ptr<base::TickClock> tick_clock) { | 1692 std::unique_ptr<base::TickClock> tick_clock) { |
| 1690 tick_clock_ = std::move(tick_clock); | 1693 tick_clock_ = std::move(tick_clock); |
| 1691 } | 1694 } |
| 1692 | 1695 |
| 1693 } // namespace ui | 1696 } // namespace ui |
| OLD | NEW |