Consider isPrimary and pointerType when preventing compat mouse

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

 // Copyright 2016 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.
 
 #include "core/input/PointerEventManager.h"
 
 #include "core/dom/shadow/FlatTreeTraversal.h"
 #include "core/events/MouseEvent.h"
 #include "core/input/EventHandler.h"
 
 namespace blink {
 
 namespace {
 
+inline size_t toPointerIndex(WebPointerProperties::PointerType t) { return static_cast<int>(t); }

[dtapuska, 2016/04/05 20:30:40]

still change the static_cast as well.

[Navid Zolghadr, 2016/04/06 15:27:10]

Oops. I missed it.

+
 const AtomicString& pointerEventNameForTouchPointState(PlatformTouchPoint::TouchState state)
 {
     switch (state) {
     case PlatformTouchPoint::TouchReleased:
         return EventTypeNames::pointerup;
     case PlatformTouchPoint::TouchCancelled:
         return EventTypeNames::pointercancel;
     case PlatformTouchPoint::TouchPressed:
         return EventTypeNames::pointerdown;
     case PlatformTouchPoint::TouchMoved:
@@ skipping 88 matching lines @@
     // Pointer event type does not matter as it will be overridden in the sendNodeTransitionEvents
     RefPtrWillBeRawPtr<PointerEvent> pointerEvent =
         m_pointerEventFactory.create(EventTypeNames::mouseout, mouseEvent,
         nullptr, view);
 
     // TODO(crbug/545647): This state should reset with pointercancel too.
     // This function also gets called for compat mouse events of touch at this
     // 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,
         exitedNode, mouseEvent, true, isFrameBoundaryTransition);
 }
 
 void PointerEventManager::sendNodeTransitionEvents(
     PassRefPtrWillBeRawPtr<EventTarget> prpExitedTarget,
     PassRefPtrWillBeRawPtr<EventTarget> prpEnteredTarget,
     PassRefPtrWillBeRawPtr<PointerEvent> prpPointerEvent,
@@ skipping 214 matching lines @@
     PassRefPtrWillBeRawPtr<Node> lastNodeUnderMouse)
 {
     RefPtrWillBeRawPtr<Node> target = prpTarget;
 
     RefPtrWillBeRawPtr<PointerEvent> pointerEvent =
         m_pointerEventFactory.create(mouseEventType, mouseEvent,
         relatedTarget, view);
 
     // 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,
         lastNodeUnderMouse, mouseEvent, true, true);
 
     RefPtrWillBeRawPtr<EventTarget> effectiveTarget =
         getEffectiveTargetForPointerEvent(target, pointerEvent->pointerId());
 
     WebInputEventResult result =
         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));
     }
 
     if (pointerEvent->buttons() == 0) {
         releasePointerCapture(pointerEvent->pointerId());
-        m_preventMouseEventForPointerTypeMouse = false;
+        if (pointerEvent->isPrimary()) {
+            m_preventMouseEventForPointerType[toPointerIndex(
+                mouseEvent.pointerProperties().pointerType)] = false;
+        }
     }
 
     return result;
 }
 
 PointerEventManager::PointerEventManager()
 {
     clear();
 }
 
 PointerEventManager::~PointerEventManager()
 {
 }
 
 void PointerEventManager::clear()
 {
-    m_preventMouseEventForPointerTypeMouse = false;
+    for (auto& entry : m_preventMouseEventForPointerType)
+        entry = false;
     m_pointerEventFactory.clear();
     m_nodeUnderPointer.clear();
 }
 
 void PointerEventManager::processCaptureAndPositionOfPointerEvent(
     const PassRefPtrWillBeRawPtr<PointerEvent> prpPointerEvent,
     const PassRefPtrWillBeRawPtr<EventTarget> prpHitTestTarget,
     const PassRefPtrWillBeRawPtr<EventTarget> lastNodeUnderMouse,
     const PlatformMouseEvent& mouseEvent,
     bool sendMouseEvent, bool setPointerPosition)
@@ skipping 158 matching lines @@
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_nodeUnderPointer);
     visitor->trace(m_pointerCaptureTarget);
     visitor->trace(m_pendingPointerCaptureTarget);
 #endif
 }
 
 
 } // namespace blink