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

Side by Side Diff: ui/events/blink/input_scroll_elasticity_controller.h

Issue 2048023005: Remove ObserveWheelEventAndResult callbacks since they are now gesture based. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_2
Patch Set: Rebase Created 4 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef UI_EVENTS_BLINK_INPUT_SCROLL_ELASTICITY_CONTROLLER_H_ 5 #ifndef UI_EVENTS_BLINK_INPUT_SCROLL_ELASTICITY_CONTROLLER_H_
6 #define UI_EVENTS_BLINK_INPUT_SCROLL_ELASTICITY_CONTROLLER_H_ 6 #define UI_EVENTS_BLINK_INPUT_SCROLL_ELASTICITY_CONTROLLER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "cc/input/scroll_elasticity_helper.h" 10 #include "cc/input/scroll_elasticity_helper.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 namespace ui { 44 namespace ui {
45 45
46 class InputScrollElasticityController { 46 class InputScrollElasticityController {
47 public: 47 public:
48 explicit InputScrollElasticityController(cc::ScrollElasticityHelper* helper); 48 explicit InputScrollElasticityController(cc::ScrollElasticityHelper* helper);
49 virtual ~InputScrollElasticityController(); 49 virtual ~InputScrollElasticityController();
50 50
51 base::WeakPtr<InputScrollElasticityController> GetWeakPtr(); 51 base::WeakPtr<InputScrollElasticityController> GetWeakPtr();
52 52
53 // Update the overscroll state based a wheel event that has been processed.
54 // Note that this assumes that all events are coming from a single input
55 // device. If the user simultaneously uses multiple input devices, Cocoa may
56 // not correctly pass all the gesture begin and end events. In this case,
57 // this class may disregard some scrolls that come in at unexpected times.
58 void ObserveWheelEventAndResult(
59 const blink::WebMouseWheelEvent& wheel_event,
60 const cc::InputHandlerScrollResult& scroll_result);
61 // Update the overscroll state based a gesture event that has been processed. 53 // Update the overscroll state based a gesture event that has been processed.
62 // Note that this assumes that all events are coming from a single input 54 // Note that this assumes that all events are coming from a single input
63 // device. If the user simultaneously uses multiple input devices, Cocoa may 55 // device. If the user simultaneously uses multiple input devices, Cocoa may
64 // not correctly pass all the gesture begin and end events. In this case, 56 // not correctly pass all the gesture begin and end events. In this case,
65 // this class may disregard some scrolls that come in at unexpected times. 57 // this class may disregard some scrolls that come in at unexpected times.
66 void ObserveGestureEventAndResult( 58 void ObserveGestureEventAndResult(
67 const blink::WebGestureEvent& gesture_event, 59 const blink::WebGestureEvent& gesture_event,
68 const cc::InputHandlerScrollResult& scroll_result); 60 const cc::InputHandlerScrollResult& scroll_result);
69 61
70 void Animate(base::TimeTicks time); 62 void Animate(base::TimeTicks time);
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 // behavior as would happen if the scroll were caused by an active scroll). 139 // behavior as would happen if the scroll were caused by an active scroll).
148 bool momentum_animation_reset_at_next_frame_; 140 bool momentum_animation_reset_at_next_frame_;
149 141
150 base::WeakPtrFactory<InputScrollElasticityController> weak_factory_; 142 base::WeakPtrFactory<InputScrollElasticityController> weak_factory_;
151 DISALLOW_COPY_AND_ASSIGN(InputScrollElasticityController); 143 DISALLOW_COPY_AND_ASSIGN(InputScrollElasticityController);
152 }; 144 };
153 145
154 } // namespace ui 146 } // namespace ui
155 147
156 #endif // UI_EVENTS_BLINK_INPUT_SCROLL_ELASTICITY_CONTROLLER_H_ 148 #endif // UI_EVENTS_BLINK_INPUT_SCROLL_ELASTICITY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/events/blink/input_handler_proxy.cc ('k') | ui/events/blink/input_scroll_elasticity_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698