Remove the pointer event capturing flag

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/DocumentUserGestureToken.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/shadow/FlatTreeTraversal.h"
 #include "core/events/MouseEvent.h"
@@ skipping 191 matching lines @@
         mouseEvent.pointerProperties().pointerType)] = false;
   }
 
   processCaptureAndPositionOfPointerEvent(dummyPointerEvent, enteredNode,
                                           mouseEvent, true);
 }
 
 void PointerEventManager::sendBoundaryEvents(EventTarget* exitedTarget,
                                              EventTarget* enteredTarget,
                                              PointerEvent* pointerEvent) {
-  if (RuntimeEnabledFeatures::pointerEventV1SpecCapturingEnabled()) {
-    if (exitedTarget == enteredTarget)
-      return;
-    if (EventTarget* capturingTarget =
-            getCapturingNode(pointerEvent->pointerId())) {
-      if (capturingTarget == exitedTarget)
-        enteredTarget = nullptr;
-      else if (capturingTarget == enteredTarget)
-        exitedTarget = nullptr;
-      else
-        return;
-    }
-  }
   PointerEventBoundaryEventDispatcher boundaryEventDispatcher(this,
                                                               pointerEvent);
   boundaryEventDispatcher.sendBoundaryEvents(exitedTarget, enteredTarget);
 }
 
 void PointerEventManager::setNodeUnderPointer(PointerEvent* pointerEvent,
                                               EventTarget* target) {
   if (m_nodeUnderPointer.contains(pointerEvent->pointerId())) {
     EventTargetAttributes node =
         m_nodeUnderPointer.get(pointerEvent->pointerId());
@@ skipping 102 matching lines @@
     TouchEventManager::TouchInfo touchInfo;
     touchInfo.point = touchPoint;
 
     int pointerId =
         m_pointerEventFactory.getPointerEventId(touchPoint.pointerProperties());
     // Do the hit test either when the touch first starts or when the touch
     // is not captured. |m_pendingPointerCaptureTarget| indicates the target
     // that will be capturing this event. |m_pointerCaptureTarget| may not
     // have this target yet since the processing of that will be done right
     // before firing the event.
-    if (RuntimeEnabledFeatures::pointerEventV1SpecCapturingEnabled() ||
-        touchInfo.point.state() == PlatformTouchPoint::TouchPressed ||
+    if (touchInfo.point.state() == PlatformTouchPoint::TouchPressed ||
         !m_pendingPointerCaptureTarget.contains(pointerId)) {
       HitTestRequest::HitTestRequestType hitType = HitTestRequest::TouchEvent |
                                                    HitTestRequest::ReadOnly |
                                                    HitTestRequest::Active;
       LayoutPoint pagePoint = LayoutPoint(
           m_frame->view()->rootFrameToContents(touchInfo.point.pos()));
       HitTestResult hitTestTesult =
           m_frame->eventHandler().hitTestResultAtPoint(pagePoint, hitType);
       Node* node = hitTestTesult.innerNode();
       if (node) {
@@ skipping 72 matching lines @@
 
 WebInputEventResult PointerEventManager::sendTouchPointerEvent(
     EventTarget* target,
     PointerEvent* pointerEvent) {
   if (m_inCanceledStateForPointerTypeTouch)
     return WebInputEventResult::NotHandled;
 
   processCaptureAndPositionOfPointerEvent(pointerEvent, target);
 
   // Setting the implicit capture for touch
-  if (!RuntimeEnabledFeatures::pointerEventV1SpecCapturingEnabled() &&
-      pointerEvent->type() == EventTypeNames::pointerdown)
+  if (pointerEvent->type() == EventTypeNames::pointerdown)
     setPointerCapture(pointerEvent->pointerId(), target);
 
   WebInputEventResult result = dispatchPointerEvent(
       getEffectiveTargetForPointerEvent(target, pointerEvent->pointerId()),
       pointerEvent);
 
   if (pointerEvent->type() == EventTypeNames::pointerup ||
       pointerEvent->type() == EventTypeNames::pointercancel) {
     releasePointerCapture(pointerEvent->pointerId());
 
@@ skipping 98 matching lines @@
   return pointerCaptureTargetTemp != pendingPointercaptureTargetTemp;
 }
 
 EventTarget* PointerEventManager::processCaptureAndPositionOfPointerEvent(
     PointerEvent* pointerEvent,
     EventTarget* hitTestTarget,
     const PlatformMouseEvent& mouseEvent,
     bool sendMouseEvent) {
   processPendingPointerCapture(pointerEvent);
 
-  if (!RuntimeEnabledFeatures::pointerEventV1SpecCapturingEnabled()) {
-    PointerCapturingMap::const_iterator it =
-        m_pointerCaptureTarget.find(pointerEvent->pointerId());
-    if (EventTarget* pointercaptureTarget =
-            (it != m_pointerCaptureTarget.end()) ? it->value : nullptr)
-      hitTestTarget = pointercaptureTarget;
-  }
+  PointerCapturingMap::const_iterator it =
+      m_pointerCaptureTarget.find(pointerEvent->pointerId());
+  if (EventTarget* pointercaptureTarget =
+          (it != m_pointerCaptureTarget.end()) ? it->value : nullptr)
+    hitTestTarget = pointercaptureTarget;
 
   setNodeUnderPointer(pointerEvent, hitTestTarget);
   if (sendMouseEvent) {
     m_mouseEventManager->setNodeUnderMouse(
         hitTestTarget ? hitTestTarget->toNode() : nullptr, mouseEvent);
   }
   return hitTestTarget;
 }
 
 void PointerEventManager::processPendingPointerCapture(
@@ skipping 141 matching lines @@
       return true;
   }
   return false;
 }
 
 EventTarget* PointerEventManager::getMouseCapturingNode() {
   return getCapturingNode(PointerEventFactory::s_mouseId);
 }
 
 }  // namespace blink