| 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 "content/renderer/input/input_handler_proxy.h" | 5 #include "content/renderer/input/input_handler_proxy.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "content/renderer/input/input_handler_proxy_client.h" | 10 #include "content/renderer/input/input_handler_proxy_client.h" |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 std::abs(params.accumulated_overscroll.x()) >= | 362 std::abs(params.accumulated_overscroll.x()) >= |
| 363 kFlingOverscrollThreshold; | 363 kFlingOverscrollThreshold; |
| 364 disallow_vertical_fling_scroll_ |= | 364 disallow_vertical_fling_scroll_ |= |
| 365 std::abs(params.accumulated_overscroll.y()) >= | 365 std::abs(params.accumulated_overscroll.y()) >= |
| 366 kFlingOverscrollThreshold; | 366 kFlingOverscrollThreshold; |
| 367 } | 367 } |
| 368 | 368 |
| 369 client_->DidOverscroll(params); | 369 client_->DidOverscroll(params); |
| 370 } | 370 } |
| 371 | 371 |
| 372 void InputHandlerProxy::DidFinishTopControlsGesture() { |
| 373 client_->DidFinishTopControlsGesture(); |
| 374 } |
| 375 |
| 372 bool InputHandlerProxy::CancelCurrentFling() { | 376 bool InputHandlerProxy::CancelCurrentFling() { |
| 373 bool had_fling_animation = fling_curve_; | 377 bool had_fling_animation = fling_curve_; |
| 374 if (had_fling_animation && | 378 if (had_fling_animation && |
| 375 fling_parameters_.sourceDevice == WebGestureEvent::Touchscreen) { | 379 fling_parameters_.sourceDevice == WebGestureEvent::Touchscreen) { |
| 376 input_handler_->ScrollEnd(); | 380 input_handler_->ScrollEnd(); |
| 377 TRACE_EVENT_ASYNC_END0( | 381 TRACE_EVENT_ASYNC_END0( |
| 378 "renderer", | 382 "renderer", |
| 379 "InputHandlerProxy::HandleGestureFling::started", | 383 "InputHandlerProxy::HandleGestureFling::started", |
| 380 this); | 384 this); |
| 381 } | 385 } |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 475 TRACE_EVENT2("renderer", | 479 TRACE_EVENT2("renderer", |
| 476 "InputHandlerProxy::notifyCurrentFlingVelocity", | 480 "InputHandlerProxy::notifyCurrentFlingVelocity", |
| 477 "vx", | 481 "vx", |
| 478 velocity.width, | 482 velocity.width, |
| 479 "vy", | 483 "vy", |
| 480 velocity.height); | 484 velocity.height); |
| 481 input_handler_->NotifyCurrentFlingVelocity(ToClientScrollIncrement(velocity)); | 485 input_handler_->NotifyCurrentFlingVelocity(ToClientScrollIncrement(velocity)); |
| 482 } | 486 } |
| 483 | 487 |
| 484 } // namespace content | 488 } // namespace content |
| OLD | NEW |