| Index: third_party/WebKit/Source/core/input/EventHandler.h
|
| diff --git a/third_party/WebKit/Source/core/input/EventHandler.h b/third_party/WebKit/Source/core/input/EventHandler.h
|
| index c9bdbfab23662634140e8d1c9c2c018914ddfcfc..42f1b11cb8c85a56a9cd85388f56a6b8d81c8e41 100644
|
| --- a/third_party/WebKit/Source/core/input/EventHandler.h
|
| +++ b/third_party/WebKit/Source/core/input/EventHandler.h
|
| @@ -27,8 +27,8 @@
|
| #define EventHandler_h
|
|
|
| #include "core/CoreExport.h"
|
| -#include "core/events/PointerEventManager.h"
|
| #include "core/events/TextEventInputType.h"
|
| +#include "core/input/PointerEventManager.h"
|
| #include "core/layout/HitTestRequest.h"
|
| #include "core/page/DragActions.h"
|
| #include "core/page/EventWithHitTestResults.h"
|
| @@ -178,6 +178,9 @@ public:
|
|
|
| void setMouseDownMayStartAutoscroll() { m_mouseDownMayStartAutoscroll = true; }
|
|
|
| + static WebInputEventResult mergeEventResult(WebInputEventResult responseA, WebInputEventResult responseB);
|
| + static WebInputEventResult eventToEventResult(PassRefPtrWillBeRawPtr<Event>, bool);
|
| +
|
| static PlatformEvent::Modifiers accessKeyModifiers();
|
| bool handleAccessKey(const PlatformKeyboardEvent&);
|
| WebInputEventResult keyEvent(const PlatformKeyboardEvent&);
|
| @@ -284,16 +287,6 @@ private:
|
|
|
| void updateMouseEventTargetNode(Node*, const PlatformMouseEvent&);
|
|
|
| - WebInputEventResult dispatchPointerEvent(EventTarget*, PassRefPtrWillBeRawPtr<PointerEvent>);
|
| - EventTarget* getEffectiveTargetForPointerEvent(EventTarget*, PassRefPtrWillBeRawPtr<PointerEvent>);
|
| -
|
| - // Dispatches (pointer|mouse)(over|out|enter|leave) events to the specified node.
|
| - void sendPointerAndMouseTransitionEvents(Node* target, const AtomicString& mouseEventType,
|
| - const PlatformMouseEvent&, Node* relatedTarget, bool checkForListener);
|
| -
|
| - // Locates the target nodes in DOM based on the transition and dispatches (pointer|mouse)(over|out|enter|leave) events to them.
|
| - void sendNodeTransitionEvents(Node*, Node*, const PlatformMouseEvent&);
|
| -
|
| MouseEventWithHitTestResults prepareMouseEvent(const HitTestRequest&, const PlatformMouseEvent&);
|
|
|
| WebInputEventResult dispatchMouseEvent(const AtomicString& eventType, Node* target, int clickCount, const PlatformMouseEvent&);
|
| @@ -434,11 +427,6 @@ private:
|
|
|
| PointerEventManager m_pointerEventManager;
|
|
|
| - // Prevents firing mousedown, mousemove & mouseup in-between a canceled pointerdown and next pointerup/pointercancel.
|
| - // See "PREVENT MOUSE EVENT flag" in the spec:
|
| - // https://w3c.github.io/pointerevents/#compatibility-mapping-with-mouse-events
|
| - bool m_preventMouseEventForPointerTypeMouse;
|
| -
|
| // This is set upon sending a pointercancel for touch, prevents PE dispatches for touches until
|
| // all touch-points become inactive.
|
| // TODO(mustaq): Consider a state per pointerType, as in PointerIdManager? Exclude mouse?
|
|
|