- Revision
- 136439
- Author
- [email protected]
- Date
- 2012-12-03 14:20:47 -0800 (Mon, 03 Dec 2012)
Log Message
[Resource Timing] Record and report initiator
https://bugs.webkit.org/show_bug.cgi?id=103777
Reviewed by Nate Chapin.
This will start populating the Resource Timing buffer with entries. The initiator will be
recorded for each CachedResourceLoader. This should match the next update of the spec.
Tests: http/tests/w3c/webperf/submission/resource-timing
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::beginLoadTimerFired):
* loader/ResourceLoadNotifier.cpp: Always record timing information if ENABLE(RESOURCE_TIMING).
(WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::releaseResources): Report the actual resource that called loadDone().
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::loadResource): Record the initiator.
(WebCore::CachedResourceLoader::loadDone): Record the entry in Resource Timing.
* loader/cache/CachedResourceLoader.h:
(CachedResourceLoader):
(InitiatorInfo):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (136438 => 136439)
--- trunk/Source/WebCore/ChangeLog 2012-12-03 22:03:24 UTC (rev 136438)
+++ trunk/Source/WebCore/ChangeLog 2012-12-03 22:20:47 UTC (rev 136439)
@@ -1,3 +1,28 @@
+2012-11-30 James Simonsen <[email protected]>
+
+ [Resource Timing] Record and report initiator
+ https://bugs.webkit.org/show_bug.cgi?id=103777
+
+ Reviewed by Nate Chapin.
+
+ This will start populating the Resource Timing buffer with entries. The initiator will be
+ recorded for each CachedResourceLoader. This should match the next update of the spec.
+
+ Tests: http/tests/w3c/webperf/submission/resource-timing
+
+ * css/CSSFontSelector.cpp:
+ (WebCore::CSSFontSelector::beginLoadTimerFired):
+ * loader/ResourceLoadNotifier.cpp: Always record timing information if ENABLE(RESOURCE_TIMING).
+ (WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::releaseResources): Report the actual resource that called loadDone().
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::loadResource): Record the initiator.
+ (WebCore::CachedResourceLoader::loadDone): Record the entry in Resource Timing.
+ * loader/cache/CachedResourceLoader.h:
+ (CachedResourceLoader):
+ (InitiatorInfo):
+
2012-12-03 Florin Malita <[email protected]>
[Skia] Deferred SkCanvas save()
Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (136438 => 136439)
--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2012-12-03 22:03:24 UTC (rev 136438)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2012-12-03 22:20:47 UTC (rev 136439)
@@ -588,7 +588,7 @@
cachedResourceLoader->decrementRequestCount(fontsToBeginLoading[i].get());
}
// Ensure that if the request count reaches zero, the frame loader will know about it.
- cachedResourceLoader->loadDone();
+ cachedResourceLoader->loadDone(0);
// New font loads may be triggered by layout after the document load is complete but before we have dispatched
// didFinishLoading for the frame. Make sure the delegate is always dispatched by checking explicitly.
if (m_document && m_document->frame())
Modified: trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp (136438 => 136439)
--- trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2012-12-03 22:03:24 UTC (rev 136438)
+++ trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2012-12-03 22:20:47 UTC (rev 136439)
@@ -121,6 +121,10 @@
// Report WebTiming for all frames.
if (loader && !request.isNull() && request.url() == loader->requestURL())
request.setReportLoadTiming(true);
+
+#if ENABLE(RESOURCE_TIMING)
+ request.setReportLoadTiming(true);
+#endif
}
void ResourceLoadNotifier::dispatchDidReceiveResponse(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r, ResourceLoader* resourceLoader)
Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (136438 => 136439)
--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2012-12-03 22:03:24 UTC (rev 136438)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2012-12-03 22:20:47 UTC (rev 136439)
@@ -315,7 +315,7 @@
ASSERT(!reachedTerminalState());
if (m_state != Uninitialized) {
m_requestCountTracker.clear();
- m_documentLoader->cachedResourceLoader()->loadDone();
+ m_documentLoader->cachedResourceLoader()->loadDone(m_resource);
if (reachedTerminalState())
return;
m_resource->stopLoading();
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (136438 => 136439)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2012-12-03 22:03:24 UTC (rev 136438)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2012-12-03 22:20:47 UTC (rev 136439)
@@ -67,6 +67,10 @@
#include "CachedShader.h"
#endif
+#if ENABLE(RESOURCE_TIMING)
+#include "Performance.h"
+#endif
+
#define PRELOAD_DEBUG 0
namespace WebCore {
@@ -449,7 +453,7 @@
resource = loadResource(type, request, request.charset());
break;
case Revalidate:
- resource = revalidateResource(resource.get());
+ resource = revalidateResource(request, resource.get());
break;
case Use:
memoryCache()->resourceAccessed(resource.get());
@@ -480,7 +484,7 @@
return resource;
}
-CachedResourceHandle<CachedResource> CachedResourceLoader::revalidateResource(CachedResource* resource)
+CachedResourceHandle<CachedResource> CachedResourceLoader::revalidateResource(const CachedResourceRequest& request, CachedResource* resource)
{
ASSERT(resource);
ASSERT(resource->inCache());
@@ -497,6 +501,12 @@
memoryCache()->remove(resource);
memoryCache()->add(newResource.get());
+#if ENABLE(RESOURCE_TIMING)
+ InitiatorInfo info = { request.initiatorName(), monotonicallyIncreasingTime() };
+ m_initiatorMap.add(newResource.get(), info);
+#else
+ UNUSED_PARAM(request);
+#endif
return newResource;
}
@@ -510,6 +520,10 @@
if (!memoryCache()->add(resource.get()))
resource->setOwningCachedResourceLoader(this);
+#if ENABLE(RESOURCE_TIMING)
+ InitiatorInfo info = { request.initiatorName(), monotonicallyIncreasingTime() };
+ m_initiatorMap.add(resource.get(), info);
+#endif
return resource;
}
@@ -691,10 +705,25 @@
m_documentResources.remove(resource->url());
}
-void CachedResourceLoader::loadDone()
+void CachedResourceLoader::loadDone(CachedResource* resource)
{
RefPtr<DocumentLoader> protectDocumentLoader(m_documentLoader);
RefPtr<Document> protectDocument(m_document);
+
+#if ENABLE(RESOURCE_TIMING)
+ if (resource) {
+ HashMap<CachedResource*, InitiatorInfo>::iterator initiatorIt = m_initiatorMap.find(resource);
+ if (initiatorIt != m_initiatorMap.end()) {
+ ASSERT(document());
+ const InitiatorInfo& info = initiatorIt->value;
+ document()->domWindow()->performance()->addResourceTiming(info.name, document(), resource->resourceRequest(), resource->response(), info.startTime, resource->loadFinishTime());
+ m_initiatorMap.remove(initiatorIt);
+ }
+ }
+#else
+ UNUSED_PARAM(resource);
+#endif // ENABLE(RESOURCE_TIMING)
+
if (frame())
frame()->loader()->loadDone();
performPostLoadActions();
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (136438 => 136439)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2012-12-03 22:03:24 UTC (rev 136438)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2012-12-03 22:20:47 UTC (rev 136439)
@@ -120,7 +120,7 @@
void clearDocumentLoader() { m_documentLoader = 0; }
void removeCachedResource(CachedResource*) const;
- void loadDone();
+ void loadDone(CachedResource*);
void garbageCollectDocumentResources();
void incrementRequestCount(const CachedResource*);
@@ -143,7 +143,7 @@
explicit CachedResourceLoader(DocumentLoader*);
CachedResourceHandle<CachedResource> requestResource(CachedResource::Type, CachedResourceRequest&);
- CachedResourceHandle<CachedResource> revalidateResource(CachedResource*);
+ CachedResourceHandle<CachedResource> revalidateResource(const CachedResourceRequest&, CachedResource*);
CachedResourceHandle<CachedResource> loadResource(CachedResource::Type, CachedResourceRequest&, const String& charset);
void requestPreload(CachedResource::Type, CachedResourceRequest&, const String& charset);
@@ -176,6 +176,14 @@
Timer<CachedResourceLoader> m_garbageCollectDocumentResourcesTimer;
+#if ENABLE(RESOURCE_TIMING)
+ struct InitiatorInfo {
+ AtomicString name;
+ double startTime;
+ };
+ HashMap<CachedResource*, InitiatorInfo> m_initiatorMap;
+#endif
+
// 29 bits left
bool m_autoLoadImages : 1;
bool m_imagesEnabled : 1;