Commit 82ac9dc1 authored by keishi@chromium.org's avatar keishi@chromium.org

Oilpan: Prepare moving XHRReplayData to Oilpan

BUG=340522

Review URL: https://codereview.chromium.org/415013003

git-svn-id: svn://svn.chromium.org/blink/trunk@179099 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 75196390
...@@ -301,6 +301,7 @@ void InspectorResourceAgent::trace(Visitor* visitor) ...@@ -301,6 +301,7 @@ void InspectorResourceAgent::trace(Visitor* visitor)
{ {
visitor->trace(m_pageAgent); visitor->trace(m_pageAgent);
#if ENABLE(OILPAN) #if ENABLE(OILPAN)
visitor->trace(m_pendingXHRReplayData);
visitor->trace(m_replayXHRs); visitor->trace(m_replayXHRs);
visitor->trace(m_replayXHRsToBeDeleted); visitor->trace(m_replayXHRsToBeDeleted);
#endif #endif
...@@ -480,7 +481,7 @@ void InspectorResourceAgent::documentThreadableLoaderStartedLoadingForClient(uns ...@@ -480,7 +481,7 @@ void InspectorResourceAgent::documentThreadableLoaderStartedLoadingForClient(uns
void InspectorResourceAgent::willLoadXHR(XMLHttpRequest* xhr, ThreadableLoaderClient* client, const AtomicString& method, const KURL& url, bool async, FormData* formData, const HTTPHeaderMap& headers, bool includeCredentials) void InspectorResourceAgent::willLoadXHR(XMLHttpRequest* xhr, ThreadableLoaderClient* client, const AtomicString& method, const KURL& url, bool async, FormData* formData, const HTTPHeaderMap& headers, bool includeCredentials)
{ {
ASSERT(xhr); ASSERT(xhr);
RefPtr<XHRReplayData> xhrReplayData = XHRReplayData::create(xhr->executionContext(), method, urlWithoutFragment(url), async, formData, includeCredentials); RefPtrWillBeRawPtr<XHRReplayData> xhrReplayData = XHRReplayData::create(xhr->executionContext(), method, urlWithoutFragment(url), async, formData, includeCredentials);
HTTPHeaderMap::const_iterator end = headers.end(); HTTPHeaderMap::const_iterator end = headers.end();
for (HTTPHeaderMap::const_iterator it = headers.begin(); it!= end; ++it) for (HTTPHeaderMap::const_iterator it = headers.begin(); it!= end; ++it)
xhrReplayData->addHeader(it->key, it->value); xhrReplayData->addHeader(it->key, it->value);
......
...@@ -161,7 +161,7 @@ private: ...@@ -161,7 +161,7 @@ private:
String m_hostId; String m_hostId;
OwnPtr<NetworkResourcesData> m_resourcesData; OwnPtr<NetworkResourcesData> m_resourcesData;
typedef HashMap<ThreadableLoaderClient*, RefPtr<XHRReplayData> > PendingXHRReplayDataMap; typedef WillBeHeapHashMap<ThreadableLoaderClient*, RefPtrWillBeMember<XHRReplayData> > PendingXHRReplayDataMap;
PendingXHRReplayDataMap m_pendingXHRReplayData; PendingXHRReplayDataMap m_pendingXHRReplayData;
typedef HashMap<String, RefPtr<TypeBuilder::Network::Initiator> > FrameNavigationInitiatorMap; typedef HashMap<String, RefPtr<TypeBuilder::Network::Initiator> > FrameNavigationInitiatorMap;
......
...@@ -46,9 +46,9 @@ static size_t maximumSingleResourceContentSize = 10 * 1000 * 1000; ...@@ -46,9 +46,9 @@ static size_t maximumSingleResourceContentSize = 10 * 1000 * 1000;
namespace blink { namespace blink {
PassRefPtr<XHRReplayData> XHRReplayData::create(ExecutionContext* executionContext, const AtomicString& method, const KURL& url, bool async, PassRefPtr<FormData> formData, bool includeCredentials) PassRefPtrWillBeRawPtr<XHRReplayData> XHRReplayData::create(ExecutionContext* executionContext, const AtomicString& method, const KURL& url, bool async, PassRefPtr<FormData> formData, bool includeCredentials)
{ {
return adoptRef(new XHRReplayData(executionContext, method, url, async, formData, includeCredentials)); return adoptRefWillBeNoop(new XHRReplayData(executionContext, method, url, async, formData, includeCredentials));
} }
void XHRReplayData::addHeader(const AtomicString& key, const AtomicString& value) void XHRReplayData::addHeader(const AtomicString& key, const AtomicString& value)
......
...@@ -50,10 +50,10 @@ class SharedBuffer; ...@@ -50,10 +50,10 @@ class SharedBuffer;
class TextResourceDecoder; class TextResourceDecoder;
class XHRReplayData class XHRReplayData
: public RefCounted<XHRReplayData> : public RefCountedWillBeGarbageCollectedFinalized<XHRReplayData>
, public ContextLifecycleObserver { , public ContextLifecycleObserver {
public: public:
static PassRefPtr<XHRReplayData> create(ExecutionContext*, const AtomicString& method, const KURL&, bool async, PassRefPtr<FormData>, bool includeCredentials); static PassRefPtrWillBeRawPtr<XHRReplayData> create(ExecutionContext*, const AtomicString& method, const KURL&, bool async, PassRefPtr<FormData>, bool includeCredentials);
void addHeader(const AtomicString& key, const AtomicString& value); void addHeader(const AtomicString& key, const AtomicString& value);
const AtomicString& method() const { return m_method; } const AtomicString& method() const { return m_method; }
...@@ -63,6 +63,8 @@ public: ...@@ -63,6 +63,8 @@ public:
const HTTPHeaderMap& headers() const { return m_headers; } const HTTPHeaderMap& headers() const { return m_headers; }
bool includeCredentials() const { return m_includeCredentials; } bool includeCredentials() const { return m_includeCredentials; }
void trace(Visitor*) { }
private: private:
XHRReplayData(ExecutionContext*, const AtomicString& method, const KURL&, bool async, PassRefPtr<FormData>, bool includeCredentials); XHRReplayData(ExecutionContext*, const AtomicString& method, const KURL&, bool async, PassRefPtr<FormData>, bool includeCredentials);
...@@ -134,7 +136,7 @@ public: ...@@ -134,7 +136,7 @@ public:
String m_frameId; String m_frameId;
KURL m_url; KURL m_url;
String m_content; String m_content;
RefPtr<XHRReplayData> m_xhrReplayData; RefPtrWillBePersistent<XHRReplayData> m_xhrReplayData;
bool m_base64Encoded; bool m_base64Encoded;
RefPtr<SharedBuffer> m_dataBuffer; RefPtr<SharedBuffer> m_dataBuffer;
bool m_isContentEvicted; bool m_isContentEvicted;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment