Consider isPrimary and pointerType when preventing compat mouse

third_party/WebKit/Source/core/input/PointerEventManager.cpp

Index: third_party/WebKit/Source/core/input/PointerEventManager.cpp
diff --git a/third_party/WebKit/Source/core/input/PointerEventManager.cpp b/third_party/WebKit/Source/core/input/PointerEventManager.cpp
index 5a18188771175f635344fb342c9b6c0b0ac91bbf..59d8661d860048453b66c22207d1af254cde70a6 100644
--- a/third_party/WebKit/Source/core/input/PointerEventManager.cpp
+++ b/third_party/WebKit/Source/core/input/PointerEventManager.cpp
@@ -12,6 +12,8 @@ namespace blink {
 
 namespace {
 
+inline size_t toPointerIndex(WebPointerProperties::PointerType t) { return static_cast<size_t>(t); }

[mustaq, 2016/04/07 19:30:02]

toPointerTypeIndex? Or I guess toInt is even better, this function is not
specific to any array index.

[Navid Zolghadr, 2016/04/08 17:38:44]

It was toInt but Dave also suggested we are using it as the index of arrays and
return type would be better size_t and the name of toInt wouldn't fit either. I
believe toPointerTypeIndex is good here. I used that.

+
 const AtomicString& pointerEventNameForTouchPointState(PlatformTouchPoint::TouchState state)
 {
     switch (state) {
@@ -120,8 +122,10 @@ void PointerEventManager::sendMouseAndPossiblyPointerNodeTransitionEvents(
     // stage. So if the event is not frame boundary transition it is only a
     // compatibility mouse event and we do not need to change pointer event
     // behavior regarding preventMouseEvent state in that case.
-    if (isFrameBoundaryTransition && pointerEvent->buttons() == 0) {
-        m_preventMouseEventForPointerTypeMouse = false;
+    if (isFrameBoundaryTransition && pointerEvent->buttons() == 0
+        && pointerEvent->isPrimary()) {
+        m_preventMouseEventForPointerType[toPointerIndex(
+            mouseEvent.pointerProperties().pointerType)] = false;
     }
 
     processCaptureAndPositionOfPointerEvent(pointerEvent, enteredNode,
@@ -356,8 +360,10 @@ WebInputEventResult PointerEventManager::sendMousePointerEvent(
 
     // This is for when the mouse is released outside of the page.
     if (pointerEvent->type() == EventTypeNames::pointermove
-        && !pointerEvent->buttons()) {
-        m_preventMouseEventForPointerTypeMouse = false;
+        && !pointerEvent->buttons()
+        && pointerEvent->isPrimary()) {
+        m_preventMouseEventForPointerType[toPointerIndex(
+            mouseEvent.pointerProperties().pointerType)] = false;
     }
 
     processCaptureAndPositionOfPointerEvent(pointerEvent, target,
@@ -370,10 +376,14 @@ WebInputEventResult PointerEventManager::sendMousePointerEvent(
         dispatchPointerEvent(effectiveTarget, pointerEvent);
 
     if (result != WebInputEventResult::NotHandled
-        && pointerEvent->type() == EventTypeNames::pointerdown)
-        m_preventMouseEventForPointerTypeMouse = true;
+        && pointerEvent->type() == EventTypeNames::pointerdown
+        && pointerEvent->isPrimary()) {
+        m_preventMouseEventForPointerType[toPointerIndex(
+            mouseEvent.pointerProperties().pointerType)] = true;
+    }
 
-    if (!m_preventMouseEventForPointerTypeMouse) {
+    if (pointerEvent->isPrimary() && !m_preventMouseEventForPointerType[toPointerIndex(
+        mouseEvent.pointerProperties().pointerType)]) {
         result = EventHandler::mergeEventResult(result,
             dispatchMouseEvent(effectiveTarget, mouseEventType, mouseEvent,
             nullptr, clickCount));
@@ -381,7 +391,10 @@ WebInputEventResult PointerEventManager::sendMousePointerEvent(
 
     if (pointerEvent->buttons() == 0) {
         releasePointerCapture(pointerEvent->pointerId());
-        m_preventMouseEventForPointerTypeMouse = false;
+        if (pointerEvent->isPrimary()) {
+            m_preventMouseEventForPointerType[toPointerIndex(
+                mouseEvent.pointerProperties().pointerType)] = false;
+        }
     }
 
     return result;
@@ -398,7 +411,8 @@ PointerEventManager::~PointerEventManager()
 
 void PointerEventManager::clear()
 {
-    m_preventMouseEventForPointerTypeMouse = false;
+    for (auto& entry : m_preventMouseEventForPointerType)
+        entry = false;
     m_pointerEventFactory.clear();
     m_nodeUnderPointer.clear();
 }