summaryrefslogtreecommitdiffstats
path: root/WebCore/loader
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-01-16 13:59:45 +0000
committerBen Murdoch <benm@google.com>2011-01-16 14:14:41 +0000
commit8a26975f9657a07318a10d481d7f332dad759325 (patch)
tree3d4270ff2d0aa27bdbb26e83c1de9d6ac18cb4fc /WebCore/loader
parente137c43847f22807f1276afc87027711cc3f4e77 (diff)
downloadexternal_webkit-8a26975f9657a07318a10d481d7f332dad759325.zip
external_webkit-8a26975f9657a07318a10d481d7f332dad759325.tar.gz
external_webkit-8a26975f9657a07318a10d481d7f332dad759325.tar.bz2
Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.
http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681 Change-Id: Ibe552cf7af31f74b81e337eadf3d3b73a53daf60
Diffstat (limited to 'WebCore/loader')
-rw-r--r--WebCore/loader/ResourceLoadNotifier.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/loader/ResourceLoadNotifier.cpp b/WebCore/loader/ResourceLoadNotifier.cpp
index d002ef3..a36ed94 100644
--- a/WebCore/loader/ResourceLoadNotifier.cpp
+++ b/WebCore/loader/ResourceLoadNotifier.cpp
@@ -128,6 +128,10 @@ void ResourceLoadNotifier::dispatchWillSendRequest(DocumentLoader* loader, unsig
if (Page* page = m_frame->page())
page->inspectorController()->willSendRequest(identifier, request, redirectResponse);
#endif
+
+ // Report WebTiming for all frames.
+ if (loader && !request.isNull() && request.url() == loader->requestURL())
+ request.setReportLoadTiming(true);
}
void ResourceLoadNotifier::dispatchDidReceiveResponse(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r)