Oilpan: move NetworkResourcesData to the heap.

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

 /*
  * Copyright (C) 2011 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:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 64 matching lines @@
     : m_requestId(requestId)
     , m_loaderId(loaderId)
     , m_base64Encoded(false)
     , m_isContentEvicted(false)
     , m_type(InspectorPageAgent::OtherResource)
     , m_httpStatusCode(0)
     , m_cachedResource(nullptr)
 {
 }
 
+DEFINE_TRACE(NetworkResourcesData::ResourceData)
+{
+    visitor->trace(m_xhrReplayData);
+    visitor->trace(m_cachedResource);
+}
+
 void NetworkResourcesData::ResourceData::setContent(const String& content, bool base64Encoded)
 {
     ASSERT(!hasData());
     ASSERT(!hasContent());
     m_content = content;
     m_base64Encoded = base64Encoded;
 }
 
 static size_t contentSizeInBytes(const String& content)
 {
@@ skipping 50 matching lines @@
 // NetworkResourcesData
 NetworkResourcesData::NetworkResourcesData()
     : m_contentSize(0)
     , m_maximumResourcesContentSize(maximumResourcesContentSize)
     , m_maximumSingleResourceContentSize(maximumSingleResourceContentSize)
 {
 }
 
 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)
 {
     ensureNoDataForRequestId(requestId);
     m_requestIdToResourceDataMap.set(requestId, new ResourceData(requestId, loaderId));
 }
 
 void NetworkResourcesData::responseReceived(const String& requestId, const String& frameId, const ResourceResponse& response)
 {
@@ skipping 122 matching lines @@
         for (auto& request : m_reusedXHRReplayDataRequestIds) {
             if (request.value == requestId)
                 setXHRReplayData(request.key, xhrReplayData);
         }
         return;
     }
 
     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;
 }
 
 Vector<String> NetworkResourcesData::removeResource(Resource* cachedResource)
 {
     Vector<String> result;
     for (auto& request : m_requestIdToResourceDataMap) {
         ResourceData* resourceData = request.value;
@@ skipping 10 matching lines @@
 {
     m_requestIdsDeque.clear();
     m_contentSize = 0;
 
     ResourceDataMap preservedMap;
 
     for (auto& resource : m_requestIdToResourceDataMap) {
         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);
 
     m_reusedXHRReplayDataRequestIds.clear();
     m_maximumResourcesContentSize = maximumResourcesContentSize;
     m_maximumSingleResourceContentSize = maximumSingleResourceContentSize;
 }
 
 void NetworkResourcesData::setResourcesDataSizeLimits(size_t resourcesContentSize, size_t singleResourceContentSize)
 {
     clear();
     m_maximumResourcesContentSize = resourcesContentSize;
     m_maximumSingleResourceContentSize = singleResourceContentSize;
 }
 
 NetworkResourcesData::ResourceData* NetworkResourcesData::resourceDataForRequestId(const String& requestId)
 {
     if (requestId.isNull())
         return 0;
     return m_requestIdToResourceDataMap.get(requestId);
 }
 
 void NetworkResourcesData::ensureNoDataForRequestId(const String& requestId)
 {
     ResourceData* resourceData = resourceDataForRequestId(requestId);
     if (!resourceData)
         return;
     if (resourceData->hasContent() || resourceData->hasData())
         m_contentSize -= resourceData->evictContent();
+#if !ENABLE(OILPAN)
     delete resourceData;
+#endif
     m_requestIdToResourceDataMap.remove(requestId);
 }
 
 bool NetworkResourcesData::ensureFreeSpace(size_t size)
 {
     if (size > m_maximumResourcesContentSize)
         return false;
 
     while (size > m_maximumResourcesContentSize - m_contentSize) {
         String requestId = m_requestIdsDeque.takeFirst();
         ResourceData* resourceData = resourceDataForRequestId(requestId);
         if (resourceData)
             m_contentSize -= resourceData->evictContent();
     }
     return true;
 }
 
 } // namespace blink
-