DevTools: simplify the async instrumentation harness.

third_party/WebKit/Source/core/events/GenericEventQueue.cpp

 /*
  * Copyright (C) 2012 Victor Carbune (victor@rosedu.org)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 45 matching lines @@
 
 bool GenericEventQueue::enqueueEvent(Event* event)
 {
     if (m_isClosed)
         return false;
 
     if (event->target() == m_owner)
         event->setTarget(nullptr);
 
     TRACE_EVENT_ASYNC_BEGIN1("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii());
-    InspectorInstrumentation::didEnqueueEvent(event->target() ? event->target() : m_owner.get(), event);
+    EventTarget* target = event->target() ? event->target() : m_owner.get();
+    InspectorInstrumentation::asyncTaskScheduled(target->getExecutionContext(), event->type(), event);
     m_pendingEvents.append(event);
 
     if (!m_timer.isActive())
         m_timer.startOneShot(0, BLINK_FROM_HERE);
 
     return true;
 }
 
 bool GenericEventQueue::cancelEvent(Event* event)
 {
     bool found = m_pendingEvents.contains(event);
 
     if (found) {
-        InspectorInstrumentation::didRemoveEvent(event->target() ? event->target() : m_owner.get(), event);
+        EventTarget* target = event->target() ? event->target() : m_owner.get();
+        InspectorInstrumentation::asyncTaskCanceled(target->getExecutionContext(), event);
         m_pendingEvents.remove(m_pendingEvents.find(event));
         TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii(), "status", "cancelled");
     }
 
     if (m_pendingEvents.isEmpty())
         m_timer.stop();
 
     return found;
 }
 
 void GenericEventQueue::timerFired(Timer<GenericEventQueue>*)
 {
     ASSERT(!m_timer.isActive());
     ASSERT(!m_pendingEvents.isEmpty());
 
     HeapVector<Member<Event>> pendingEvents;
     m_pendingEvents.swap(pendingEvents);
 
     for (const auto& pendingEvent : pendingEvents) {
         Event* event = pendingEvent.get();
         EventTarget* target = event->target() ? event->target() : m_owner.get();
         CString type(event->type().ascii());
+        InspectorInstrumentation::AsyncTask asyncTask(target->getExecutionContext(), event);
         TRACE_EVENT_ASYNC_STEP_INTO1("event", "GenericEventQueue:enqueueEvent", event, "dispatch", "type", type);
         target->dispatchEvent(pendingEvent);
         TRACE_EVENT_ASYNC_END1("event", "GenericEventQueue:enqueueEvent", event, "type", type);
-        InspectorInstrumentation::didRemoveEvent(target, event);
     }
 }
 
 void GenericEventQueue::close()
 {
     m_isClosed = true;
     cancelAllEvents();
 }
 
 void GenericEventQueue::cancelAllEvents()
 {
     m_timer.stop();
 
     for (const auto& pendingEvent : m_pendingEvents) {
         Event* event = pendingEvent.get();
         TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii(), "status", "cancelled");
-        InspectorInstrumentation::didRemoveEvent(event->target() ? event->target() : m_owner.get(), event);
+        EventTarget* target = event->target() ? event->target() : m_owner.get();
+        InspectorInstrumentation::asyncTaskCanceled(target->getExecutionContext(), event);
     }
     m_pendingEvents.clear();
 }
 
 bool GenericEventQueue::hasPendingEvents() const
 {
     return m_pendingEvents.size();
 }
 
 } // namespace blink