[Resource Timing] Memory cached resources should be reported on first use.

Source/core/fetch/ResourceFetcher.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 147 matching lines @@
     Resource* resource = createResource(Resource::Image, request, charset);
     resource->setOptions(resourceOptions);
     resource->responseReceived(response);
     // FIXME: AppendData causes an unnecessary memcpy.
     if (data->size())
         resource->appendData(data->data(), data->size());
     resource->finish();
     return resource;
 }
 
+static void reportResourceTiming(ResourceTimingInfo* info, Resource* resource, double finishTime, Document* initiatorDocument, bool clearLoadTimings)
+{
+    if (resource->type() == Resource::MainResource)
+        initiatorDocument = initiatorDocument->parentDocument();
+    ASSERT(initiatorDocument);
+    info->setInitialRequest(resource->resourceRequest());
+    info->setFinalResponse(resource->response());
+    if (clearLoadTimings)
+        info->clearLoadTimings();
+    info->setLoadFinishTime(finishTime);
+    if (DOMWindow* initiatorWindow = initiatorDocument->domWindow()) {
+        if (Performance* performance = initiatorWindow->performance())
+            performance->addResourceTiming(*info, initiatorDocument);
+    }
+}
+
 ResourceFetcher::ResourceFetcher(DocumentLoader* documentLoader)
     : m_document(0)
     , m_documentLoader(documentLoader)
     , m_requestCount(0)
     , m_garbageCollectDocumentResourcesTimer(this, &ResourceFetcher::garbageCollectDocumentResourcesTimerFired)
     , m_autoLoadImages(true)
     , m_imagesEnabled(true)
     , m_allowStaleResources(false)
 {
 }
@@ skipping 433 matching lines @@
     // Ensure main resources aren't preloaded, and other main resource loads
     // are removed from cache to prevent reuse.
     if (type == Resource::MainResource) {
         ASSERT(policy != Use);
         ASSERT(policy != Revalidate);
         memoryCache()->remove(resource.get());
         if (request.forPreload())
             return 0;
     }
 
-    if (!request.resourceRequest().url().protocolIsData())
+    if (!request.resourceRequest().url().protocolIsData()) {
+        if (policy == Use && !m_validatedURLs.contains(request.resourceRequest().url())) {
+            // Resources loaded from memory cache should be reported the first time they're used.
+            RefPtr<ResourceTimingInfo> info = ResourceTimingInfo::create(request.options().initiatorInfo.name, monotonicallyIncreasingTime());
+            reportResourceTiming(info.get(), resource.get(), monotonicallyIncreasingTime(), document(), true);
+        }
+
         m_validatedURLs.add(request.resourceRequest().url());
+    }
 
     ASSERT(resource->url() == url.string());
     m_documentResources.set(resource->url(), resource);
     return resource;
 }
 
 void ResourceFetcher::determineTargetType(ResourceRequest& request, Resource::Type type)
 {
     ResourceRequest::TargetType targetType;
 
@@ skipping 323 matching lines @@
 }
 
 void ResourceFetcher::didLoadResource(Resource* resource)
 {
     RefPtr<DocumentLoader> protectDocumentLoader(m_documentLoader);
     RefPtr<Document> protectDocument(m_document);
 
     if (resource && resource->response().isHTTP() && ((!resource->errorOccurred() && !resource->wasCanceled()) || resource->response().httpStatusCode() == 304) && document()) {
         ResourceTimingInfoMap::iterator it = m_resourceTimingInfoMap.find(resource);
         if (it != m_resourceTimingInfoMap.end()) {
-            Document* initiatorDocument = document();
-            if (resource->type() == Resource::MainResource)
-                initiatorDocument = document()->parentDocument();
-            ASSERT(initiatorDocument);
             RefPtr<ResourceTimingInfo> info = it->value;
             m_resourceTimingInfoMap.remove(it);
-            info->setInitialRequest(resource->resourceRequest());
-            info->setFinalResponse(resource->response());
-            info->setLoadFinishTime(resource->loadFinishTime());
-            if (DOMWindow* initiatorWindow = initiatorDocument->domWindow()) {
-                if (Performance* performance = initiatorWindow->performance())
-                    performance->addResourceTiming(*info, initiatorDocument);
-            }
+            reportResourceTiming(info.get(), resource, resource->loadFinishTime(), document(), false);
         }
     }
 
     if (frame())
         frame()->loader()->loadDone();
     performPostLoadActions();
 
     if (!m_garbageCollectDocumentResourcesTimer.isActive())
         m_garbageCollectDocumentResourcesTimer.startOneShot(0);
 }
@@ skipping 332 matching lines @@
 }
 #endif
 
 const ResourceLoaderOptions& ResourceFetcher::defaultResourceOptions()
 {
     DEFINE_STATIC_LOCAL(ResourceLoaderOptions, options, (SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, ClientRequestedCredentials, AskClientForCrossOriginCredentials, DoSecurityCheck, CheckContentSecurityPolicy, UseDefaultOriginRestrictionsForType, DocumentContext));
     return options;
 }
 
 }