| 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 f0c6776a114421e5e9f2dab28e7ae37a7b27ef84..b1ad7d891afe84dfa5130b269225b48455e58924 100644
|
| --- a/third_party/WebKit/Source/core/input/EventHandler.h
|
| +++ b/third_party/WebKit/Source/core/input/EventHandler.h
|
| @@ -84,7 +84,7 @@
|
| WTF_MAKE_NONCOPYABLE(EventHandler);
|
|
|
| public:
|
| - explicit EventHandler(LocalFrame&);
|
| + explicit EventHandler(LocalFrame*);
|
| DECLARE_TRACE();
|
|
|
| void clear();
|
| @@ -344,12 +344,12 @@
|
|
|
| const Member<SelectionController> m_selectionController;
|
|
|
| - TaskRunnerTimer<EventHandler> m_hoverTimer;
|
| + Timer<EventHandler> m_hoverTimer;
|
|
|
| // TODO(rbyers): Mouse cursor update is page-wide, not per-frame. Page-wide
|
| // state should move out of EventHandler to a new PageEventHandler class.
|
| // crbug.com/449649
|
| - TaskRunnerTimer<EventHandler> m_cursorUpdateTimer;
|
| + Timer<EventHandler> m_cursorUpdateTimer;
|
|
|
| Member<Node> m_capturingMouseEventsNode;
|
| bool m_eventHandlerWillResetCapturingMouseEventsNode;
|
| @@ -374,7 +374,7 @@
|
|
|
| bool m_longTapShouldInvokeContextMenu;
|
|
|
| - TaskRunnerTimer<EventHandler> m_activeIntervalTimer;
|
| + Timer<EventHandler> m_activeIntervalTimer;
|
| double m_lastShowPressTimestamp;
|
| Member<Element> m_lastDeferredTapElement;
|
|
|
|
|