| Index: Source/core/inspector/InspectorResourceAgent.h
|
| diff --git a/Source/core/inspector/InspectorResourceAgent.h b/Source/core/inspector/InspectorResourceAgent.h
|
| index 06dd33541240c0688866f71f3868374a3d4fba5e..5a24519b9c29480e1de7bdcd555c1a29989a8b25 100644
|
| --- a/Source/core/inspector/InspectorResourceAgent.h
|
| +++ b/Source/core/inspector/InspectorResourceAgent.h
|
| @@ -96,8 +96,8 @@ public:
|
|
|
| void documentThreadableLoaderStartedLoadingForClient(unsigned long identifier, ThreadableLoaderClient*);
|
| void willLoadXHR(XMLHttpRequest*, ThreadableLoaderClient*, const AtomicString& method, const KURL&, bool async, PassRefPtr<FormData> body, const HTTPHeaderMap& headers, bool includeCrendentials);
|
| - void didFailXHRLoading(XMLHttpRequest*, ThreadableLoaderClient*);
|
| - void didFinishXHRLoading(ExecutionContext*, XMLHttpRequest*, ThreadableLoaderClient*, unsigned long identifier, ScriptString sourceString, const AtomicString&, const String&);
|
| + void didFailXHRLoading(ExecutionContext*, XMLHttpRequest*, ThreadableLoaderClient*, const AtomicString&, const String&);
|
| + void didFinishXHRLoading(ExecutionContext*, XMLHttpRequest*, ThreadableLoaderClient*, const AtomicString&, const String&);
|
|
|
| void willSendEventSourceRequest(ThreadableLoaderClient*);
|
| void willDispachEventSourceEvent(ThreadableLoaderClient*, const AtomicString& eventName, const AtomicString& eventId, const Vector<UChar>& data);
|
| @@ -151,6 +151,7 @@ private:
|
| void enable();
|
| void delayedRemoveReplayXHR(XMLHttpRequest*);
|
| void removeFinishedReplayXHRFired(Timer<InspectorResourceAgent>*);
|
| + void didFinishXHRInternal(ExecutionContext*, XMLHttpRequest*, ThreadableLoaderClient*, const AtomicString&, const String&, bool);
|
|
|
| bool getResponseBodyBlob(const String& requestId, PassRefPtrWillBeRawPtr<GetResponseBodyCallback>);
|
|
|
| @@ -159,11 +160,14 @@ private:
|
| String m_hostId;
|
| OwnPtr<NetworkResourcesData> m_resourcesData;
|
|
|
| + typedef HashMap<ThreadableLoaderClient*, unsigned long> ThreadableLoaderClientRequestIdMap;
|
| +
|
| // Stores the data for replaying XHR until an identifier for the load is
|
| // generated by the loader and passed to the inspector via the
|
| // documentThreadableLoaderStartedLoadingForClient() method.
|
| ThreadableLoaderClient* m_pendingXHR;
|
| RefPtrWillBeMember<XHRReplayData> m_pendingXHRReplayData;
|
| + ThreadableLoaderClientRequestIdMap m_xhrRequestIdMap;
|
|
|
| // Stores the pointer to the ThreadableLoaderClient for an EventSource
|
| // (actually, the EventSource instance itself) for which a loader is being
|
| @@ -176,8 +180,7 @@ private:
|
| // the creation of the loader, it's unnecessary to store the pointer to a
|
| // map.
|
| ThreadableLoaderClient* m_pendingEventSource;
|
| - typedef HashMap<ThreadableLoaderClient*, unsigned long> EventSourceRequestIdMap;
|
| - EventSourceRequestIdMap m_eventSourceRequestIdMap;
|
| + ThreadableLoaderClientRequestIdMap m_eventSourceRequestIdMap;
|
|
|
| typedef HashMap<String, RefPtr<TypeBuilder::Network::Initiator> > FrameNavigationInitiatorMap;
|
| FrameNavigationInitiatorMap m_frameNavigationInitiatorMap;
|
|
|