DevTools: simplify the async instrumentation harness.

third_party/WebKit/Source/modules/filesystem/FileWriter.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 45 matching lines @@
     , ActiveDOMObject(context)
     , m_readyState(INIT)
     , m_operationInProgress(OperationNone)
     , m_queuedOperation(OperationNone)
     , m_bytesWritten(0)
     , m_bytesToWrite(0)
     , m_truncateLength(-1)
     , m_numAborts(0)
     , m_recursionDepth(0)
     , m_lastProgressNotificationTimeMS(0)
-    , m_asyncOperationId(0)
 {
 }
 
 FileWriter::~FileWriter()
 {
     ASSERT(!m_recursionDepth);
     if (m_readyState == WRITING)
         stop();
 }
 
@@ skipping 166 matching lines @@
 {
     ASSERT(m_operationInProgress == OperationAbort);
     m_operationInProgress = OperationNone;
     Operation operation = m_queuedOperation;
     m_queuedOperation = OperationNone;
     doOperation(operation);
 }
 
 void FileWriter::doOperation(Operation operation)
 {
-    m_asyncOperationId = InspectorInstrumentation::traceAsyncOperationStarting(getExecutionContext(), "FileWriter", m_asyncOperationId);
+    InspectorInstrumentation::asyncTaskScheduled(getExecutionContext(), "FileWriter", this);
     switch (operation) {
     case OperationWrite:
         ASSERT(m_operationInProgress == OperationNone);
         ASSERT(m_truncateLength == -1);
         ASSERT(m_blobBeingWritten.get());
         ASSERT(m_readyState == WRITING);
         writer()->write(position(), m_blobBeingWritten->uuid());
         break;
     case OperationTruncate:
         ASSERT(m_operationInProgress == OperationNone);
@@ skipping 28 matching lines @@
     if (FileError::OK != code) {
         m_error = FileError::create(code);
         if (FileError::ABORT_ERR == code)
             fireEvent(EventTypeNames::abort);
         else
             fireEvent(EventTypeNames::error);
     } else
         fireEvent(EventTypeNames::write);
     fireEvent(EventTypeNames::writeend);
 
-    InspectorInstrumentation::traceAsyncOperationCompleted(getExecutionContext(), m_asyncOperationId);
-    m_asyncOperationId = 0;
+    InspectorInstrumentation::asyncTaskCanceled(getExecutionContext(), this);
 }
 
 void FileWriter::fireEvent(const AtomicString& type)
 {
-    InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncCallbackStarting(getExecutionContext(), m_asyncOperationId);
+    InspectorInstrumentation::AsyncTask asyncTask(getExecutionContext(), this);
     ++m_recursionDepth;
     dispatchEvent(ProgressEvent::create(type, true, m_bytesWritten, m_bytesToWrite));
     --m_recursionDepth;
     ASSERT(m_recursionDepth >= 0);
-    InspectorInstrumentation::traceAsyncCallbackCompleted(cookie);
 }
 
 void FileWriter::setError(FileError::ErrorCode errorCode, ExceptionState& exceptionState)
 {
     ASSERT(errorCode);
     FileError::throwDOMException(exceptionState, errorCode);
     m_error = FileError::create(errorCode);
 }
 
 DEFINE_TRACE(FileWriter)
 {
     visitor->trace(m_error);
     visitor->trace(m_blobBeingWritten);
     EventTargetWithInlineData::trace(visitor);
     FileWriterBase::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink