DevTools: add support for logging fetch requests when XHR logging is enabled

Source/core/inspector/InspectorResourceAgent.h

 /*
  * 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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef InspectorResourceAgent_h
 #define InspectorResourceAgent_h
 
 #include "bindings/core/v8/ScriptString.h"
 #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"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class Resource;
 struct FetchInitiatorInfo;
 class Document;
@@ skipping 44 matching lines @@
     void didCommitLoad(LocalFrame*, DocumentLoader*);
     void scriptImported(unsigned long identifier, const String& sourceString);
     void didReceiveScriptResponse(unsigned long identifier);
     bool shouldForceCORSPreflight();
 
     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(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*);
 
     void willDestroyResource(Resource*);
 
     void applyUserAgentOverride(String* userAgent);
 
     // FIXME: InspectorResourceAgent should not be aware of style recalculation.
     void willRecalculateStyle(Document*);
@@ skipping 33 matching lines @@
     void setHostId(const String&);
     bool fetchResourceContent(Document*, const KURL&, String* content, bool* base64Encoded);
 
 private:
     explicit InspectorResourceAgent(InspectorPageAgent*);
 
     void enable();
     void delayedRemoveReplayXHR(XMLHttpRequest*);
     void removeFinishedReplayXHRFired(Timer<InspectorResourceAgent>*);
     void didFinishXHRInternal(ExecutionContext*, XMLHttpRequest*, ThreadableLoaderClient*, const AtomicString&, const String&, bool);
+    void completeFetch(ThreadableLoaderClient*);
 
     bool getResponseBodyBlob(const String& requestId, PassRefPtrWillBeRawPtr<GetResponseBodyCallback>);
 
     RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;
     String m_userAgentOverride;
     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;
+    // 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;
 
     // FIXME: InspectorResourceAgent should now be aware of style recalculation.
     RefPtr<TypeBuilder::Network::Initiator> m_styleRecalculationInitiator;
     bool m_isRecalculatingStyle;
 
     PersistentHeapHashSetWillBeHeapHashSet<Member<XMLHttpRequest>> m_replayXHRs;
     PersistentHeapHashSetWillBeHeapHashSet<Member<XMLHttpRequest>> m_replayXHRsToBeDeleted;
     Timer<InspectorResourceAgent> m_removeFinishedReplayXHRTimer;
 };
 
 } // namespace blink
 
 
 #endif // !defined(InspectorResourceAgent_h)