DevTools: simplify the async instrumentation harness.

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

 /*
  * Copyright (C) 2010 Google Inc. All Rights Reserved.
  *
  * 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 69 matching lines @@
     visitor->trace(m_queuedEvents);
     EventQueue::trace(visitor);
 }
 
 bool DOMWindowEventQueue::enqueueEvent(Event* event)
 {
     if (m_isClosed)
         return false;
 
     ASSERT(event->target());
-    InspectorInstrumentation::didEnqueueEvent(event->target(), event);
+    InspectorInstrumentation::asyncTaskScheduled(event->target()->getExecutionContext(), event->type(), event);
 
     bool wasAdded = m_queuedEvents.add(event).isNewEntry;
     ASSERT_UNUSED(wasAdded, wasAdded); // It should not have already been in the list.
 
     if (!m_pendingEventTimer->isActive())
         m_pendingEventTimer->startOneShot(0, BLINK_FROM_HERE);
 
     return true;
 }
 
 bool DOMWindowEventQueue::cancelEvent(Event* event)
 {
     HeapListHashSet<Member<Event>, 16>::iterator it = m_queuedEvents.find(event);
     bool found = it != m_queuedEvents.end();
     if (found) {
-        InspectorInstrumentation::didRemoveEvent(event->target(), event);
+        InspectorInstrumentation::asyncTaskCanceled(event->target()->getExecutionContext(), event);
         m_queuedEvents.remove(it);
     }
     if (m_queuedEvents.isEmpty())
         m_pendingEventTimer->stop();
     return found;
 }
 
 void DOMWindowEventQueue::close()
 {
     m_isClosed = true;
     m_pendingEventTimer->stop();
     if (InspectorInstrumentation::hasFrontends()) {
         for (const auto& queuedEvent : m_queuedEvents) {
-            Event* event = queuedEvent;
-            if (event)
-                InspectorInstrumentation::didRemoveEvent(event->target(), event);
+            if (queuedEvent)
+                InspectorInstrumentation::asyncTaskCanceled(queuedEvent->target()->getExecutionContext(), queuedEvent);
         }
     }
     m_queuedEvents.clear();
 }
 
 void DOMWindowEventQueue::pendingEventTimerFired()
 {
     ASSERT(!m_pendingEventTimer->isActive());
     ASSERT(!m_queuedEvents.isEmpty());
 
     // Insert a marker for where we should stop.
     ASSERT(!m_queuedEvents.contains(nullptr));
     bool wasAdded = m_queuedEvents.add(nullptr).isNewEntry;
     ASSERT_UNUSED(wasAdded, wasAdded); // It should not have already been in the list.
 
     while (!m_queuedEvents.isEmpty()) {
         HeapListHashSet<Member<Event>, 16>::iterator iter = m_queuedEvents.begin();
         Event* event = *iter;
         m_queuedEvents.remove(iter);
         if (!event)
             break;
         dispatchEvent(event);
-        InspectorInstrumentation::didRemoveEvent(event->target(), event);
     }
 }
 
 void DOMWindowEventQueue::dispatchEvent(Event* event)
 {
     EventTarget* eventTarget = event->target();
+    InspectorInstrumentation::AsyncTask asyncTask(eventTarget->getExecutionContext(), event);
     if (eventTarget->toDOMWindow())
         eventTarget->toDOMWindow()->dispatchEvent(event, nullptr);
     else
         eventTarget->dispatchEvent(event);
 }
 
 } // namespace blink