<!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>[183795] 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/183795">183795</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-05-04 21:49:00 -0700 (Mon, 04 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Record the reference time when Performance is constructed.
<https://webkit.org/b/144616>
Reviewed by Geoffrey Garen.
This is a merge of Blink's <a href="http://trac.webkit.org/projects/webkit/changeset/156613">r156613</a> by simonjam@chromium.org.
Cache a copy of the DocumentLoader's reference timestamp when constructing
the Performance object. That way we don't have to jump through a bunch of scary
hoops to access it when now() is called later on.
* page/Performance.cpp:
(WebCore::Performance::Performance):
(WebCore::Performance::now): Deleted.
* page/Performance.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadTimingh">trunk/Source/WebCore/loader/DocumentLoadTiming.h</a></li>
<li><a href="#trunkSourceWebCorepagePerformancecpp">trunk/Source/WebCore/page/Performance.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceh">trunk/Source/WebCore/page/Performance.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183794 => 183795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-05 04:29:30 UTC (rev 183794)
+++ trunk/Source/WebCore/ChangeLog 2015-05-05 04:49:00 UTC (rev 183795)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-05-04 Andreas Kling <akling@apple.com>
+
+ Record the reference time when Performance is constructed.
+ <https://webkit.org/b/144616>
+
+ Reviewed by Geoffrey Garen.
+
+ This is a merge of Blink's r156613 by simonjam@chromium.org.
+
+ Cache a copy of the DocumentLoader's reference timestamp when constructing
+ the Performance object. That way we don't have to jump through a bunch of scary
+ hoops to access it when now() is called later on.
+
+ * page/Performance.cpp:
+ (WebCore::Performance::Performance):
+ (WebCore::Performance::now): Deleted.
+ * page/Performance.h:
+
</ins><span class="cx"> 2015-05-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix assertions in WK1 tests after r183777.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadTimingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoadTiming.h (183794 => 183795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoadTiming.h 2015-05-05 04:29:30 UTC (rev 183794)
+++ trunk/Source/WebCore/loader/DocumentLoadTiming.h 2015-05-05 04:49:00 UTC (rev 183795)
</span><span class="lines">@@ -67,6 +67,8 @@
</span><span class="cx"> bool hasCrossOriginRedirect() const { return m_hasCrossOriginRedirect; }
</span><span class="cx"> bool hasSameOriginAsPreviousDocument() const { return m_hasSameOriginAsPreviousDocument; }
</span><span class="cx">
</span><ins>+ double referenceMonotonicTime() const { return m_referenceMonotonicTime; }
+
</ins><span class="cx"> private:
</span><span class="cx"> double m_referenceMonotonicTime;
</span><span class="cx"> double m_referenceWallTime;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformancecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Performance.cpp (183794 => 183795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Performance.cpp 2015-05-05 04:29:30 UTC (rev 183794)
+++ trunk/Source/WebCore/page/Performance.cpp 2015-05-05 04:49:00 UTC (rev 183795)
</span><span class="lines">@@ -60,7 +60,9 @@
</span><span class="cx"> #if ENABLE(USER_TIMING)
</span><span class="cx"> , m_userTiming(0)
</span><span class="cx"> #endif // ENABLE(USER_TIMING)
</span><ins>+ , m_referenceTime(frame->document()->loader()->timing().referenceMonotonicTime())
</ins><span class="cx"> {
</span><ins>+ ASSERT(m_referenceTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Performance::~Performance()
</span><span class="lines">@@ -228,10 +230,7 @@
</span><span class="cx">
</span><span class="cx"> double Performance::now() const
</span><span class="cx"> {
</span><del>- if (!frame())
- return 0;
-
- return 1000.0 * m_frame->document()->loader()->timing().monotonicTimeToZeroBasedDocumentTime(monotonicallyIncreasingTime());
</del><ins>+ return 1000.0 * (WTF::monotonicallyIncreasingTime() - m_referenceTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Performance.h (183794 => 183795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Performance.h 2015-05-05 04:29:30 UTC (rev 183794)
+++ trunk/Source/WebCore/page/Performance.h 2015-05-05 04:49:00 UTC (rev 183795)
</span><span class="lines">@@ -103,6 +103,8 @@
</span><span class="cx"> unsigned m_resourceTimingBufferSize;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ double m_referenceTime;
+
</ins><span class="cx"> #if ENABLE(USER_TIMING)
</span><span class="cx"> RefPtr<UserTiming> m_userTiming;
</span><span class="cx"> #endif // ENABLE(USER_TIMING)
</span></span></pre>
</div>
</div>
</body>
</html>