<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178859] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178859">178859</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 14:33:49 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>DocumentLoader::timing() should return a reference.
<https://webkit.org/b/128272>
Reviewed by Antti Koivisto.
There is always a DocumentLoadTiming object, so return it by
reference since it can never be null.
* Modules/gamepad/NavigatorGamepad.cpp:
(WebCore::NavigatorGamepad::from):
* dom/ScriptedAnimationController.cpp:
(WebCore::ScriptedAnimationController::serviceScriptedAnimations):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* inspector/InspectorResourceAgent.cpp:
(WebCore::buildObjectForTiming):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::finishedLoading):
(WebCore::DocumentLoader::willSendRequest):
(WebCore::DocumentLoader::continueAfterNavigationPolicy):
(WebCore::DocumentLoader::startLoadingMainResource):
* loader/DocumentLoader.h:
(WebCore::DocumentLoader::timing):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::stopLoading):
(WebCore::FrameLoader::commitProvisionalLoad):
(WebCore::FrameLoader::loadProvisionalItemFromCachedPage):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::dispatchLoadEvent):
* page/Performance.cpp:
(WebCore::Performance::now):
* page/PerformanceNavigation.cpp:
(WebCore::PerformanceNavigation::redirectCount):
* page/PerformanceResourceTiming.cpp:
(WebCore::monotonicTimeToDocumentMilliseconds):
(WebCore::PerformanceResourceTiming::resourceTimeToDocumentMilliseconds):
* page/PerformanceTiming.cpp:
(WebCore::PerformanceTiming::documentLoadTiming):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadNavigatorGamepadcpp">trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptedAnimationControllercpp">trunk/Source/WebCore/dom/ScriptedAnimationController.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePerformancecpp">trunk/Source/WebCore/page/Performance.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceNavigationcpp">trunk/Source/WebCore/page/PerformanceNavigation.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceResourceTimingcpp">trunk/Source/WebCore/page/PerformanceResourceTiming.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceTimingcpp">trunk/Source/WebCore/page/PerformanceTiming.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/ChangeLog 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2015-01-21 Andreas Kling <akling@apple.com>
+
+ DocumentLoader::timing() should return a reference.
+ <https://webkit.org/b/128272>
+
+ Reviewed by Antti Koivisto.
+
+ There is always a DocumentLoadTiming object, so return it by
+ reference since it can never be null.
+
+ * Modules/gamepad/NavigatorGamepad.cpp:
+ (WebCore::NavigatorGamepad::from):
+ * dom/ScriptedAnimationController.cpp:
+ (WebCore::ScriptedAnimationController::serviceScriptedAnimations):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::buildObjectForTiming):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::finishedLoading):
+ (WebCore::DocumentLoader::willSendRequest):
+ (WebCore::DocumentLoader::continueAfterNavigationPolicy):
+ (WebCore::DocumentLoader::startLoadingMainResource):
+ * loader/DocumentLoader.h:
+ (WebCore::DocumentLoader::timing):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::stopLoading):
+ (WebCore::FrameLoader::commitProvisionalLoad):
+ (WebCore::FrameLoader::loadProvisionalItemFromCachedPage):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::dispatchLoadEvent):
+ * page/Performance.cpp:
+ (WebCore::Performance::now):
+ * page/PerformanceNavigation.cpp:
+ (WebCore::PerformanceNavigation::redirectCount):
+ * page/PerformanceResourceTiming.cpp:
+ (WebCore::monotonicTimeToDocumentMilliseconds):
+ (WebCore::PerformanceResourceTiming::resourceTimeToDocumentMilliseconds):
+ * page/PerformanceTiming.cpp:
+ (WebCore::PerformanceTiming::documentLoadTiming):
+
</ins><span class="cx"> 2015-01-21 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Handle the transition on any character as a separate type of transition
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> if (Frame* frame = navigator->frame()) {
</span><span class="cx"> if (DocumentLoader* documentLoader = frame->loader().documentLoader())
</span><del>- supplement->m_navigationStart = documentLoader->timing()->navigationStart();
</del><ins>+ supplement->m_navigationStart = documentLoader->timing().navigationStart();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return supplement;
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptedAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptedAnimationController.cpp (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptedAnimationController.cpp 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/dom/ScriptedAnimationController.cpp 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -132,8 +132,8 @@
</span><span class="cx"> if (!m_callbacks.size() || m_suspendCount || (m_document->settings() && !m_document->settings()->requestAnimationFrameEnabled()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- double highResNowMs = 1000.0 * m_document->loader()->timing()->monotonicTimeToZeroBasedDocumentTime(monotonicTimeNow);
- double legacyHighResNowMs = 1000.0 * m_document->loader()->timing()->monotonicTimeToPseudoWallTime(monotonicTimeNow);
</del><ins>+ double highResNowMs = 1000.0 * m_document->loader()->timing().monotonicTimeToZeroBasedDocumentTime(monotonicTimeNow);
+ double legacyHighResNowMs = 1000.0 * m_document->loader()->timing().monotonicTimeToPseudoWallTime(monotonicTimeNow);
</ins><span class="cx">
</span><span class="cx"> // First, generate a list of callbacks to consider. Callbacks registered from this point
</span><span class="cx"> // on are considered only for the "next" frame, not this one.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -5811,7 +5811,7 @@
</span><span class="cx"> double now = performance ? performance->now() : 0;
</span><span class="cx"> #else
</span><span class="cx"> DocumentLoader* loader = document().loader();
</span><del>- double now = loader ? 1000.0 * loader->timing()->monotonicTimeToZeroBasedDocumentTime(monotonicallyIncreasingTime()) : 0;
</del><ins>+ double now = loader ? 1000.0 * loader->timing().monotonicTimeToZeroBasedDocumentTime(monotonicallyIncreasingTime()) : 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!m_player)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> static Ref<Inspector::Protocol::Network::ResourceTiming> buildObjectForTiming(const ResourceLoadTiming& timing, DocumentLoader* loader)
</span><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::Network::ResourceTiming::create()
</span><del>- .setNavigationStart(loader->timing()->navigationStart())
</del><ins>+ .setNavigationStart(loader->timing().navigationStart())
</ins><span class="cx"> .setDomainLookupStart(timing.domainLookupStart)
</span><span class="cx"> .setDomainLookupEnd(timing.domainLookupEnd)
</span><span class="cx"> .setConnectStart(timing.connectStart)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> responseEndTime = m_timeOfLastDataReceived;
</span><span class="cx"> if (!responseEndTime)
</span><span class="cx"> responseEndTime = monotonicallyIncreasingTime();
</span><del>- timing()->setResponseEnd(responseEndTime);
</del><ins>+ timing().setResponseEnd(responseEndTime);
</ins><span class="cx">
</span><span class="cx"> commitIfReady();
</span><span class="cx"> if (!frameLoader())
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(timing()->fetchStart());
</del><ins>+ ASSERT(timing().fetchStart());
</ins><span class="cx"> if (!redirectResponse.isNull()) {
</span><span class="cx"> // If the redirecting url is not allowed to display content from the target origin,
</span><span class="cx"> // then block the redirect.
</span><span class="lines">@@ -522,7 +522,7 @@
</span><span class="cx"> cancelMainResourceLoad(frameLoader()->cancelledError(newRequest));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- timing()->addRedirect(redirectResponse.url(), newRequest.url());
</del><ins>+ timing().addRedirect(redirectResponse.url(), newRequest.url());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Update cookie policy base URL as URL changes, except for subframes, which use the
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx"> stopLoadingForPolicyChange();
</span><span class="cx"> else if (m_substituteData.isValid()) {
</span><span class="cx"> // A redirect resulted in loading substitute data.
</span><del>- ASSERT(timing()->redirectCount());
</del><ins>+ ASSERT(timing().redirectCount());
</ins><span class="cx">
</span><span class="cx"> // We need to remove our reference to the CachedResource in favor of a SubstituteData load.
</span><span class="cx"> // This will probably trigger the cancellation of the CachedResource's underlying ResourceLoader, though there is a
</span><span class="lines">@@ -1397,7 +1397,7 @@
</span><span class="cx"> void DocumentLoader::startLoadingMainResource()
</span><span class="cx"> {
</span><span class="cx"> m_mainDocumentError = ResourceError();
</span><del>- timing()->markNavigationStart();
</del><ins>+ timing().markNavigationStart();
</ins><span class="cx"> ASSERT(!m_mainResource);
</span><span class="cx"> ASSERT(!m_loadingMainResource);
</span><span class="cx"> m_loadingMainResource = true;
</span><span class="lines">@@ -1411,9 +1411,9 @@
</span><span class="cx"> // because we pass a wrong loadType (see FIXME in addExtraFieldsToMainResourceRequest()).
</span><span class="cx"> frameLoader()->addExtraFieldsToMainResourceRequest(m_request);
</span><span class="cx">
</span><del>- ASSERT(timing()->navigationStart());
- ASSERT(!timing()->fetchStart());
- timing()->markFetchStart();
</del><ins>+ ASSERT(timing().navigationStart());
+ ASSERT(!timing().fetchStart());
+ timing().markFetchStart();
</ins><span class="cx"> willSendRequest(m_request, ResourceResponse());
</span><span class="cx">
</span><span class="cx"> // willSendRequest() may lead to our Frame being detached or cancelling the load via nulling the ResourceRequest.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> void recordMemoryCacheLoadForFutureClientNotification(const ResourceRequest&);
</span><span class="cx"> void takeMemoryCacheLoadsForClientNotification(Vector<ResourceRequest>& loads);
</span><span class="cx">
</span><del>- DocumentLoadTiming* timing() { return &m_documentLoadTiming; }
</del><ins>+ DocumentLoadTiming& timing() { return m_documentLoadTiming; }
</ins><span class="cx"> void resetTiming() { m_documentLoadTiming = DocumentLoadTiming(); }
</span><span class="cx">
</span><span class="cx"> // The WebKit layer calls this function when it's ready for the data to
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -452,12 +452,12 @@
</span><span class="cx"> // time into freed memory.
</span><span class="cx"> RefPtr<DocumentLoader> documentLoader = m_provisionalDocumentLoader;
</span><span class="cx"> m_pageDismissalEventBeingDispatched = UnloadDismissal;
</span><del>- if (documentLoader && !documentLoader->timing()->unloadEventStart() && !documentLoader->timing()->unloadEventEnd()) {
- DocumentLoadTiming* timing = documentLoader->timing();
- ASSERT(timing->navigationStart());
- timing->markUnloadEventStart();
</del><ins>+ if (documentLoader && !documentLoader->timing().unloadEventStart() && !documentLoader->timing().unloadEventEnd()) {
+ DocumentLoadTiming& timing = documentLoader->timing();
+ ASSERT(timing.navigationStart());
+ timing.markUnloadEventStart();
</ins><span class="cx"> m_frame.document()->domWindow()->dispatchEvent(unloadEvent, m_frame.document());
</span><del>- timing->markUnloadEventEnd();
</del><ins>+ timing.markUnloadEventEnd();
</ins><span class="cx"> } else
</span><span class="cx"> m_frame.document()->domWindow()->dispatchEvent(unloadEvent, m_frame.document());
</span><span class="cx"> }
</span><span class="lines">@@ -1786,7 +1786,7 @@
</span><span class="cx"> if (pdl && m_documentLoader) {
</span><span class="cx"> // Check if the destination page is allowed to access the previous page's timing information.
</span><span class="cx"> Ref<SecurityOrigin> securityOrigin(SecurityOrigin::create(pdl->request().url()));
</span><del>- m_documentLoader->timing()->setHasSameOriginAsPreviousDocument(securityOrigin.get().canRequest(m_previousURL));
</del><ins>+ m_documentLoader->timing().setHasSameOriginAsPreviousDocument(securityOrigin.get().canRequest(m_previousURL));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Call clientRedirectCancelledOrFinished() here so that the frame load delegate is notified that the redirect's
</span><span class="lines">@@ -3091,9 +3091,9 @@
</span><span class="cx"> m_loadingFromCachedPage = true;
</span><span class="cx">
</span><span class="cx"> // Should have timing data from previous time(s) the page was shown.
</span><del>- ASSERT(provisionalLoader->timing()->navigationStart());
</del><ins>+ ASSERT(provisionalLoader->timing().navigationStart());
</ins><span class="cx"> provisionalLoader->resetTiming();
</span><del>- provisionalLoader->timing()->markNavigationStart();
</del><ins>+ provisionalLoader->timing().markNavigationStart();
</ins><span class="cx">
</span><span class="cx"> provisionalLoader->setCommitted(true);
</span><span class="cx"> commitProvisionalLoad();
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -1846,14 +1846,14 @@
</span><span class="cx"> void DOMWindow::dispatchLoadEvent()
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Event> loadEvent(Event::create(eventNames().loadEvent, false, false));
</span><del>- if (m_frame && m_frame->loader().documentLoader() && !m_frame->loader().documentLoader()->timing()->loadEventStart()) {
</del><ins>+ if (m_frame && m_frame->loader().documentLoader() && !m_frame->loader().documentLoader()->timing().loadEventStart()) {
</ins><span class="cx"> // The DocumentLoader (and thus its DocumentLoadTiming) might get destroyed while dispatching
</span><span class="cx"> // the event, so protect it to prevent writing the end time into freed memory.
</span><span class="cx"> RefPtr<DocumentLoader> documentLoader = m_frame->loader().documentLoader();
</span><del>- DocumentLoadTiming* timing = documentLoader->timing();
- timing->markLoadEventStart();
</del><ins>+ DocumentLoadTiming& timing = documentLoader->timing();
+ timing.markLoadEventStart();
</ins><span class="cx"> dispatchEvent(loadEvent, document());
</span><del>- timing->markLoadEventEnd();
</del><ins>+ timing.markLoadEventEnd();
</ins><span class="cx"> } else
</span><span class="cx"> dispatchEvent(loadEvent, document());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformancecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Performance.cpp (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Performance.cpp 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/page/Performance.cpp 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx">
</span><span class="cx"> double Performance::now() const
</span><span class="cx"> {
</span><del>- return 1000.0 * m_frame->document()->loader()->timing()->monotonicTimeToZeroBasedDocumentTime(monotonicallyIncreasingTime());
</del><ins>+ return 1000.0 * m_frame->document()->loader()->timing().monotonicTimeToZeroBasedDocumentTime(monotonicallyIncreasingTime());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceNavigationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceNavigation.cpp (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceNavigation.cpp 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/page/PerformanceNavigation.cpp 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -73,11 +73,11 @@
</span><span class="cx"> if (!loader)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- DocumentLoadTiming* timing = loader->timing();
- if (timing->hasCrossOriginRedirect())
</del><ins>+ DocumentLoadTiming& timing = loader->timing();
+ if (timing.hasCrossOriginRedirect())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return timing->redirectCount();
</del><ins>+ return timing.redirectCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceResourceTimingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceResourceTiming.cpp (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceResourceTiming.cpp 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/page/PerformanceResourceTiming.cpp 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> static double monotonicTimeToDocumentMilliseconds(Document* document, double seconds)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(seconds >= 0.0);
</span><del>- return document->loader()->timing()->monotonicTimeToZeroBasedDocumentTime(seconds) * 1000.0;
</del><ins>+ return document->loader()->timing().monotonicTimeToZeroBasedDocumentTime(seconds) * 1000.0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool passesTimingAllowCheck(const ResourceResponse& response, Document* requestingDocument)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!deltaMilliseconds)
</span><span class="cx"> return 0.0;
</span><del>- return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_requestingDocument.get()->loader()->timing()->navigationStart()) + deltaMilliseconds;
</del><ins>+ return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_requestingDocument->loader()->timing().navigationStart()) + deltaMilliseconds;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceTimingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceTiming.cpp (178858 => 178859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceTiming.cpp 2015-01-21 22:30:43 UTC (rev 178858)
+++ trunk/Source/WebCore/page/PerformanceTiming.cpp 2015-01-21 22:33:49 UTC (rev 178859)
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> if (!loader)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return loader->timing();
</del><ins>+ return &loader->timing();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::resourceLoadTimeRelativeToAbsolute(int relativeMilliseconds) const
</span></span></pre>
</div>
</div>
</body>
</html>