<!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>[162398] trunk/Source/WebInspectorUI</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/162398">162398</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 18:53:38 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change how the load and content ready event timestamps are tracked.
https://bugs.webkit.org/show_bug.cgi?id=123356
Reviewed by Joseph Pecoraro.
* UserInterface/DashboardManager.js:
(WebInspector.DashboardManager.prototype._updateTime): Use the timestamps on the main frame.
* UserInterface/Frame.js:
(WebInspector.Frame):
(WebInspector.Frame.prototype.get domContentReadyEventTimestamp): Added.
(WebInspector.Frame.prototype.get loadEventTimestamp): Added.
(WebInspector.Frame.prototype.markDOMContentReadyEvent): Added.
(WebInspector.Frame.prototype.markLoadEvent): Added.
* UserInterface/TimelineManager.js:
(WebInspector.TimelineManager.prototype.eventRecorded.processRecord): Use markLoadEvent and markDOMContentReadyEvent.
Do it for all frames, not just the main frame.
(WebInspector.TimelineManager.prototype.pageDidLoad): Call markLoadEvent on the Frame.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceDashboardManagerjs">trunk/Source/WebInspectorUI/UserInterface/DashboardManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceFramejs">trunk/Source/WebInspectorUI/UserInterface/Frame.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceTimelineManagerjs">trunk/Source/WebInspectorUI/UserInterface/TimelineManager.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (162397 => 162398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-01-21 02:53:33 UTC (rev 162397)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-01-21 02:53:38 UTC (rev 162398)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2013-10-25 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Change how the load and content ready event timestamps are tracked.
+
+ https://bugs.webkit.org/show_bug.cgi?id=123356
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/DashboardManager.js:
+ (WebInspector.DashboardManager.prototype._updateTime): Use the timestamps on the main frame.
+ * UserInterface/Frame.js:
+ (WebInspector.Frame):
+ (WebInspector.Frame.prototype.get domContentReadyEventTimestamp): Added.
+ (WebInspector.Frame.prototype.get loadEventTimestamp): Added.
+ (WebInspector.Frame.prototype.markDOMContentReadyEvent): Added.
+ (WebInspector.Frame.prototype.markLoadEvent): Added.
+ * UserInterface/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype.eventRecorded.processRecord): Use markLoadEvent and markDOMContentReadyEvent.
+ Do it for all frames, not just the main frame.
+ (WebInspector.TimelineManager.prototype.pageDidLoad): Call markLoadEvent on the Frame.
+
+2013-10-25 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Remove a lot of the current Timelines code to make room for a new implementation.
</span><span class="cx">
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=123368
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceDashboardManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/DashboardManager.js (162397 => 162398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/DashboardManager.js 2014-01-21 02:53:33 UTC (rev 162397)
+++ trunk/Source/WebInspectorUI/UserInterface/DashboardManager.js 2014-01-21 02:53:38 UTC (rev 162398)
</span><span class="lines">@@ -135,16 +135,16 @@
</span><span class="cx"> this._timeIntervalIdentifier = setInterval(this._updateTime.bind(this), this._timeIntervalDelay);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var timelineManager = WebInspector.timelineManager;
- var mainFrameLoadEventTime = timelineManager.mainFrameLoadEventTime;
</del><ins>+ var mainFrame = WebInspector.frameResourceManager.mainFrame;
+ var mainFrameStartTime = mainFrame.mainResource.firstTimestamp;
+ var mainFrameLoadEventTime = mainFrame.loadEventTimestamp;
</ins><span class="cx">
</span><del>- if (isNaN(mainFrameLoadEventTime)) {
- this._view.time = (Date.now() - this._timelineBaseTime) / 1000;
</del><ins>+ if (isNaN(mainFrameStartTime) || isNaN(mainFrameLoadEventTime)) {
+ this._view.time = duration / 1000;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var networkRecords = timelineManager.recordsWithType(WebInspector.TimelineRecord.Type.Network);
- this._view.time = mainFrameLoadEventTime - networkRecords[0].startTime;
</del><ins>+ this._view.time = mainFrameLoadEventTime - mainFrameStartTime;
</ins><span class="cx">
</span><span class="cx"> this._stopUpdatingTime();
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Frame.js (162397 => 162398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Frame.js 2014-01-21 02:53:33 UTC (rev 162397)
+++ trunk/Source/WebInspectorUI/UserInterface/Frame.js 2014-01-21 02:53:38 UTC (rev 162398)
</span><span class="lines">@@ -43,6 +43,9 @@
</span><span class="cx"> this._parentFrame = null;
</span><span class="cx"> this._isMainFrame = false;
</span><span class="cx">
</span><ins>+ this._domContentReadyEventTimestamp = NaN;
+ this._loadEventTimestamp = NaN;
+
</ins><span class="cx"> this._executionContextList = new WebInspector.ExecutionContextList;
</span><span class="cx">
</span><span class="cx"> this.initialize(name, securityOrigin, loaderIdentifier, mainResource);
</span><span class="lines">@@ -137,6 +140,9 @@
</span><span class="cx"> this._loaderIdentifier = this._provisionalLoaderIdentifier;
</span><span class="cx"> this._mainResource = this._provisionalMainResource;
</span><span class="cx">
</span><ins>+ this._domContentReadyEventTimestamp = NaN;
+ this._loadEventTimestamp = NaN;
+
</ins><span class="cx"> if (oldMainResource && this._mainResource !== oldMainResource)
</span><span class="cx"> this._disassociateWithResource(oldMainResource);
</span><span class="cx">
</span><span class="lines">@@ -254,6 +260,16 @@
</span><span class="cx"> return this._childFrames;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get domContentReadyEventTimestamp()
+ {
+ return this._domContentReadyEventTimestamp;
+ },
+
+ get loadEventTimestamp()
+ {
+ return this._loadEventTimestamp;
+ },
+
</ins><span class="cx"> isMainFrame: function()
</span><span class="cx"> {
</span><span class="cx"> return this._isMainFrame;
</span><span class="lines">@@ -269,6 +285,16 @@
</span><span class="cx"> this._isMainFrame = false;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ markDOMContentReadyEvent: function(timestamp)
+ {
+ this._domContentReadyEventTimestamp = timestamp || NaN;
+ },
+
+ markLoadEvent: function(timestamp)
+ {
+ this._loadEventTimestamp = timestamp || NaN;
+ },
+
</ins><span class="cx"> isDetached: function()
</span><span class="cx"> {
</span><span class="cx"> var frame = this;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/TimelineManager.js (162397 => 162398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/TimelineManager.js 2014-01-21 02:53:33 UTC (rev 162397)
+++ trunk/Source/WebInspectorUI/UserInterface/TimelineManager.js 2014-01-21 02:53:38 UTC (rev 162398)
</span><span class="lines">@@ -56,11 +56,6 @@
</span><span class="cx"> return this._recording;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- get mainFrameLoadEventTime()
- {
- return this._loadEventTime;
- },
-
</del><span class="cx"> startRecording: function()
</span><span class="cx"> {
</span><span class="cx"> if (this._recording)
</span><span class="lines">@@ -113,14 +108,18 @@
</span><span class="cx">
</span><span class="cx"> switch (record.type) {
</span><span class="cx"> case TimelineAgent.EventType.MarkLoad:
</span><del>- var mainFrame = WebInspector.frameResourceManager.mainFrame;
- console.assert(mainFrame);
</del><ins>+ console.assert(isNaN(endTime));
</ins><span class="cx">
</span><del>- if (!mainFrame || record.frameId !== mainFrame.id)
</del><ins>+ var frame = WebInspector.frameResourceManager.frameForIdentifier(recordPayload.frameId);
+ console.assert(frame);
+ if (!frame)
</ins><span class="cx"> break;
</span><span class="cx">
</span><del>- this._loadEventTime = startTime;
</del><ins>+ frame.markLoadEvent(startTime);
</ins><span class="cx">
</span><ins>+ if (!frame.isMainFrame())
+ break;
+
</ins><span class="cx"> var eventMarker = new WebInspector.TimelineEventMarker(startTime, WebInspector.TimelineEventMarker.Type.LoadEvent);
</span><span class="cx"> this._eventMarkers.push(eventMarker);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineManager.Event.RecordedEventMarker, {eventMarker: eventMarker});
</span><span class="lines">@@ -128,12 +127,18 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case TimelineAgent.EventType.MarkDOMContent:
</span><del>- var mainFrame = WebInspector.frameResourceManager.mainFrame;
- console.assert(mainFrame);
</del><ins>+ console.assert(isNaN(endTime));
</ins><span class="cx">
</span><del>- if (!mainFrame || record.frameId !== mainFrame.id)
</del><ins>+ var frame = WebInspector.frameResourceManager.frameForIdentifier(recordPayload.frameId);
+ console.assert(frame);
+ if (!frame)
</ins><span class="cx"> break;
</span><span class="cx">
</span><ins>+ frame.markDOMContentReadyEvent(startTime);
+
+ if (!frame.isMainFrame())
+ break;
+
</ins><span class="cx"> var eventMarker = new WebInspector.TimelineEventMarker(startTime, WebInspector.TimelineEventMarker.Type.DOMContentEvent);
</span><span class="cx"> this._eventMarkers.push(eventMarker);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineManager.Event.RecordedEventMarker, {eventMarker: eventMarker});
</span><span class="lines">@@ -278,8 +283,8 @@
</span><span class="cx">
</span><span class="cx"> pageDidLoad: function(timestamp)
</span><span class="cx"> {
</span><del>- if (isNaN(this._loadEventTime))
- this._loadEventTime = timestamp;
</del><ins>+ if (isNaN(WebInspector.frameResourceManager.mainFrame.loadEventTimestamp))
+ WebInspector.frameResourceManager.mainFrame.markLoadEvent(timestamp);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="lines">@@ -320,7 +325,7 @@
</span><span class="cx"> // FIXME: Implement.
</span><span class="cx">
</span><span class="cx"> // Only worry about dead time after the load event.
</span><del>- if (!isNaN(this._loadEventTime))
</del><ins>+ if (!isNaN(WebInspector.frameResourceManager.mainFrame.loadEventTimestamp))
</ins><span class="cx"> this._resetAutoRecordingDeadTimeTimeout();
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>