ABANDONED CL: Revert of Move EventHandler timers to per-frame task queues.

third_party/WebKit/Source/core/input/EventHandler.cpp

Index: third_party/WebKit/Source/core/input/EventHandler.cpp
diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp
index aa3d5c76e5e3137a9e1ce84e27f3ef0b878912fb..5f190e34632e3af7be1801d3fd9989d948fbce0d 100644
--- a/third_party/WebKit/Source/core/input/EventHandler.cpp
+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
@@ -35,7 +35,6 @@
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentUserGestureToken.h"
-#include "core/dom/TaskRunnerHelper.h"
 #include "core/dom/TouchList.h"
 #include "core/dom/shadow/FlatTreeTraversal.h"
 #include "core/dom/shadow/ShadowRoot.h"
@@ -161,31 +160,24 @@
   Cursor m_cursor;
 };
 
-EventHandler::EventHandler(LocalFrame& frame)
+EventHandler::EventHandler(LocalFrame* frame)
     : m_frame(frame),
-      m_selectionController(SelectionController::create(frame)),
-      m_hoverTimer(TaskRunnerHelper::get(TaskType::UserInteraction, &frame),
-                   this,
-                   &EventHandler::hoverTimerFired),
-      m_cursorUpdateTimer(TaskRunnerHelper::get(TaskType::Internal, &frame),
-                          this,
-                          &EventHandler::cursorUpdateTimerFired),
+      m_selectionController(SelectionController::create(*frame)),
+      m_hoverTimer(this, &EventHandler::hoverTimerFired),
+      m_cursorUpdateTimer(this, &EventHandler::cursorUpdateTimerFired),
       m_eventHandlerWillResetCapturingMouseEventsNode(0),
       m_shouldOnlyFireDragOverEvent(false),
       m_scrollManager(new ScrollManager(frame)),
-      m_mouseEventManager(new MouseEventManager(frame, *m_scrollManager)),
-      m_keyboardEventManager(new KeyboardEventManager(frame, *m_scrollManager)),
+      m_mouseEventManager(new MouseEventManager(frame, m_scrollManager)),
+      m_keyboardEventManager(new KeyboardEventManager(frame, m_scrollManager)),
       m_pointerEventManager(
-          new PointerEventManager(frame, *m_mouseEventManager)),
+          new PointerEventManager(frame, m_mouseEventManager)),
       m_gestureManager(new GestureManager(frame,
-                                          *m_scrollManager,
-                                          *m_mouseEventManager,
-                                          *m_pointerEventManager,
-                                          *m_selectionController)),
-      m_activeIntervalTimer(
-          TaskRunnerHelper::get(TaskType::UserInteraction, &frame),
-          this,
-          &EventHandler::activeIntervalTimerFired) {}
+                                          m_scrollManager,
+                                          m_mouseEventManager,
+                                          m_pointerEventManager,
+                                          m_selectionController)),
+      m_activeIntervalTimer(this, &EventHandler::activeIntervalTimerFired) {}
 
 DEFINE_TRACE(EventHandler) {
   visitor->trace(m_frame);
@@ -1676,7 +1668,6 @@
   if (shouldKeepActiveForMinInterval) {
     m_lastDeferredTapElement =
         eventWithHitTestResults.hitTestResult().innerElement();
-    // TODO(https://crbug.com/668758): Use a normal BeginFrame update for this.
     m_activeIntervalTimer.startOneShot(minimumActiveInterval - activeInterval,
                                        BLINK_FROM_HERE);
   }
@@ -1887,7 +1878,6 @@
 }
 
 void EventHandler::scheduleHoverStateUpdate() {
-  // TODO(https://crbug.com/668758): Use a normal BeginFrame update for this.
   if (!m_hoverTimer.isActive())
     m_hoverTimer.startOneShot(0, BLINK_FROM_HERE);
 }
@@ -1897,7 +1887,6 @@
   // timer competing which eachother (since there's only one mouse cursor).
   ASSERT(m_frame == m_frame->localFrameRoot());
 
-  // TODO(https://crbug.com/668758): Use a normal BeginFrame update for this.
   if (!m_cursorUpdateTimer.isActive())
     m_cursorUpdateTimer.startOneShot(cursorUpdateInterval, BLINK_FROM_HERE);
 }
@@ -1924,6 +1913,7 @@
 
 void EventHandler::hoverTimerFired(TimerBase*) {
   TRACE_EVENT0("input", "EventHandler::hoverTimerFired");
+  m_hoverTimer.stop();
 
   ASSERT(m_frame);
   ASSERT(m_frame->document());
@@ -1943,6 +1933,7 @@
 
 void EventHandler::activeIntervalTimerFired(TimerBase*) {
   TRACE_EVENT0("input", "EventHandler::activeIntervalTimerFired");
+  m_activeIntervalTimer.stop();
 
   if (m_frame && m_frame->document() && m_lastDeferredTapElement) {
     // FIXME: Enable condition when http://crbug.com/226842 lands