Consider isPrimary and pointerType when preventing compat mouse

components/test_runner/event_sender.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_
 #define COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_
 
 #include <stdint.h>
 
 #include <queue>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "components/test_runner/web_task.h"
 #include "third_party/WebKit/public/platform/WebDragData.h"
 #include "third_party/WebKit/public/platform/WebInputEventResult.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
@@ skipping 32 matching lines @@
 
   void Reset();
   void Install(blink::WebFrame*);
   void SetDelegate(WebTestDelegate*);
   void SetWebView(blink::WebView*);
 
   void SetContextMenuData(const blink::WebContextMenuData&);
 
   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,
                int modifiers,
                KeyLocationCode location);
 
   WebTaskList* mutable_task_list() { return &task_list_; }
 
   void set_send_wheel_gestures(bool send_wheel_gestures) {
     send_wheel_gestures_ = send_wheel_gestures;
@@ skipping 184 matching lines @@
   bool touch_cancelable_;
   std::vector<blink::WebTouchPoint> touch_points_;
 
   scoped_ptr<blink::WebContextMenuData> last_context_menu_data_;
 
   blink::WebDragData current_drag_data_;
 
   // Location of the touch point that initiated a gesture.
   blink::WebPoint current_gesture_location_;
 
-  // Last pressed mouse button (Left/Right/Middle or None).
-  static blink::WebMouseEvent::Button pressed_button_;
 
-  // A bitwise OR of the WebMouseEvent::*ButtonDown values corresponding to
-  // currently pressed buttons of mouse.
-  static int current_buttons_;
+  // Mouse-like pointer properties.
+  struct PointerState {
+      // Last pressed button (Left/Right/Middle or None).
+      blink::WebMouseEvent::Button pressed_button_;
 
-  static int modifiers_;
+      // A bitwise OR of the WebMouseEvent::*ButtonDown values corresponding to
+      // currently pressed buttons of the pointer (e.g. pen or mouse).
+      int current_buttons_;
+
+      // Location of last mouseMoveTo event of this pointer.
+      blink::WebPoint last_pos_;
+
+      int modifiers_;
+
+      PointerState()
+      : pressed_button_(blink::WebMouseEvent::ButtonNone)
+      , current_buttons_(0)
+      , last_pos_(blink::WebPoint(0, 0))
+      , modifiers_(0) { }
+  };
+  typedef std::unordered_map<int, PointerState> PointerStateMap;
+  PointerStateMap current_pointer_state_;
 
   bool replaying_saved_events_;
 
   std::deque<SavedEvent> mouse_event_queue_;
 
   blink::WebDragOperationsMask current_drag_effects_allowed_;
 
-  // Location of last mouseMoveTo event.
-  static blink::WebPoint last_mouse_pos_;
-
   // Time and place of the last mouse up event.
   double last_click_time_sec_;
   blink::WebPoint last_click_pos_;
 
   // The last button number passed to mouseDown and mouseUp.
   // Used to determine whether the click count continues to increment or not.
   static blink::WebMouseEvent::Button last_button_type_;
 
   blink::WebDragOperation current_drag_effect_;
 
   uint32_t time_offset_ms_;
   int click_count_;
   // Timestamp (in seconds) of the last event that was dispatched
   double last_event_timestamp_;
 
   base::WeakPtrFactory<EventSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EventSender);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_