| Index: third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp b/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
|
| index e5246f9fc850d7d7d5d0b1dff88ad3d758d61d5c..c2ba91a20645f41a1a00659a81c1c29ebb4d34fa 100644
|
| --- a/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
|
| @@ -5,6 +5,7 @@
|
| #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"
|
| #include "core/html/HTMLFrameOwnerElement.h"
|
| @@ -16,20 +17,6 @@ namespace blink {
|
|
|
| namespace {
|
|
|
| -inline bool isPointerEventType(const AtomicString& eventType)
|
| -{
|
| - return eventType == EventTypeNames::gotpointercapture
|
| - || eventType == EventTypeNames::lostpointercapture
|
| - || eventType == EventTypeNames::pointercancel
|
| - || eventType == EventTypeNames::pointerdown
|
| - || eventType == EventTypeNames::pointerenter
|
| - || eventType == EventTypeNames::pointerleave
|
| - || eventType == EventTypeNames::pointermove
|
| - || eventType == EventTypeNames::pointerout
|
| - || eventType == EventTypeNames::pointerover
|
| - || eventType == EventTypeNames::pointerup;
|
| -}
|
| -
|
| WebEventListenerProperties webEventListenerProperties(bool hasBlocking, bool hasPassive)
|
| {
|
| if (hasBlocking && hasPassive)
|
| @@ -63,7 +50,7 @@ bool EventHandlerRegistry::eventTypeToClass(const AtomicString& eventType, const
|
| *result = options.passive() ? TouchEndOrCancelEventPassive : TouchEndOrCancelEventBlocking;
|
| } else if (eventType == EventTypeNames::touchstart || eventType == EventTypeNames::touchmove) {
|
| *result = options.passive() ? TouchStartOrMoveEventPassive : TouchStartOrMoveEventBlocking;
|
| - } else if (isPointerEventType(eventType)) {
|
| + } else if (EventUtil::isPointerEventType(eventType)) {
|
| // The EventHandlerClass is TouchStartOrMoveEventPassive since
|
| // the pointer events never block scrolling and the compositor
|
| // only needs to know about the touch listeners.
|
|
|