Change mouse pointer event targets to the capturing node

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/ElementTraversal.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/shadow/FlatTreeTraversal.h"
 #include "core/events/MouseEvent.h"
@@ skipping 19 matching lines @@
         return EventTypeNames::pointerup;
     case PlatformTouchPoint::TouchCancelled:
         return EventTypeNames::pointercancel;
     case PlatformTouchPoint::TouchPressed:
         return EventTypeNames::pointerdown;
     case PlatformTouchPoint::TouchMoved:
         return EventTypeNames::pointermove;
     case PlatformTouchPoint::TouchStationary:
         // Fall through to default
     default:
-        ASSERT_NOT_REACHED();
+        NOTREACHED();
         return emptyAtom;
     }
 }
 
 bool isInDocument(EventTarget* n)
 {
     return n && n->toNode() && n->toNode()->isConnected();
 }
 
 WebInputEventResult dispatchMouseEvent(
@@ skipping 153 matching lines @@
 
 void PointerEventManager::sendBoundaryEvents(
     EventTarget* exitedTarget,
     EventTarget* enteredTarget,
     PointerEvent* pointerEvent,
     const PlatformMouseEvent& mouseEvent, bool sendMouseEvent)
 {
     if (exitedTarget == enteredTarget)
         return;
 
-    if (EventTarget* capturingTarget = getCapturingNode(pointerEvent->pointerId())) {
-        if (capturingTarget == exitedTarget)
-            enteredTarget = nullptr;
-        else if (capturingTarget == enteredTarget)
-            exitedTarget = nullptr;
-        else
-            return;
-    }
-
     // Dispatch pointerout/mouseout events
     if (isInDocument(exitedTarget)) {
         if (!sendMouseEvent) {
             dispatchPointerEvent(exitedTarget, m_pointerEventFactory.createPointerBoundaryEvent(
                 pointerEvent, EventTypeNames::pointerout, enteredTarget));
         } else {
             dispatchMouseEvent(exitedTarget,
                 EventTypeNames::mouseout,
                 mouseEventWithRegion(exitedTarget->toNode(), mouseEvent),
                 enteredTarget);
@@ skipping 81 matching lines @@
         } else {
             dispatchMouseEvent(enteredAncestors[i-1].get(),
                 EventTypeNames::mouseenter, mouseEvent, exitedTarget,
                 0, !enteredNodeHasCapturingAncestor);
         }
     }
 }
 
 void PointerEventManager::setNodeUnderPointer(
     PointerEvent* pointerEvent,
-    EventTarget* target,
-    bool sendEvent)
+    EventTarget* target)
 {
     if (m_nodeUnderPointer.contains(pointerEvent->pointerId())) {
         EventTargetAttributes node = m_nodeUnderPointer.get(
             pointerEvent->pointerId());
         if (!target) {
             m_nodeUnderPointer.remove(pointerEvent->pointerId());
         } else if (target
             != m_nodeUnderPointer.get(pointerEvent->pointerId()).target) {
             m_nodeUnderPointer.set(pointerEvent->pointerId(),
                 EventTargetAttributes(target, false));
         }
-        if (sendEvent)
-            sendBoundaryEvents(node.target, target, pointerEvent);
+        sendBoundaryEvents(node.target, target, pointerEvent);
     } else if (target) {
         m_nodeUnderPointer.add(pointerEvent->pointerId(),
             EventTargetAttributes(target, false));
-        if (sendEvent)
-            sendBoundaryEvents(nullptr, target, pointerEvent);
+        sendBoundaryEvents(nullptr, target, pointerEvent);
     }
 }
 
 void PointerEventManager::blockTouchPointers()
 {
     if (m_inCanceledStateForPointerTypeTouch)
         return;
     m_inCanceledStateForPointerTypeTouch = true;
 
     Vector<int> touchPointerIds
         = m_pointerEventFactory.getPointerIdsOfType(WebPointerProperties::PointerType::Touch);
 
     for (int pointerId : touchPointerIds) {
         PointerEvent* pointerEvent
             = m_pointerEventFactory.createPointerCancelEvent(
                 pointerId, WebPointerProperties::PointerType::Touch);
 
-        ASSERT(m_nodeUnderPointer.contains(pointerId));
+        DCHECK(m_nodeUnderPointer.contains(pointerId));
         EventTarget* target = m_nodeUnderPointer.get(pointerId).target;
 
         processCaptureAndPositionOfPointerEvent(pointerEvent, target);
 
         // TODO(nzolghadr): This event follows implicit TE capture. The actual target
         // would depend on PE capturing. Perhaps need to split TE/PE event path upstream?
         // crbug.com/579553.
         dispatchPointerEvent(
             getEffectiveTargetForPointerEvent(target, pointerEvent->pointerId()),
             pointerEvent);
@@ skipping 168 matching lines @@
         relatedTarget, m_frame->document()->domWindow());
 
     // This is for when the mouse is released outside of the page.
     if (pointerEvent->type() == EventTypeNames::pointermove
         && !pointerEvent->buttons()
         && pointerEvent->isPrimary()) {
         m_preventMouseEventForPointerType[toPointerTypeIndex(
             mouseEvent.pointerProperties().pointerType)] = false;
     }
 
-    processCaptureAndPositionOfPointerEvent(pointerEvent, target,
+    EventTarget* pointerEventTarget = processCaptureAndPositionOfPointerEvent(pointerEvent, target,
         lastNodeUnderMouse, mouseEvent, true, true);
 
     EventTarget* effectiveTarget =
-        getEffectiveTargetForPointerEvent(target, pointerEvent->pointerId());
+        getEffectiveTargetForPointerEvent(pointerEventTarget, pointerEvent->pointerId());
 
     WebInputEventResult result =
         dispatchPointerEvent(effectiveTarget, pointerEvent);
 
     if (result != WebInputEventResult::NotHandled
         && pointerEvent->type() == EventTypeNames::pointerdown
         && pointerEvent->isPrimary()) {
         m_preventMouseEventForPointerType[toPointerTypeIndex(
             mouseEvent.pointerProperties().pointerType)] = true;
     }
@@ skipping 48 matching lines @@
     m_touchIdsForCanceledPointerdowns.clear();
     m_nodeUnderPointer.clear();
     m_pointerCaptureTarget.clear();
     m_pendingPointerCaptureTarget.clear();
 }
 
 bool PointerEventManager::getPointerCaptureState(int pointerId,
     EventTarget** pointerCaptureTarget,
     EventTarget** pendingPointerCaptureTarget)
 {
-    PointerCapturingMap::iterator it;
+    PointerCapturingMap::const_iterator it;
 
     it = m_pointerCaptureTarget.find(pointerId);
-    EventTarget* pointercaptureTargetTemp = (it != m_pointerCaptureTarget.end()) ? it->value : nullptr;
+    EventTarget* pointerCaptureTargetTemp = (it != m_pointerCaptureTarget.end()) ? it->value : nullptr;
     it = m_pendingPointerCaptureTarget.find(pointerId);
     EventTarget* pendingPointercaptureTargetTemp = (it != m_pendingPointerCaptureTarget.end()) ? it->value : nullptr;
 
     if (pointerCaptureTarget)
-        *pointerCaptureTarget = pointercaptureTargetTemp;
+        *pointerCaptureTarget = pointerCaptureTargetTemp;
     if (pendingPointerCaptureTarget)
         *pendingPointerCaptureTarget = pendingPointercaptureTargetTemp;
 
-    return pointercaptureTargetTemp != pendingPointercaptureTargetTemp;
+    return pointerCaptureTargetTemp != pendingPointercaptureTargetTemp;
 }
 
-void PointerEventManager::processCaptureAndPositionOfPointerEvent(
+EventTarget* PointerEventManager::processCaptureAndPositionOfPointerEvent(
     PointerEvent* pointerEvent,
     EventTarget* hitTestTarget,
     EventTarget* lastNodeUnderMouse,
     const PlatformMouseEvent& mouseEvent,
     bool sendMouseEvent, bool setPointerPosition)
 {
-    bool isCaptureChanged = false;
+    if (setPointerPosition) {
+        processPendingPointerCapture(pointerEvent->pointerId());
 
-    if (setPointerPosition) {
-        isCaptureChanged = processPendingPointerCapture(pointerEvent,
-            hitTestTarget, mouseEvent, sendMouseEvent);
-        // If there was a change in capturing processPendingPointerCapture has
-        // already taken care of transition events. So we don't need to send the
-        // transition events here.
-        setNodeUnderPointer(pointerEvent, hitTestTarget, !isCaptureChanged);
+        PointerCapturingMap::const_iterator it = m_pointerCaptureTarget.find(pointerEvent->pointerId());
+        EventTarget* pointercaptureTarget = (it != m_pointerCaptureTarget.end()) ? it->value : nullptr;

[dtapuska, 2016/07/22 15:57:39]

collapse this into the if; 
like if(EventTarget* pointerCaptureTarget = ) 

[Navid Zolghadr, 2016/07/22 16:39:24]

Done.

+        if (pointercaptureTarget)
+            hitTestTarget = pointercaptureTarget;
+
+        setNodeUnderPointer(pointerEvent, hitTestTarget);
     }
-    if (sendMouseEvent && !isCaptureChanged) {
+    if (sendMouseEvent) {
         // lastNodeUnderMouse is needed here because it is still stored in EventHandler.
         sendBoundaryEvents(lastNodeUnderMouse, hitTestTarget,
             pointerEvent, mouseEvent, true);
     }
+    return hitTestTarget;
 }
 
-void PointerEventManager::immediatelyProcessPendingPointerCapture(int pointerId)
+void PointerEventManager::processPendingPointerCapture(int pointerId)
 {
     EventTarget* pointerCaptureTarget;
     EventTarget* pendingPointerCaptureTarget;
     const bool isCaptureChanged = getPointerCaptureState(pointerId,
         &pointerCaptureTarget, &pendingPointerCaptureTarget);
 
     if (!isCaptureChanged)
         return;
 
     if (pointerCaptureTarget) {
         // Re-target lostpointercapture to the document when the element is
         // no longer participating in the tree.
         EventTarget* target = pointerCaptureTarget;
         if (target->toNode()
             && !target->toNode()->isConnected()) {
             target = target->toNode()->ownerDocument();
         }
         dispatchPointerEvent(target,
             m_pointerEventFactory.createPointerCaptureEvent(
                 pointerId, EventTypeNames::lostpointercapture));
     }
     dispatchPointerEvent(pendingPointerCaptureTarget,

[mustaq, 2016/07/22 16:01:01]

Caught here again, sorry. Please add a comment why a null check for for ppct is
unnecessary (from your comment in the last CL).

[Navid Zolghadr, 2016/07/22 16:39:24]

Done.

         m_pointerEventFactory.createPointerCaptureEvent(
             pointerId, EventTypeNames::gotpointercapture));
 
     // Setting |m_pointerCaptureTarget| comes at the end to prevent the infinite
     // loop if js calls set/releasepointercapture in got/lostpointercapture
     // handlers.
     if (pendingPointerCaptureTarget)
         m_pointerCaptureTarget.set(pointerId, pendingPointerCaptureTarget);
     else
         m_pointerCaptureTarget.remove(pointerId);
 }
 
-// TODO(crbug.com/629921): This function should be merged with |immediatelyProcessPendingPointerCapture|
-// when we stop hit-testing while a pointer is captured.
-bool PointerEventManager::processPendingPointerCapture(
-    PointerEvent* pointerEvent,
-    EventTarget* hitTestTarget,
-    const PlatformMouseEvent& mouseEvent, bool sendMouseEvent)
-{
-    int pointerId = pointerEvent->pointerId();
-    EventTarget* pointerCaptureTarget;
-    EventTarget* pendingPointerCaptureTarget;
-    const bool isCaptureChanged = getPointerCaptureState(pointerId,
-        &pointerCaptureTarget, &pendingPointerCaptureTarget);
-    const EventTargetAttributes &nodeUnderPointerAtt =
-        m_nodeUnderPointer.contains(pointerId)
-        ? m_nodeUnderPointer.get(pointerId) : EventTargetAttributes();
-
-    if (isCaptureChanged) {
-        if ((hitTestTarget != nodeUnderPointerAtt.target
-            || (pendingPointerCaptureTarget
-            && pendingPointerCaptureTarget != nodeUnderPointerAtt.target))
-            && nodeUnderPointerAtt.hasRecievedOverEvent) {
-            if (sendMouseEvent) {
-                // Send pointer event transitions as the line after this if
-                // block sends the mouse events
-                sendBoundaryEvents(nodeUnderPointerAtt.target, nullptr,
-                    pointerEvent);
-            }
-            sendBoundaryEvents(nodeUnderPointerAtt.target, nullptr,
-                pointerEvent, mouseEvent, sendMouseEvent);
-        }
-        if (pointerCaptureTarget) {
-            // Re-target lostpointercapture to the document when the element is
-            // no longer participating in the tree.
-            EventTarget* target = pointerCaptureTarget;
-            if (target->toNode()
-                && !target->toNode()->isConnected()) {
-                target = target->toNode()->ownerDocument();
-            }
-            dispatchPointerEvent(target,
-                m_pointerEventFactory.createPointerCaptureEvent(
-                    pointerId, EventTypeNames::lostpointercapture));
-        }
-    }
-
-    // Set pointerCaptureTarget from pendingPointerCaptureTarget. This does
-    // affect the behavior of sendBoundaryEvents function. So the
-    // ordering of the surrounding blocks of code for sending transition events
-    // are important.
-    if (pendingPointerCaptureTarget)
-        m_pointerCaptureTarget.set(pointerId, pendingPointerCaptureTarget);
-    else
-        m_pointerCaptureTarget.remove(pointerId);
-
-    if (isCaptureChanged) {
-        dispatchPointerEvent(pendingPointerCaptureTarget,
-            m_pointerEventFactory.createPointerCaptureEvent(
-                pointerId, EventTypeNames::gotpointercapture));
-        if ((pendingPointerCaptureTarget == hitTestTarget
-            || !pendingPointerCaptureTarget)
-            && (nodeUnderPointerAtt.target != hitTestTarget
-            || !nodeUnderPointerAtt.hasRecievedOverEvent)) {
-            if (sendMouseEvent) {
-                // Send pointer event transitions as the line after this if
-                // block sends the mouse events
-                sendBoundaryEvents(nullptr, hitTestTarget, pointerEvent);
-            }
-            sendBoundaryEvents(nullptr, hitTestTarget, pointerEvent,
-                mouseEvent, sendMouseEvent);
-        }
-    }
-    return isCaptureChanged;
-}
-
 void PointerEventManager::removeTargetFromPointerCapturingMapping(
     PointerCapturingMap& map, const EventTarget* target)
 {
     // We could have kept a reverse mapping to make this deletion possibly
     // faster but it adds some code complication which might not be worth of
     // the performance improvement considering there might not be a lot of
     // active pointer or pointer captures at the same time.
     PointerCapturingMap tmp = map;
     for (PointerCapturingMap::iterator it = tmp.begin(); it != tmp.end(); ++it) {
         if (it->value == target)
             map.remove(it->key);
     }
 }
 
-EventTarget* PointerEventManager::getCapturingNode(int pointerId)
+EventTarget* PointerEventManager::getCapturingNode(int pointerId) const
 {
     if (m_pointerCaptureTarget.contains(pointerId))
         return m_pointerCaptureTarget.get(pointerId);
     return nullptr;
 }
 
 void PointerEventManager::removePointer(
     PointerEvent* pointerEvent)
 {
     int pointerId = pointerEvent->pointerId();
@@ skipping 72 matching lines @@
         uint32_t firstId = m_touchIdsForCanceledPointerdowns.first();
         if (firstId > uniqueTouchEventId)
             return false;
         m_touchIdsForCanceledPointerdowns.takeFirst();
         if (firstId == uniqueTouchEventId)
             return true;
     }
     return false;
 }
 
+EventTarget* PointerEventManager::getMouseCapturingNode() const
+{
+    return getCapturingNode(1);

[dtapuska, 2016/07/22 15:57:39]

This is an odd little constant. Can we name it formally?

[mustaq, 2016/07/22 16:01:01]

May be reuse the constant from PE factory?

[Navid Zolghadr, 2016/07/22 16:39:24]

:) yeah. I was trying to avoid making that constant public. But sure. I'll do
that and probably make it private again later on.

+}
+
 DEFINE_TRACE(PointerEventManager)
 {
     visitor->trace(m_frame);
     visitor->trace(m_nodeUnderPointer);
     visitor->trace(m_pointerCaptureTarget);
     visitor->trace(m_pendingPointerCaptureTarget);
     visitor->trace(m_touchEventManager);
 }
 
 
 } // namespace blink