DevTools: simplify the async instrumentation harness.

third_party/WebKit/Source/core/fileapi/FileReader.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 79 matching lines @@
     ~ThrottlingController() { }
 
     enum FinishReaderType { DoNotRunPendingReaders, RunPendingReaders };
 
     static void pushReader(ExecutionContext* context, FileReader* reader)
     {
         ThrottlingController* controller = from(context);
         if (!controller)
             return;
 
-        reader->m_asyncOperationId = InspectorInstrumentation::traceAsyncOperationStarting(context, "FileReader");
+        InspectorInstrumentation::asyncTaskScheduled(context, "FileReader", reader, true);
         controller->pushReader(reader);
     }
 
     static FinishReaderType removeReader(ExecutionContext* context, FileReader* reader)
     {
         ThrottlingController* controller = from(context);
         if (!controller)
             return DoNotRunPendingReaders;
 
         return controller->removeReader(reader);
     }
 
     static void finishReader(ExecutionContext* context, FileReader* reader, FinishReaderType nextStep)
     {
-        InspectorInstrumentation::traceAsyncOperationCompleted(context, reader->m_asyncOperationId);
-
         ThrottlingController* controller = from(context);
         if (!controller)
             return;
 
         controller->finishReader(reader, nextStep);
+        InspectorInstrumentation::asyncTaskCanceled(context, reader);
     }
 
     DEFINE_INLINE_TRACE()
     {
         visitor->trace(m_pendingReaders);
         visitor->trace(m_runningReaders);
         Supplement<ExecutionContext>::trace(visitor);
     }
 
 private:
@@ skipping 67 matching lines @@
     return fileReader;
 }
 
 FileReader::FileReader(ExecutionContext* context)
     : ActiveScriptWrappable(this)
     , ActiveDOMObject(context)
     , m_state(EMPTY)
     , m_loadingState(LoadingStateNone)
     , m_readType(FileReaderLoader::ReadAsBinaryString)
     , m_lastProgressNotificationTimeMS(0)
-    , m_asyncOperationId(0)
 {
 }
 
 FileReader::~FileReader()
 {
     terminate();
 }
 
 const AtomicString& FileReader::interfaceName() const
 {
@@ skipping 224 matching lines @@
 
     fireEvent(EventTypeNames::error);
     fireEvent(EventTypeNames::loadend);
 
     // All possible events have fired and we're done, no more pending activity.
     ThrottlingController::finishReader(getExecutionContext(), this, finalStep);
 }
 
 void FileReader::fireEvent(const AtomicString& type)
 {
-    InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncCallbackStarting(getExecutionContext(), m_asyncOperationId);
+    InspectorInstrumentation::AsyncTask asyncTask(getExecutionContext(), this);
     if (!m_loader) {
         dispatchEvent(ProgressEvent::create(type, false, 0, 0));
-        InspectorInstrumentation::traceAsyncCallbackCompleted(cookie);
         return;
     }
 
     if (m_loader->totalBytes() >= 0)
         dispatchEvent(ProgressEvent::create(type, true, m_loader->bytesLoaded(), m_loader->totalBytes()));
     else
         dispatchEvent(ProgressEvent::create(type, false, m_loader->bytesLoaded(), 0));
-
-    InspectorInstrumentation::traceAsyncCallbackCompleted(cookie);
 }
 
 DEFINE_TRACE(FileReader)
 {
     visitor->trace(m_error);
     RefCountedGarbageCollectedEventTargetWithInlineData<FileReader>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink