DevTools: simplify the async instrumentation harness.

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

 /*
  * Copyright (C) 2013 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 52 matching lines @@
 #else
         AllowCrossThreadAccess(m_weakFactory.createWeakPtr()),
 #endif
         task,
         isInspectorTask));
 }
 
 void MainThreadTaskRunner::postTask(const WebTraceLocation& location, PassOwnPtr<ExecutionContextTask> task)
 {
     if (!task->taskNameForInstrumentation().isEmpty())
-        InspectorInstrumentation::didPostExecutionContextTask(m_context, task.get());
+        InspectorInstrumentation::asyncTaskScheduled(m_context, task->taskNameForInstrumentation(), task.get());
     postTaskInternal(location, task, false);
 }
 
 void MainThreadTaskRunner::postInspectorTask(const WebTraceLocation& location, PassOwnPtr<ExecutionContextTask> task)
 {
     postTaskInternal(location, task, true);
 }
 
 void MainThreadTaskRunner::perform(PassOwnPtr<ExecutionContextTask> task, bool isInspectorTask)
 {
     if (!isInspectorTask && (m_context->tasksNeedSuspension() || !m_pendingTasks.isEmpty())) {
         m_pendingTasks.append(task);
         return;
     }
 
-    const bool instrumenting = !isInspectorTask && !task->taskNameForInstrumentation().isEmpty();
-    if (instrumenting)
-        InspectorInstrumentation::willPerformExecutionContextTask(m_context, task.get());
+    InspectorInstrumentation::AsyncTask asyncTask(m_context, task.get(), !isInspectorTask);
     task->performTask(m_context);
-    if (instrumenting)
-        InspectorInstrumentation::didPerformExecutionContextTask(m_context);
 }
 
 void MainThreadTaskRunner::suspend()
 {
     ASSERT(!m_suspended);
     m_pendingTasksTimer.stop();
     m_suspended = true;
 }
 
 void MainThreadTaskRunner::resume()
 {
     ASSERT(m_suspended);
     if (!m_pendingTasks.isEmpty())
         m_pendingTasksTimer.startOneShot(0, BLINK_FROM_HERE);
 
     m_suspended = false;
 }
 
 void MainThreadTaskRunner::pendingTasksTimerFired(Timer<MainThreadTaskRunner>*)
 {
     while (!m_pendingTasks.isEmpty()) {
         OwnPtr<ExecutionContextTask> task = m_pendingTasks[0].release();
         m_pendingTasks.remove(0);
         const bool instrumenting = !task->taskNameForInstrumentation().isEmpty();
-        if (instrumenting)
-            InspectorInstrumentation::willPerformExecutionContextTask(m_context, task.get());
+        InspectorInstrumentation::AsyncTask asyncTask(m_context, task.get(), instrumenting);
         task->performTask(m_context);
-        if (instrumenting)
-            InspectorInstrumentation::didPerformExecutionContextTask(m_context);
     }
 }
 
 } // namespace blink