1 files changed, 7 insertions, 52 deletions

diff --git a/Source/WebCore/inspector/NetworkResourcesData.h b/Source/WebCore/inspector/NetworkResourcesData.h
index 1a429481a..52dce685d 100644
--- a/Source/WebCore/inspector/NetworkResourcesData.h
+++ b/Source/WebCore/inspector/NetworkResourcesData.h
@@ -26,50 +26,19 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef NetworkResourcesData_h
-#define NetworkResourcesData_h
+#pragma once
 
-#include "HTTPHeaderMap.h"
 #include "InspectorPageAgent.h"
-#include "URL.h"
 #include "TextResourceDecoder.h"
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
-#include <wtf/RefCounted.h>
-#include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
 
-#if ENABLE(INSPECTOR)
-
 namespace WebCore {
 
 class CachedResource;
-class FormData;
 class ResourceResponse;
 class SharedBuffer;
-class TextResourceDecoder;
-
-class XHRReplayData : public RefCounted<XHRReplayData> {
-public:
-    static PassRefPtr<XHRReplayData> create(const String &method, const URL&, bool async, PassRefPtr<FormData>, bool includeCredentials);
-
-    void addHeader(const AtomicString& key, const String& value);
-    const String& method() const { return m_method; }
-    const URL& url() const { return m_url; }
-    bool async() const { return m_async; }
-    PassRefPtr<FormData> formData() const { return m_formData; }
-    const HTTPHeaderMap& headers() const { return m_headers; }
-    bool includeCredentials() const { return m_includeCredentials; }
-private:
-    XHRReplayData(const String &method, const URL&, bool async, PassRefPtr<FormData>, bool includeCredentials);
-
-    String m_method;
-    URL m_url;
-    bool m_async;
-    RefPtr<FormData> m_formData;
-    HTTPHeaderMap m_headers;
-    bool m_includeCredentials;
-};
 
 class NetworkResourcesData {
     WTF_MAKE_FAST_ALLOCATED;
@@ -108,18 +77,15 @@ public:
         String textEncodingName() const { return m_textEncodingName; }
         void setTextEncodingName(const String& textEncodingName) { m_textEncodingName = textEncodingName; }
 
-        PassRefPtr<TextResourceDecoder> decoder() const { return m_decoder; }
-        void setDecoder(PassRefPtr<TextResourceDecoder> decoder) { m_decoder = decoder; }
+        RefPtr<TextResourceDecoder> decoder() const { return m_decoder.copyRef(); }
+        void setDecoder(RefPtr<TextResourceDecoder>&& decoder) { m_decoder = WTFMove(decoder); }
 
-        PassRefPtr<SharedBuffer> buffer() const { return m_buffer; }
-        void setBuffer(PassRefPtr<SharedBuffer> buffer) { m_buffer = buffer; }
+        RefPtr<SharedBuffer> buffer() const { return m_buffer.copyRef(); }
+        void setBuffer(RefPtr<SharedBuffer>&& buffer) { m_buffer = WTFMove(buffer); }
 
         CachedResource* cachedResource() const { return m_cachedResource; }
         void setCachedResource(CachedResource* cachedResource) { m_cachedResource = cachedResource; }
 
-        XHRReplayData* xhrReplayData() const { return m_xhrReplayData.get(); }
-        void setXHRReplayData(XHRReplayData* xhrReplayData) { m_xhrReplayData = xhrReplayData; }
-
     private:
         bool hasData() const { return m_dataBuffer; }
         size_t dataLength() const;
@@ -131,7 +97,6 @@ public:
         String m_frameId;
         String m_url;
         String m_content;
-        RefPtr<XHRReplayData> m_xhrReplayData;
         bool m_base64Encoded;
         RefPtr<SharedBuffer> m_dataBuffer;
         bool m_isContentEvicted;
@@ -157,15 +122,11 @@ public:
     void maybeAddResourceData(const String& requestId, const char* data, size_t dataLength);
     void maybeDecodeDataToContent(const String& requestId);
     void addCachedResource(const String& requestId, CachedResource*);
-    void addResourceSharedBuffer(const String& requestId, PassRefPtr<SharedBuffer>, const String& textEncodingName);
+    void addResourceSharedBuffer(const String& requestId, RefPtr<SharedBuffer>&&, const String& textEncodingName);
     ResourceData const* data(const String& requestId);
     Vector<String> removeCachedResource(CachedResource*);
     void clear(const String& preservedLoaderId = String());
-
-    void setResourcesDataSizeLimits(size_t maximumResourcesContentSize, size_t maximumSingleResourceContentSize);
-    void setXHRReplayData(const String& requestId, XHRReplayData*);
-    void reuseXHRReplayData(const String& requestId, const String& reusedRequestId);
-    XHRReplayData* xhrReplayData(const String& requestId);
+    Vector<ResourceData*> resources();
 
 private:
     ResourceData* resourceDataForRequestId(const String& requestId);
@@ -174,8 +135,6 @@ private:
 
     Deque<String> m_requestIdsDeque;
 
-    typedef HashMap<String, String> ReusedRequestIds;
-    ReusedRequestIds m_reusedXHRReplayDataRequestIds;
     typedef HashMap<String, ResourceData*> ResourceDataMap;
     ResourceDataMap m_requestIdToResourceDataMap;
     size_t m_contentSize;
@@ -184,7 +143,3 @@ private:
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(NetworkResourcesData_h)