Oilpan: move NetworkResourcesData to the heap.

third_party/WebKit/Source/core/inspector/NetworkResourcesData.cpp

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..385807febfa38df93a916a7dc9774b7fa6173b23 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());
@@ -152,7 +158,16 @@ NetworkResourcesData::NetworkResourcesData()
 
 NetworkResourcesData::~NetworkResourcesData()
 {
+#if !ENABLE(OILPAN)
     clear();
+#endif
+}
+
+DEFINE_TRACE(NetworkResourcesData)
+{
+#if ENABLE(OILPAN)
+    visitor->trace(m_requestIdToResourceDataMap);
+#endif
 }
 
 void NetworkResourcesData::resourceCreated(const String& requestId, const String& loaderId)
@@ -295,9 +310,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;
@@ -328,8 +343,10 @@ void NetworkResourcesData::clear(const String& preservedLoaderId)
         ResourceData* resourceData = resource.value;
         if (!preservedLoaderId.isNull() && resourceData->loaderId() == preservedLoaderId)
             preservedMap.set(resource.key, resource.value);
+#if !ENABLE(OILPAN)
         else
             delete resourceData;
+#endif
     }
     m_requestIdToResourceDataMap.swap(preservedMap);
 
@@ -359,7 +376,9 @@ void NetworkResourcesData::ensureNoDataForRequestId(const String& requestId)
         return;
     if (resourceData->hasContent() || resourceData->hasData())
         m_contentSize -= resourceData->evictContent();
+#if !ENABLE(OILPAN)
     delete resourceData;
+#endif
     m_requestIdToResourceDataMap.remove(requestId);
 }
 
@@ -378,4 +397,3 @@ bool NetworkResourcesData::ensureFreeSpace(size_t size)
 }
 
 } // namespace blink
-