Index: components/test_runner/event_sender.h |
diff --git a/components/test_runner/event_sender.h b/components/test_runner/event_sender.h |
index 916cf88910d658fc0e4d52bd7965cfe5cfdae957..be4bd7866259e29c860b71fbd6562e1f46bc3fcc 100644 |
--- a/components/test_runner/event_sender.h |
+++ b/components/test_runner/event_sender.h |
@@ -71,6 +71,10 @@ class EventSender : public base::SupportsWeakPtr<EventSender> { |
WebTaskList* mutable_task_list() { return &task_list_; } |
+ void set_send_wheel_gestures(bool send_wheel_gestures) { |
+ send_wheel_gestures_ = send_wheel_gestures; |
+ } |
+ |
private: |
friend class EventSenderBindings; |
@@ -91,6 +95,8 @@ class EventSender : public base::SupportsWeakPtr<EventSender> { |
int modifiers; |
}; |
+ enum class MouseScrollType { PIXEL, TICK }; |
+ |
void EnableDOMUIEventLogging(); |
void FireKeyboardEventsToElement(); |
void ClearKillRing(); |
@@ -135,9 +141,6 @@ class EventSender : public base::SupportsWeakPtr<EventSender> { |
void AddTouchPoint(float x, float y, gin::Arguments* args); |
- void MouseDragBegin(); |
- void MouseDragEnd(); |
- |
void GestureScrollBegin(gin::Arguments* args); |
void GestureScrollEnd(gin::Arguments* args); |
void GestureScrollUpdate(gin::Arguments* args); |
@@ -152,13 +155,9 @@ class EventSender : public base::SupportsWeakPtr<EventSender> { |
void GestureLongTap(gin::Arguments* args); |
void GestureTwoFingerTap(gin::Arguments* args); |
- void ContinuousMouseScrollBy(gin::Arguments* args); |
+ void MouseScrollBy(gin::Arguments* args, MouseScrollType scroll_type); |
void MouseMoveTo(gin::Arguments* args); |
void MouseLeave(); |
- void TrackpadScrollBegin(); |
- void TrackpadScroll(gin::Arguments* args); |
- void TrackpadScrollEnd(); |
- void MouseScrollBy(gin::Arguments* args); |
void ScheduleAsynchronousClick(int button_number, int modifiers); |
void ScheduleAsynchronousKeyDown(const std::string& code_str, |
int modifiers, |
@@ -176,8 +175,9 @@ class EventSender : public base::SupportsWeakPtr<EventSender> { |
void UpdateClickCountForButton(blink::WebMouseEvent::Button); |
void InitMouseWheelEvent(gin::Arguments* args, |
- bool continuous, |
- blink::WebMouseWheelEvent* event); |
+ MouseScrollType scroll_type, |
+ blink::WebMouseWheelEvent* event, |
+ bool* send_gestures); |
void InitPointerProperties(gin::Arguments* args, |
blink::WebPointerProperties* e, |
float* radius_x, |
@@ -191,6 +191,9 @@ class EventSender : public base::SupportsWeakPtr<EventSender> { |
blink::WebInputEventResult HandleInputEventOnViewOrPopup( |
const blink::WebInputEvent&); |
+ void SendGesturesForMouseWheelEvent( |
+ const blink::WebMouseWheelEvent wheel_event); |
+ |
double last_event_timestamp() { return last_event_timestamp_; } |
bool force_layout_on_events() const { return force_layout_on_events_; } |
@@ -246,6 +249,7 @@ class EventSender : public base::SupportsWeakPtr<EventSender> { |
WebTestDelegate* delegate_; |
blink::WebView* view_; |
+ bool send_wheel_gestures_; |
bool force_layout_on_events_; |
// When set to true (the default value), we batch mouse move and mouse up |