| 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 ec677e8170735e9161c53e457887fcd3bead8d92..83ce425d3b891d5eecfc38c7cedf9a9c996ee5dc 100644
|
| --- a/third_party/WebKit/Source/core/input/EventHandler.h
|
| +++ b/third_party/WebKit/Source/core/input/EventHandler.h
|
| @@ -30,6 +30,7 @@
|
| #include "core/events/TextEventInputType.h"
|
| #include "core/input/GestureManager.h"
|
| #include "core/input/KeyboardEventManager.h"
|
| +#include "core/input/MouseEventManager.h"
|
| #include "core/input/PointerEventManager.h"
|
| #include "core/input/ScrollManager.h"
|
| #include "core/layout/HitTestRequest.h"
|
| @@ -111,8 +112,6 @@ public:
|
| void dispatchFakeMouseMoveEventSoon();
|
| void dispatchFakeMouseMoveEventSoonInQuad(const FloatQuad&);
|
|
|
| - static HitTestResult hitTestResultInFrame(LocalFrame*, const LayoutPoint&, HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active);
|
| -
|
| HitTestResult hitTestResultAtPoint(const LayoutPoint&,
|
| HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active,
|
| const LayoutSize& padding = LayoutSize());
|
| @@ -192,9 +191,6 @@ public:
|
|
|
| void setMouseDownMayStartAutoscroll() { m_mouseDownMayStartAutoscroll = true; }
|
|
|
| - static WebInputEventResult mergeEventResult(WebInputEventResult resultA, WebInputEventResult resultB);
|
| - static WebInputEventResult toWebInputEventResult(DispatchEventResult);
|
| -
|
| bool handleAccessKey(const PlatformKeyboardEvent&);
|
| WebInputEventResult keyEvent(const PlatformKeyboardEvent&);
|
| void defaultKeyboardEventHandler(KeyboardEvent*);
|
| @@ -395,10 +391,11 @@ private:
|
| PlatformMouseEvent m_mouseDown;
|
| RefPtr<UserGestureToken> m_lastMouseDownUserGestureToken;
|
|
|
| + GestureManager m_gestureManager;
|
| + MouseEventManager m_mouseEventManager;
|
| PointerEventManager m_pointerEventManager;
|
| ScrollManager m_scrollManager;
|
| KeyboardEventManager m_keyboardEventManager;
|
| - GestureManager m_gestureManager;
|
|
|
| double m_maxMouseMovedDuration;
|
|
|
|
|