| Index: Source/core/inspector/InspectorResourceAgent.h
|
| diff --git a/Source/core/inspector/InspectorResourceAgent.h b/Source/core/inspector/InspectorResourceAgent.h
|
| index 45822016801d4022d8518a7ec30c65f0f4b9d0b1..f2fe916fe4e8c58b43e7c6d3f03d1dee26dfe145 100644
|
| --- a/Source/core/inspector/InspectorResourceAgent.h
|
| +++ b/Source/core/inspector/InspectorResourceAgent.h
|
| @@ -35,6 +35,7 @@
|
| #include "core/CoreExport.h"
|
| #include "core/InspectorFrontend.h"
|
| #include "core/inspector/InspectorBaseAgent.h"
|
| +#include "core/inspector/InspectorPageAgent.h"
|
| #include "platform/Timer.h"
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/PassOwnPtr.h"
|
| @@ -99,6 +100,10 @@ public:
|
| void didFailXHRLoading(ExecutionContext*, XMLHttpRequest*, ThreadableLoaderClient*, const AtomicString&, const String&);
|
| void didFinishXHRLoading(ExecutionContext*, XMLHttpRequest*, ThreadableLoaderClient*, const AtomicString&, const String&);
|
|
|
| + void willStartFetch(ThreadableLoaderClient*);
|
| + void didFailFetch(ThreadableLoaderClient*);
|
| + void didFinishFetch(ExecutionContext*, ThreadableLoaderClient*, const AtomicString& method, const String& url);
|
| +
|
| void willSendEventSourceRequest(ThreadableLoaderClient*);
|
| void willDispachEventSourceEvent(ThreadableLoaderClient*, const AtomicString& eventName, const AtomicString& eventId, const Vector<UChar>& data);
|
| void didFinishEventSourceRequest(ThreadableLoaderClient*);
|
| @@ -162,25 +167,14 @@ private:
|
|
|
| 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;
|
| + // Stores the pending ThreadableLoaderClient till an identifier for
|
| + // the load is generated by the loader and passed to the inspector
|
| + // via the documentThreadableLoaderStartedLoadingForClient() method.
|
| + ThreadableLoaderClient* m_pendingRequest;
|
| + InspectorPageAgent::ResourceType m_pendingRequestType;
|
| + ThreadableLoaderClientRequestIdMap m_knownRequestIdMap;
|
| +
|
| 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
|
| - // initialized, until an identifier for the load is generated by the loader
|
| - // and passed to the inspector via the
|
| - // documentThreadableLoaderStartedLoadingForClient() method.
|
| - //
|
| - // Since the DocumentThreadableLoader may call
|
| - // documentThreadableLoaderStartedLoadingForClient() only synchronously to
|
| - // the creation of the loader, it's unnecessary to store the pointer to a
|
| - // map.
|
| - ThreadableLoaderClient* m_pendingEventSource;
|
| - ThreadableLoaderClientRequestIdMap m_eventSourceRequestIdMap;
|
|
|
| typedef HashMap<String, RefPtr<TypeBuilder::Network::Initiator> > FrameNavigationInitiatorMap;
|
| FrameNavigationInitiatorMap m_frameNavigationInitiatorMap;
|
|
|