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 <map>
 #include <queue>
 #include <string>
 #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"
@@ skipping 34 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_;
 
+
+  // Pen pointer properties
+  typedef struct PenProperties {

[dtapuska, 2016/04/05 19:21:25]

I don't think we need to define structs in c-style.

C++ style should just be fine;

ie; struct PenProperties {
    };

Comments need to always terminate with a period.

[Navid Zolghadr, 2016/04/05 20:17:25]

Done.

+      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)) { }
+  } PenProperties;
+  std::map<int, PenProperties> stateOfPen;

[dtapuska, 2016/04/05 19:21:25]

Add a typedef for this map. Can this be an unordered-map; those are preferred;
since it is O(1) always.

stateOfPen needs an underscore. Don't use camel case in chromium code. 

I'd prefer it was called current_pen_state_ to named something similar to other
fields like |current_gesture_location_|

[Navid Zolghadr, 2016/04/05 20:17:25]

Done.

+
   // 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_;
 
   static int modifiers_;
 
   bool replaying_saved_events_;
@@ skipping 21 matching lines @@
   double last_event_timestamp_;
 
   base::WeakPtrFactory<EventSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EventSender);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_