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

Side by Side Diff: ui/events/blink/input_handler_proxy.cc

Issue 2793403002: Adds missing kBlockingAndPassive case to TouchpadFlingScroll (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | ui/events/blink/input_handler_proxy_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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 1477 matching lines...) Expand 10 before | Expand all | Expand 10 after
1488 input_handler_->SetNeedsAnimateInput(); 1488 input_handler_->SetNeedsAnimateInput();
1489 } 1489 }
1490 1490
1491 bool InputHandlerProxy::TouchpadFlingScroll( 1491 bool InputHandlerProxy::TouchpadFlingScroll(
1492 const WebFloatSize& increment) { 1492 const WebFloatSize& increment) {
1493 InputHandlerProxy::EventDisposition disposition; 1493 InputHandlerProxy::EventDisposition disposition;
1494 cc::EventListenerProperties properties = 1494 cc::EventListenerProperties properties =
1495 input_handler_->GetEventListenerProperties( 1495 input_handler_->GetEventListenerProperties(
1496 cc::EventListenerClass::kMouseWheel); 1496 cc::EventListenerClass::kMouseWheel);
1497 switch (properties) { 1497 switch (properties) {
1498 case cc::EventListenerProperties::kBlockingAndPassive:
1498 case cc::EventListenerProperties::kBlocking: 1499 case cc::EventListenerProperties::kBlocking:
1499 disposition = DID_NOT_HANDLE; 1500 disposition = DID_NOT_HANDLE;
1500 break; 1501 break;
1501 case cc::EventListenerProperties::kPassive: 1502 case cc::EventListenerProperties::kPassive:
1502 case cc::EventListenerProperties::kNone: { 1503 case cc::EventListenerProperties::kNone: {
1503 WebMouseWheelEvent synthetic_wheel(WebInputEvent::MouseWheel, 1504 WebMouseWheelEvent synthetic_wheel(WebInputEvent::MouseWheel,
1504 fling_parameters_.modifiers, 1505 fling_parameters_.modifiers,
1505 InSecondsF(base::TimeTicks::Now())); 1506 InSecondsF(base::TimeTicks::Now()));
1506 synthetic_wheel.deltaX = increment.width; 1507 synthetic_wheel.deltaX = increment.width;
1507 synthetic_wheel.deltaY = increment.height; 1508 synthetic_wheel.deltaY = increment.height;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1634 scroll_elasticity_controller_->GetWeakPtr(), gesture_event, 1635 scroll_elasticity_controller_->GetWeakPtr(), gesture_event,
1635 scroll_result)); 1636 scroll_result));
1636 } 1637 }
1637 1638
1638 void InputHandlerProxy::SetTickClockForTesting( 1639 void InputHandlerProxy::SetTickClockForTesting(
1639 std::unique_ptr<base::TickClock> tick_clock) { 1640 std::unique_ptr<base::TickClock> tick_clock) {
1640 tick_clock_ = std::move(tick_clock); 1641 tick_clock_ = std::move(tick_clock);
1641 } 1642 }
1642 1643
1643 } // namespace ui 1644 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | ui/events/blink/input_handler_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698