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

Side by Side Diff: content/browser/renderer_host/input/mock_input_ack_handler.h

Issue 250923004: Synthesize ctrl-wheel events on touchpad pinch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows build and tweaks Created 6 years, 7 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 | Annotate | Revision Log
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 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_MOCK_INPUT_ACK_HANDLER_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_MOCK_INPUT_ACK_HANDLER_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOCK_INPUT_ACK_HANDLER_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOCK_INPUT_ACK_HANDLER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/renderer_host/input/input_ack_handler.h" 9 #include "content/browser/renderer_host/input/input_ack_handler.h"
10 10
(...skipping 29 matching lines...) Expand all
40 40
41 void set_followup_touch_event(scoped_ptr<TouchEventWithLatencyInfo> event) { 41 void set_followup_touch_event(scoped_ptr<TouchEventWithLatencyInfo> event) {
42 touch_followup_event_ = event.Pass(); 42 touch_followup_event_ = event.Pass();
43 } 43 }
44 44
45 bool unexpected_event_ack_called() const { 45 bool unexpected_event_ack_called() const {
46 return unexpected_event_ack_called_; 46 return unexpected_event_ack_called_;
47 } 47 }
48 InputEventAckState ack_state() const { return ack_state_; } 48 InputEventAckState ack_state() const { return ack_state_; }
49 49
50 blink::WebInputEvent::Type ack_event_type() const { return ack_event_type_; }
51
50 const NativeWebKeyboardEvent& acked_keyboard_event() const { 52 const NativeWebKeyboardEvent& acked_keyboard_event() const {
51 return acked_key_event_; 53 return acked_key_event_;
52 } 54 }
53 const blink::WebMouseWheelEvent& acked_wheel_event() const { 55 const blink::WebMouseWheelEvent& acked_wheel_event() const {
54 return acked_wheel_event_; 56 return acked_wheel_event_;
55 } 57 }
56 const TouchEventWithLatencyInfo& acked_touch_event() const { 58 const TouchEventWithLatencyInfo& acked_touch_event() const {
57 return acked_touch_event_; 59 return acked_touch_event_;
58 } 60 }
59 const blink::WebGestureEvent& acked_gesture_event() const { 61 const blink::WebGestureEvent& acked_gesture_event() const {
60 return acked_gesture_event_; 62 return acked_gesture_event_;
61 } 63 }
62 64
63 private: 65 private:
64 void RecordAckCalled(InputEventAckState ack_result); 66 void RecordAckCalled(blink::WebInputEvent::Type eventType,
67 InputEventAckState ack_result);
65 68
66 InputRouter* input_router_; 69 InputRouter* input_router_;
67 70
68 size_t ack_count_; 71 size_t ack_count_;
69 bool unexpected_event_ack_called_; 72 bool unexpected_event_ack_called_;
73 blink::WebInputEvent::Type ack_event_type_;
jdduke (slow) 2014/05/01 15:44:47 Initialize in the constructor to |WebInputEvent::U
Rick Byers 2014/05/01 17:34:57 Done.
70 InputEventAckState ack_state_; 74 InputEventAckState ack_state_;
71 NativeWebKeyboardEvent acked_key_event_; 75 NativeWebKeyboardEvent acked_key_event_;
72 blink::WebMouseWheelEvent acked_wheel_event_; 76 blink::WebMouseWheelEvent acked_wheel_event_;
73 TouchEventWithLatencyInfo acked_touch_event_; 77 TouchEventWithLatencyInfo acked_touch_event_;
74 blink::WebGestureEvent acked_gesture_event_; 78 blink::WebGestureEvent acked_gesture_event_;
75 79
76 scoped_ptr<GestureEventWithLatencyInfo> gesture_followup_event_; 80 scoped_ptr<GestureEventWithLatencyInfo> gesture_followup_event_;
77 scoped_ptr<TouchEventWithLatencyInfo> touch_followup_event_; 81 scoped_ptr<TouchEventWithLatencyInfo> touch_followup_event_;
78 }; 82 };
79 83
80 } // namespace content 84 } // namespace content
81 85
82 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOCK_INPUT_ACK_HANDLER_H_ 86 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOCK_INPUT_ACK_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698