Index: components/test_runner/event_sender.h |
diff --git a/components/test_runner/event_sender.h b/components/test_runner/event_sender.h |
index be4bd7866259e29c860b71fbd6562e1f46bc3fcc..e867fb4e5065de8551c0a0b4d9734f3df20c49ad 100644 |
--- a/components/test_runner/event_sender.h |
+++ b/components/test_runner/event_sender.h |
@@ -9,6 +9,7 @@ |
#include <queue> |
#include <string> |
+#include <unordered_map> |
#include <vector> |
#include "base/macros.h" |
@@ -61,8 +62,14 @@ class EventSender : public base::SupportsWeakPtr<EventSender> { |
void DoDragDrop(const blink::WebDragData&, blink::WebDragOperationsMask); |
- void MouseDown(int button_number, int modifiers); |
- void MouseUp(int button_number, int modifiers); |
+ void MouseDown(int button_number, int modifiers, |
+ blink::WebPointerProperties::PointerType = |
+ blink::WebPointerProperties::PointerType::Mouse, |
+ int pointerId = 0); |
+ void MouseUp(int button_number, int modifiers, |
+ blink::WebPointerProperties::PointerType = |
+ blink::WebPointerProperties::PointerType::Mouse, |
+ int pointerId = 0); |
void SetMouseButtonState(int button_number, int modifiers); |
void KeyDown(const std::string& code_str, |
@@ -267,6 +274,22 @@ class EventSender : public base::SupportsWeakPtr<EventSender> { |
// Location of the touch point that initiated a gesture. |
blink::WebPoint current_gesture_location_; |
+ |
+ // Pen pointer properties. |
+ struct PenProperties { |
+ blink::WebMouseEvent::Button pressed_button_; |
+ int current_buttons_; |
+ int modifiers_; |
+ blink::WebPoint last_pos_; |
+ PenProperties() |
+ : pressed_button_(blink::WebMouseEvent::ButtonNone) |
+ , current_buttons_(0) |
+ , modifiers_(0) |
+ , last_pos_(blink::WebPoint(0, 0)) { } |
+ }; |
+ typedef std::unordered_map<int, PenProperties> PenStateMap; |
+ PenStateMap current_pen_state_; |
+ |
// Last pressed mouse button (Left/Right/Middle or None). |
static blink::WebMouseEvent::Button pressed_button_; |