Prepare to add more initiator info to CachedResource(Request)

Source/core/loader/cache/CachedResourceLoader.cpp

Index: Source/core/loader/cache/CachedResourceLoader.cpp
diff --git a/Source/core/loader/cache/CachedResourceLoader.cpp b/Source/core/loader/cache/CachedResourceLoader.cpp
index 3b17400c14d297570415ab8648c69ea3b97a650e..f55121fb8729f6ec0f0629596cb677220598bf85 100644
--- a/Source/core/loader/cache/CachedResourceLoader.cpp
+++ b/Source/core/loader/cache/CachedResourceLoader.cpp
@@ -569,17 +569,17 @@ CachedResourceHandle<CachedResource> CachedResourceLoader::loadResource(CachedRe
 
 void CachedResourceLoader::storeResourceTimingInitiatorInformation(const CachedResourceHandle<CachedResource>& resource, const CachedResourceRequest& request)
 {
-    if (resource->type() == CachedResource::MainResource) {
+    CachedResourceInitiatorInfo info = request.initiatorInfo();
+    info.startTime = monotonicallyIncreasingTime();
+    if ((resource->type() == CachedResource::MainResource) && frame()->ownerElement()) {
+        info.name = frame()->ownerElement()->localName();
         // <iframe>s should report the initial navigation requested by the parent document, but not subsequent navigations.
-        if (frame()->ownerElement() && !frame()->ownerElement()->loadedNonEmptyDocument()) {
-            InitiatorInfo info = { frame()->ownerElement()->localName(), monotonicallyIncreasingTime() };
-            m_initiatorMap.add(resource.get(), info);
+        if (!frame()->ownerElement()->loadedNonEmptyDocument()) {
+            info.isInitialFrameLoad = true;
             frame()->ownerElement()->didLoadNonEmptyDocument();
         }
-    } else {
-        InitiatorInfo info = { request.initiatorName(), monotonicallyIncreasingTime() };
-        m_initiatorMap.add(resource.get(), info);
     }
+    resource->setInitiatorInfo(info);

[James Simonsen, 2013/05/16 13:28:54]

The initiator info is different depending on which document is requesting the
resource. I think it'll be awkward to keep track of that inside the resource.
That's why we put the map on the CachedResourceLoader.

[eustas, 2013/05/16 14:26:54]

I see that CachedResource initiatorInfo is set once per load and used only once
for performance timing.

Perhaps initiatorInfo should be removed when CachedResource is loaded.

Performance timing is reported only for loaded entries, not for taken from
cache.

So there is no need to keep initiatorInfo in CachedResourceLoader.

 }
 
 CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalidationPolicy(CachedResource::Type type, ResourceRequest& request, bool forPreload, CachedResource* existingResource, CachedResourceRequest::DeferOption defer) const
@@ -766,16 +766,15 @@ void CachedResourceLoader::loadDone(CachedResource* resource)
     RefPtr<Document> protectDocument(m_document);
 
     if (resource && resource->response().isHTTP() && ((!resource->errorOccurred() && !resource->wasCanceled()) || resource->response().httpStatusCode() == 304)) {
-        HashMap<CachedResource*, InitiatorInfo>::iterator initiatorIt = m_initiatorMap.find(resource);
-        if (initiatorIt != m_initiatorMap.end()) {
+        const CachedResourceInitiatorInfo& info = resource->initiatorInfo();
+        bool isMainResource = resource->type() == CachedResource::MainResource;
+        if ((resource->type() != CachedResource::MainResource) || info.isInitialFrameLoad) {
             ASSERT(document());
             Document* initiatorDocument = document();
-            if (resource->type() == CachedResource::MainResource)
+            if (info.isInitialFrameLoad)
                 initiatorDocument = document()->parentDocument();
             ASSERT(initiatorDocument);
-            const InitiatorInfo& info = initiatorIt->value;
             initiatorDocument->domWindow()->performance()->addResourceTiming(info.name, initiatorDocument, resource->resourceRequest(), resource->response(), info.startTime, resource->loadFinishTime());
-            m_initiatorMap.remove(initiatorIt);
         }
     }
 
@@ -1008,8 +1007,6 @@ void CachedResourceLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo)
     info.addMember(m_preloads, "preloads");
     info.addMember(m_pendingPreloads, "pendingPreloads");
     info.addMember(m_garbageCollectDocumentResourcesTimer, "garbageCollectDocumentResourcesTimer");
-    // FIXME: m_initiatorMap has pointers to already deleted CachedResources
-    info.ignoreMember(m_initiatorMap);
 }
 
 const ResourceLoaderOptions& CachedResourceLoader::defaultCachedResourceOptions()