Bookkeep the pointer event listeners added to page

third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp

 // Copyright 2014 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/frame/EventHandlerRegistry.h"
 
 #include "core/events/EventListenerOptions.h"
 #include "core/events/EventUtil.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 38 matching lines @@
     *result = options.passive() ? kWheelEventPassive : kWheelEventBlocking;
   } else if (event_type == EventTypeNames::touchend ||
              event_type == EventTypeNames::touchcancel) {
     *result = options.passive() ? kTouchEndOrCancelEventPassive
                                 : kTouchEndOrCancelEventBlocking;
   } else if (event_type == EventTypeNames::touchstart ||
              event_type == EventTypeNames::touchmove) {
     *result = options.passive() ? kTouchStartOrMoveEventPassive
                                 : kTouchStartOrMoveEventBlocking;
   } else if (EventUtil::IsPointerEventType(event_type)) {
-    // The EventHandlerClass is TouchStartOrMoveEventPassive since
-    // the pointer events never block scrolling and the compositor
+    // The pointer events never block scrolling and the compositor
     // only needs to know about the touch listeners.
-    *result = kTouchStartOrMoveEventPassive;
+    *result = kPointerEvent;
 #if DCHECK_IS_ON()
   } else if (event_type == EventTypeNames::load ||
              event_type == EventTypeNames::mousemove ||
              event_type == EventTypeNames::touchstart) {
     *result = kEventsForTesting;
 #endif
   } else {
     return false;
   }
   return true;
@@ skipping 144 matching lines @@
       break;
     case kWheelEventBlocking:
     case kWheelEventPassive:
       page_->GetChromeClient().SetEventListenerProperties(
           frame, WebEventListenerClass::kMouseWheel,
           GetWebEventListenerProperties(HasEventHandlers(kWheelEventBlocking),
                                         HasEventHandlers(kWheelEventPassive)));
       break;
     case kTouchStartOrMoveEventBlocking:
     case kTouchStartOrMoveEventPassive:
+    case kPointerEvent:
       page_->GetChromeClient().SetEventListenerProperties(
           frame, WebEventListenerClass::kTouchStartOrMove,
           GetWebEventListenerProperties(
               HasEventHandlers(kTouchStartOrMoveEventBlocking),
-              HasEventHandlers(kTouchStartOrMoveEventPassive)));
+              HasEventHandlers(kTouchStartOrMoveEventPassive) ||
+                  HasEventHandlers(kPointerEvent)));
       break;
     case kTouchEndOrCancelEventBlocking:
     case kTouchEndOrCancelEventPassive:
       page_->GetChromeClient().SetEventListenerProperties(
           frame, WebEventListenerClass::kTouchEndOrCancel,
           GetWebEventListenerProperties(
               HasEventHandlers(kTouchEndOrCancelEventBlocking),
               HasEventHandlers(kTouchEndOrCancelEventPassive)));
       break;
 #if DCHECK_IS_ON()
@@ skipping 84 matching lines @@
       // its handlers properly.
       DCHECK(window->GetFrame());
       DCHECK(window->GetFrame()->GetPage());
       DCHECK(window->GetFrame()->GetPage() == page_);
     }
   }
 #endif  // DCHECK_IS_ON()
 }
 
 }  // namespace blink