DevTools: simplify the async instrumentation harness.

third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

 /*
  *  Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *  Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org>
  *  Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org>
  *  Copyright (C) 2008, 2011 Google Inc. All rights reserved.
  *  Copyright (C) 2012 Intel Corporation
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
@@ skipping 906 matching lines @@
 
     m_exceptionCode = 0;
     m_error = false;
 
     if (m_async) {
         UseCounter::count(&executionContext, UseCounter::XMLHttpRequestAsynchronous);
         if (m_upload)
             request.setReportUploadProgress(true);
 
         ASSERT(!m_loader);
+        InspectorInstrumentation::scheduleAsyncTask(&executionContext, "XMLHttpRequest", this);
         m_loader = ThreadableLoader::create(executionContext, this, options, resourceLoaderOptions);
         m_loader->start(request);
 
         return;
     }
 
     // Use count for XHR synchronous requests.
     UseCounter::count(&executionContext, UseCounter::XMLHttpRequestSynchronous);
     ThreadableLoader::loadResourceSynchronously(executionContext, request, *this, options, resourceLoaderOptions);
 
@@ skipping 126 matching lines @@
 {
     m_requestHeaders.clear();
 }
 
 void XMLHttpRequest::dispatchProgressEvent(const AtomicString& type, long long receivedLength, long long expectedLength)
 {
     bool lengthComputable = expectedLength > 0 && receivedLength <= expectedLength;
     unsigned long long loaded = receivedLength >= 0 ? static_cast<unsigned long long>(receivedLength) : 0;
     unsigned long long total = lengthComputable ? static_cast<unsigned long long>(expectedLength) : 0;
 
+    Optional<InspectorInstrumentation::AsyncTask> asyncTask;
+    if (type == EventTypeNames::loadend)
+        InspectorInstrumentation::asyncTaskStarted(getExecutionContext(), this);
     m_progressEventThrottle->dispatchProgressEvent(type, lengthComputable, loaded, total);
-
     if (type == EventTypeNames::loadend)
-        InspectorInstrumentation::didDispatchXHRLoadendEvent(getExecutionContext(), this);
+        InspectorInstrumentation::asyncTaskFinished(getExecutionContext(), this);
 }
 
 void XMLHttpRequest::dispatchProgressEventFromSnapshot(const AtomicString& type)
 {
     dispatchProgressEvent(type, m_receivedLength, m_response.expectedContentLength());
 }
 
 void XMLHttpRequest::handleNetworkError()
 {
     WTF_LOG(Network, "XMLHttpRequest %p handleNetworkError()", this);
@@ skipping 616 matching lines @@
     visitor->trace(m_responseDocumentParser);
     visitor->trace(m_progressEventThrottle);
     visitor->trace(m_upload);
     visitor->trace(m_blobLoader);
     XMLHttpRequestEventTarget::trace(visitor);
     DocumentParserClient::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink