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

Side by Side Diff: content/browser/renderer_host/input/input_router_impl.cc

Issue 2785533003: Animated scroll shouldn't consume unhandled scrolls for OOPIFs. (Closed)
Patch Set: Fix Android compile. Created 3 years, 8 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 unified diff | Download patch
OLDNEW
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/browser/renderer_host/input/input_router_impl.h" 5 #include "content/browser/renderer_host/input/input_router_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 touch_event_queue_->OnGestureEventAck(event, ack_result); 304 touch_event_queue_->OnGestureEventAck(event, ack_result);
305 ack_handler_->OnGestureEventAck(event, ack_result); 305 ack_handler_->OnGestureEventAck(event, ack_result);
306 } 306 }
307 307
308 void InputRouterImpl::ForwardGestureEventWithLatencyInfo( 308 void InputRouterImpl::ForwardGestureEventWithLatencyInfo(
309 const blink::WebGestureEvent& event, 309 const blink::WebGestureEvent& event,
310 const ui::LatencyInfo& latency_info) { 310 const ui::LatencyInfo& latency_info) {
311 client_->ForwardGestureEventWithLatencyInfo(event, latency_info); 311 client_->ForwardGestureEventWithLatencyInfo(event, latency_info);
312 } 312 }
313 313
314 bool InputRouterImpl::is_in_gesture_scroll() {
315 return client_->is_in_gesture_scroll(
316 blink::WebGestureDevice::kWebGestureDeviceTouchpad);
317 }
318
314 void InputRouterImpl::SendMouseWheelEventImmediately( 319 void InputRouterImpl::SendMouseWheelEventImmediately(
315 const MouseWheelEventWithLatencyInfo& wheel_event) { 320 const MouseWheelEventWithLatencyInfo& wheel_event) {
316 FilterAndSendWebInputEvent(wheel_event.event, wheel_event.latency); 321 FilterAndSendWebInputEvent(wheel_event.event, wheel_event.latency);
317 } 322 }
318 323
319 void InputRouterImpl::OnMouseWheelEventAck( 324 void InputRouterImpl::OnMouseWheelEventAck(
320 const MouseWheelEventWithLatencyInfo& event, 325 const MouseWheelEventWithLatencyInfo& event,
321 InputEventAckState ack_result) { 326 InputEventAckState ack_result) {
322 ack_handler_->OnWheelEventAck(event, ack_result); 327 ack_handler_->OnWheelEventAck(event, ack_result);
323 } 328 }
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 DCHECK(global_touch_position_.find(touch_point->id) == 674 DCHECK(global_touch_position_.find(touch_point->id) ==
670 global_touch_position_.end()); 675 global_touch_position_.end());
671 global_touch_position_[touch_point->id] = gfx::Point( 676 global_touch_position_[touch_point->id] = gfx::Point(
672 touch_point->screen_position.x, touch_point->screen_position.y); 677 touch_point->screen_position.x, touch_point->screen_position.y);
673 } 678 }
674 } 679 }
675 } 680 }
676 } 681 }
677 682
678 } // namespace content 683 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698