Prepare to add more initiator info to CachedResource(Request)

Source/core/loader/cache/CachedResourceLoader.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 551 matching lines @@
     CachedResourceHandle<CachedResource> resource = createResource(type, request.mutableResourceRequest(), charset);
 
     if (!memoryCache()->add(resource.get()))
         resource->setOwningCachedResourceLoader(this);
     storeResourceTimingInitiatorInformation(resource, request);
     return resource;
 }
 
 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
 {
     if (!existingResource)
         return Load;
 
     // We already have a preload going for this URL.
     if (forPreload && existingResource->isPreloaded())
         return Use;
@@ skipping 166 matching lines @@
 #endif
     m_documentResources.remove(resource->url());
 }
 
 void CachedResourceLoader::loadDone(CachedResource* resource)
 {
     RefPtr<DocumentLoader> protectDocumentLoader(m_documentLoader);
     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);
         }
     }
 
     if (frame())
         frame()->loader()->loadDone();
     performPostLoadActions();
 
     if (!m_garbageCollectDocumentResourcesTimer.isActive())
         m_garbageCollectDocumentResourcesTimer.startOneShot(0);
 }
@@ skipping 212 matching lines @@
 void CachedResourceLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
     info.addMember(m_documentResources, "documentResources");
     info.addMember(m_document, "document");
     info.addMember(m_documentLoader, "documentLoader");
     info.addMember(m_validatedURLs, "validatedURLs");
     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()
 {
     static ResourceLoaderOptions options(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, ClientRequestedCredentials, AskClientForCrossOriginCredentials, DoSecurityCheck);
     return options;
 }
 
 }