<!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>[186406] releases/WebKitGTK/webkit-2.8/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/186406">186406</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-06 23:38:27 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/185434">r185434</a> - [Web Timing] Fix flaky test.
https://bugs.webkit.org/show_bug.cgi?id=145846
Patch by Alex Christensen <achristensen@webkit.org> on 2015-06-10
Reviewed by Alexey Proskuryakov.
The timing data is gathered in ResourceHandle::getConnectionTimingData as
millisecond deltas from the fetch start time, not the navigation start time.
The difference between navigation and fetch start time is usually so small that
it only caused one flaky test, but this should fix that flakiness. This patch
corrects how the millisecond deltas are used.
* page/PerformanceTiming.cpp:
(WebCore::PerformanceTiming::domainLookupStart):
(WebCore::PerformanceTiming::domainLookupEnd):
(WebCore::PerformanceTiming::connectStart):
(WebCore::PerformanceTiming::connectEnd):
(WebCore::PerformanceTiming::secureConnectionStart):
(WebCore::PerformanceTiming::requestStart):
(WebCore::PerformanceTiming::responseStart):
(WebCore::PerformanceTiming::responseEnd):
(WebCore::PerformanceTiming::documentLoadTiming):
(WebCore::PerformanceTiming::resourceLoadTimeRelativeToFetchStart):
(WebCore::PerformanceTiming::monotonicTimeToIntegerMilliseconds):
(WebCore::PerformanceTiming::resourceLoadTimeRelativeToAbsolute): Deleted.
* page/PerformanceTiming.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorepagePerformanceTimingcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/page/PerformanceTiming.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorepagePerformanceTimingh">releases/WebKitGTK/webkit-2.8/Source/WebCore/page/PerformanceTiming.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186405 => 186406)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 06:35:31 UTC (rev 186405)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 06:38:27 UTC (rev 186406)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-06-10 Alex Christensen <achristensen@webkit.org>
+
+ [Web Timing] Fix flaky test.
+ https://bugs.webkit.org/show_bug.cgi?id=145846
+
+ Reviewed by Alexey Proskuryakov.
+
+ The timing data is gathered in ResourceHandle::getConnectionTimingData as
+ millisecond deltas from the fetch start time, not the navigation start time.
+ The difference between navigation and fetch start time is usually so small that
+ it only caused one flaky test, but this should fix that flakiness. This patch
+ corrects how the millisecond deltas are used.
+
+ * page/PerformanceTiming.cpp:
+ (WebCore::PerformanceTiming::domainLookupStart):
+ (WebCore::PerformanceTiming::domainLookupEnd):
+ (WebCore::PerformanceTiming::connectStart):
+ (WebCore::PerformanceTiming::connectEnd):
+ (WebCore::PerformanceTiming::secureConnectionStart):
+ (WebCore::PerformanceTiming::requestStart):
+ (WebCore::PerformanceTiming::responseStart):
+ (WebCore::PerformanceTiming::responseEnd):
+ (WebCore::PerformanceTiming::documentLoadTiming):
+ (WebCore::PerformanceTiming::resourceLoadTimeRelativeToFetchStart):
+ (WebCore::PerformanceTiming::monotonicTimeToIntegerMilliseconds):
+ (WebCore::PerformanceTiming::resourceLoadTimeRelativeToAbsolute): Deleted.
+ * page/PerformanceTiming.h:
+
</ins><span class="cx"> 2015-06-09 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Protect FrameView from being destroyed in Document::recalcStyle()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorepagePerformanceTimingcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/page/PerformanceTiming.cpp (186405 => 186406)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/page/PerformanceTiming.cpp 2015-07-07 06:35:31 UTC (rev 186405)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/page/PerformanceTiming.cpp 2015-07-07 06:38:27 UTC (rev 186406)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> if (timing.domainLookupStart < 0)
</span><span class="cx"> return fetchStart();
</span><span class="cx">
</span><del>- return resourceLoadTimeRelativeToAbsolute(timing.domainLookupStart);
</del><ins>+ return resourceLoadTimeRelativeToFetchStart(timing.domainLookupStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::domainLookupEnd() const
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> if (timing.domainLookupEnd < 0)
</span><span class="cx"> return domainLookupStart();
</span><span class="cx">
</span><del>- return resourceLoadTimeRelativeToAbsolute(timing.domainLookupEnd);
</del><ins>+ return resourceLoadTimeRelativeToFetchStart(timing.domainLookupEnd);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::connectStart() const
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> if (timing.domainLookupEnd >= 0 && timing.domainLookupEnd > connectStart)
</span><span class="cx"> connectStart = timing.domainLookupEnd;
</span><span class="cx">
</span><del>- return resourceLoadTimeRelativeToAbsolute(connectStart);
</del><ins>+ return resourceLoadTimeRelativeToFetchStart(connectStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::connectEnd() const
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> if (timing.connectEnd < 0)
</span><span class="cx"> return connectStart();
</span><span class="cx">
</span><del>- return resourceLoadTimeRelativeToAbsolute(timing.connectEnd);
</del><ins>+ return resourceLoadTimeRelativeToFetchStart(timing.connectEnd);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::secureConnectionStart() const
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> if (timing.secureConnectionStart < 0)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return resourceLoadTimeRelativeToAbsolute(timing.secureConnectionStart);
</del><ins>+ return resourceLoadTimeRelativeToFetchStart(timing.secureConnectionStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::requestStart() const
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> const ResourceLoadTiming& timing = loader->response().resourceLoadTiming();
</span><span class="cx">
</span><span class="cx"> ASSERT(timing.requestStart >= 0);
</span><del>- return resourceLoadTimeRelativeToAbsolute(timing.requestStart);
</del><ins>+ return resourceLoadTimeRelativeToFetchStart(timing.requestStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::responseStart() const
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> const ResourceLoadTiming& timing = loader->response().resourceLoadTiming();
</span><span class="cx">
</span><span class="cx"> ASSERT(timing.responseStart >= 0);
</span><del>- return resourceLoadTimeRelativeToAbsolute(timing.responseStart);
</del><ins>+ return resourceLoadTimeRelativeToFetchStart(timing.responseStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::responseEnd() const
</span><span class="lines">@@ -331,10 +331,10 @@
</span><span class="cx"> return &loader->timing();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long PerformanceTiming::resourceLoadTimeRelativeToAbsolute(int relativeMilliseconds) const
</del><ins>+unsigned long long PerformanceTiming::resourceLoadTimeRelativeToFetchStart(int relativeMilliseconds) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(relativeMilliseconds >= 0);
</span><del>- return navigationStart() + relativeMilliseconds;
</del><ins>+ return fetchStart() + relativeMilliseconds;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::monotonicTimeToIntegerMilliseconds(double monotonicSeconds) const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorepagePerformanceTimingh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/page/PerformanceTiming.h (186405 => 186406)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/page/PerformanceTiming.h 2015-07-07 06:35:31 UTC (rev 186405)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/page/PerformanceTiming.h 2015-07-07 06:38:27 UTC (rev 186406)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> const DocumentTiming* documentTiming() const;
</span><span class="cx"> DocumentLoader* documentLoader() const;
</span><span class="cx"> DocumentLoadTiming* documentLoadTiming() const;
</span><del>- unsigned long long resourceLoadTimeRelativeToAbsolute(int) const;
</del><ins>+ unsigned long long resourceLoadTimeRelativeToFetchStart(int) const;
</ins><span class="cx"> unsigned long long monotonicTimeToIntegerMilliseconds(double) const;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>