Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Unified Diff: third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp

Issue 1436793002: Oilpan: move NetworkResourcesData to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/inspector/NetworkResourcesData.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp
diff --git a/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp b/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp
index dc76af47da5badd60263858a78e441da0114d52e..f4e086c30cd284a48421b1b1cb19bf3b888c9ac5 100644
--- a/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp
+++ b/third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp
@@ -82,6 +82,12 @@ NetworkResourcesData::ResourceData::ResourceData(const String& requestId, const
{
}
+DEFINE_TRACE(NetworkResourcesData::ResourceData)
+{
+ visitor->trace(m_xhrReplayData);
+ visitor->trace(m_cachedResource);
+}
+
void NetworkResourcesData::ResourceData::setContent(const String& content, bool base64Encoded)
{
ASSERT(!hasData());
@@ -155,6 +161,11 @@ NetworkResourcesData::~NetworkResourcesData()
clear();
haraken 2015/11/11 10:11:27 It seems this destructor touches m_requestIdToReso
sof 2015/11/11 10:13:25 Quite right, didn't catch that in ps#1. No need to
}
+DEFINE_TRACE(NetworkResourcesData)
+{
+ visitor->trace(m_requestIdToResourceDataMap);
+}
+
void NetworkResourcesData::resourceCreated(const String& requestId, const String& loaderId)
{
ensureNoDataForRequestId(requestId);
@@ -295,9 +306,9 @@ void NetworkResourcesData::setXHRReplayData(const String& requestId, XHRReplayDa
resourceData->setXHRReplayData(xhrReplayData);
}
-Vector<NetworkResourcesData::ResourceData*> NetworkResourcesData::resources()
+WillBeHeapVector<RawPtrWillBeMember<NetworkResourcesData::ResourceData>> NetworkResourcesData::resources()
{
- Vector<ResourceData*> result;
+ WillBeHeapVector<RawPtrWillBeMember<ResourceData>> result;
for (auto& request : m_requestIdToResourceDataMap)
result.append(request.value);
return result;
@@ -378,4 +389,3 @@ bool NetworkResourcesData::ensureFreeSpace(size_t size)
}
} // namespace blink
-
« no previous file with comments | « third_party/WebKit/Source/core/inspector/NetworkResourcesData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698