DevTools: simplify the async instrumentation harness.

third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp

Index: third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp
diff --git a/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp b/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp
index 989f2ff69b4473c34e42f137d03d71e856fb9a72..94d0ad9fb2e4e2fc57455a23c4ddbf30e0eb85d2 100644
--- a/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp
+++ b/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp
@@ -116,12 +116,11 @@ void ScriptedAnimationController::dispatchEvents(const AtomicString& eventInterf
         // FIXME: we should figure out how to make dispatchEvent properly virtual to avoid
         // special casting window.
         // FIXME: We should not fire events for nodes that are no longer in the tree.
+        InspectorInstrumentation::AsyncTask asyncTask(eventTarget->getExecutionContext(), events[i]);
         if (LocalDOMWindow* window = eventTarget->toDOMWindow())
             window->dispatchEvent(events[i], nullptr);
         else
             eventTarget->dispatchEvent(events[i]);
-
-        InspectorInstrumentation::didRemoveEvent(eventTarget, events[i].get());
     }
 }
 
@@ -170,7 +169,7 @@ void ScriptedAnimationController::serviceScriptedAnimations(double monotonicTime
 
 void ScriptedAnimationController::enqueueEvent(Event* event)
 {
-    InspectorInstrumentation::didEnqueueEvent(event->target(), event);
+    InspectorInstrumentation::asyncTaskScheduled(event->target()->getExecutionContext(), event->type(), event);
     m_eventQueue.append(event);
     scheduleAnimationIfNeeded();
 }