Remove the pointer event capturing flag

This was a flag for testing purposes and
was added as part of crbug.com/640700. This
CL removes that flag which is no longer needed.

BUG=642776

TBR=avi@chromium.org

Review-Url: https://codereview.chromium.org/2525973002
Cr-Commit-Position: refs/heads/master@{#434670}

chrome/app/generated_resources.grd

@@ -6038,12 +6038,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION" desc="Description for the flag to enable experimental Web Platform features.">
         Enables experimental Web Platform features that are in development.
       </message>
-      <message name="IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_V1_SPEC_CAPTURING_NAME" desc="Name for the flag to enable pointer event v1 spec capturing.">
-        Pointer event v1 spec capturing
-      </message>
-      <message name="IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_V1_SPEC_CAPTURING_DESCRIPTION" desc="Description for the flag to enable pointer event v1 spec capturing.">
-        Disables implicit capturing of touch pointer events.
-      </message>
       <message name="IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_NAME" desc="Name for the flag to enable the experimental pointer events.">
         Pointer Events
       </message>

chrome/browser/about_flags.cc

@@ -2025,10 +2025,6 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-feature-policy", IDS_FLAGS_FEATURE_POLICY_NAME,
      IDS_FLAGS_FEATURE_POLICY_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(features::kFeaturePolicy)},
-    {"enable-pointer-event-v1-spec-capturing-behavior",
-     IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_V1_SPEC_CAPTURING_NAME,
-     IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_V1_SPEC_CAPTURING_DESCRIPTION, kOsAll,
-     FEATURE_VALUE_TYPE(features::kPointerEventV1SpecCapturing)},
 #if defined(OS_CHROMEOS)
     {"enable-emoji-handwriting-voice-on-ime-menu",
      IDS_FLAGS_ENABLE_EHV_INPUT_NAME, IDS_FLAGS_ENABLE_EHV_INPUT_DESCRIPTION,

content/child/runtime_features.cc

@@ -261,9 +261,6 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
   WebRuntimeFeatures::enablePointerEvent(
       base::FeatureList::IsEnabled(features::kPointerEvents));
 
-  if (base::FeatureList::IsEnabled(features::kPointerEventV1SpecCapturing))
-    WebRuntimeFeatures::enablePointerEventV1SpecCapturing(true);
-
   WebRuntimeFeatures::enablePassiveDocumentEventListeners(
       base::FeatureList::IsEnabled(features::kPassiveDocumentEventListeners));
 

content/public/common/content_features.cc

@@ -147,11 +147,6 @@ const base::Feature kPassiveEventListenersDueToFling{
 const base::Feature kPointerEvents{"PointerEvent",
                                    base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Whether pointer event capturing follow v1 spec instead of v2 proposal.
-// See https://rawgit.com/w3c/pointerevents/reduce-hit-tests/index.html.
-const base::Feature kPointerEventV1SpecCapturing{
-    "PointerEventV1SpecCapturing", base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Enables purge and suspend.
 const base::Feature kPurgeAndSuspend{"PurgeAndSuspend",
                                      base::FEATURE_DISABLED_BY_DEFAULT};

content/public/common/content_features.h

@@ -44,7 +44,6 @@ CONTENT_EXPORT extern const base::Feature kPassiveDocumentEventListeners;
 CONTENT_EXPORT extern const base::Feature kPassiveEventListenersDueToFling;
 CONTENT_EXPORT extern const base::Feature kPepper3DImageChromium;
 CONTENT_EXPORT extern const base::Feature kPointerEvents;
-CONTENT_EXPORT extern const base::Feature kPointerEventV1SpecCapturing;
 CONTENT_EXPORT extern const base::Feature kPurgeAndSuspend;
 CONTENT_EXPORT extern const base::Feature kRafAlignedMouseInputEvents;
 CONTENT_EXPORT extern const base::Feature kRafAlignedTouchInputEvents;

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

@@ -1172,10 +1172,8 @@ Node* EventHandler::updateMouseEventTargetNode(Node* targetNode) {
   Node* newNodeUnderMouse = targetNode;
 
   // If we're capturing, we always go right to that node.
-  EventTarget* mousePointerCapturingNode =
-      m_pointerEventManager->getMouseCapturingNode();
-  if (mousePointerCapturingNode &&
-      !RuntimeEnabledFeatures::pointerEventV1SpecCapturingEnabled()) {
+  if (EventTarget* mousePointerCapturingNode =
+          m_pointerEventManager->getMouseCapturingNode()) {
     newNodeUnderMouse = mousePointerCapturingNode->toNode();
     DCHECK(newNodeUnderMouse);
   } else if (m_capturingMouseEventsNode) {

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

@@ -209,19 +209,6 @@ void PointerEventManager::sendMouseAndPointerBoundaryEvents(
 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);
@@ -344,8 +331,7 @@ void PointerEventManager::computeTouchTargets(
     // 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 |
@@ -438,8 +424,7 @@ WebInputEventResult PointerEventManager::sendTouchPointerEvent(
   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(
@@ -558,13 +543,11 @@ EventTarget* PointerEventManager::processCaptureAndPositionOfPointerEvent(
     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) {

third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in

@@ -181,8 +181,6 @@ PermissionDelegation status=test
 Permissions status=stable
 PermissionsRequestRevoke status=experimental
 PointerEvent status=stable
-// For temporary compat testing of Edge-like model - crbug.com/640700
-PointerEventV1SpecCapturing
 PreciseMemoryInfo
 PreferredImageRasterBounds settable_from_internals=True
 // This feature is deprecated and we are evangelizing affected sites.

third_party/WebKit/Source/web/WebRuntimeFeatures.cpp

@@ -218,10 +218,6 @@ void WebRuntimeFeatures::enablePointerEvent(bool enable) {
   RuntimeEnabledFeatures::setPointerEventEnabled(enable);
 }
 
-void WebRuntimeFeatures::enablePointerEventV1SpecCapturing(bool enable) {
-  RuntimeEnabledFeatures::setPointerEventV1SpecCapturingEnabled(enable);
-}
-
 void WebRuntimeFeatures::enableScriptedSpeech(bool enable) {
   RuntimeEnabledFeatures::setScriptedSpeechEnabled(enable);
 }

third_party/WebKit/public/web/WebRuntimeFeatures.h

@@ -101,7 +101,6 @@ class WebRuntimeFeatures {
   BLINK_EXPORT static void enablePaymentRequest(bool);
   BLINK_EXPORT static void enablePermissionsAPI(bool);
   BLINK_EXPORT static void enablePointerEvent(bool);
-  BLINK_EXPORT static void enablePointerEventV1SpecCapturing(bool);
   BLINK_EXPORT static void enablePreciseMemoryInfo(bool);
   BLINK_EXPORT static void enablePresentationAPI(bool);
   BLINK_EXPORT static void enablePushMessaging(bool);