DevTools: Fix async stacks instrumentation for XHRs.

Source/core/inspector/AsyncCallStackTracker.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:
  *
  *     * 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 208 matching lines @@
     ASSERT(isEnabled());
     if (ExecutionContextData* data = m_executionContextDataMap.get(eventTarget->executionContext()))
         data->m_eventCallChains.remove(event);
 }
 
 void AsyncCallStackTracker::willHandleEvent(EventTarget* eventTarget, Event* event, EventListener* listener, bool useCapture)
 {
     ASSERT(eventTarget->executionContext());
     ASSERT(isEnabled());
     if (XMLHttpRequest* xhr = toXmlHttpRequest(eventTarget)) {
-        willHandleXHREvent(xhr, eventTarget, event);
+        willHandleXHREvent(xhr, event);
     } else {
         ExecutionContext* context = eventTarget->executionContext();
         if (ExecutionContextData* data = m_executionContextDataMap.get(context))
             setCurrentAsyncCallChain(context, data->m_eventCallChains.get(event));
         else
             setCurrentAsyncCallChain(context, nullptr);
     }
 }
 
 void AsyncCallStackTracker::willLoadXHR(XMLHttpRequest* xhr, const ScriptValue& callFrames)
 {
     ASSERT(xhr->executionContext());
     ASSERT(isEnabled());
     if (!validateCallFrames(callFrames))
         return;
     ExecutionContextData* data = createContextDataIfNeeded(xhr->executionContext());
     data->m_xhrCallChains.set(xhr, createAsyncCallChain(xhrSendName, callFrames));
 }
 
-void AsyncCallStackTracker::willHandleXHREvent(XMLHttpRequest* xhr, EventTarget* eventTarget, Event* event)
+void AsyncCallStackTracker::didLoadXHR(XMLHttpRequest* xhr)
+{
+    ASSERT(xhr->executionContext());
+    ASSERT(isEnabled());
+    if (ExecutionContextData* data = m_executionContextDataMap.get(xhr->executionContext()))
+        data->m_xhrCallChains.remove(xhr);
+}
+
+void AsyncCallStackTracker::willHandleXHREvent(XMLHttpRequest* xhr, Event* event)
 {
     ExecutionContext* context = xhr->executionContext();
     ASSERT(context);
     ASSERT(isEnabled());
-    if (ExecutionContextData* data = m_executionContextDataMap.get(context)) {
-        bool isXHRDownload = (xhr == eventTarget);
-        if (isXHRDownload && event->type() == EventTypeNames::loadend)
-            setCurrentAsyncCallChain(context, data->m_xhrCallChains.take(xhr));
-        else
-            setCurrentAsyncCallChain(context, data->m_xhrCallChains.get(xhr));
-    } else {
+    if (ExecutionContextData* data = m_executionContextDataMap.get(context))
+        setCurrentAsyncCallChain(context, data->m_xhrCallChains.get(xhr));
+    else
         setCurrentAsyncCallChain(context, nullptr);
-    }
 }
 
 void AsyncCallStackTracker::didEnqueueMutationRecord(ExecutionContext* context, MutationObserver* observer, const ScriptValue& callFrames)
 {
     ASSERT(context);
     ASSERT(isEnabled());
     if (!validateCallFrames(callFrames))
         return;
     ExecutionContextData* data = createContextDataIfNeeded(context);
     data->m_mutationObserverCallChains.set(observer, createAsyncCallChain(enqueueMutationRecordName, callFrames));
@@ skipping 145 matching lines @@
 {
     m_currentAsyncCallChain.clear();
     m_nestedAsyncCallCount = 0;
     ExecutionContextDataMap copy;
     m_executionContextDataMap.swap(copy);
     for (ExecutionContextDataMap::const_iterator it = copy.begin(); it != copy.end(); ++it)
         delete it->value;
 }
 
 } // namespace WebCore