<!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>[193295] branches/safari-601-branch/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/193295">193295</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:07:45 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191770">r191770</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsScriptTimelineRecordjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsScriptTimelineViewcss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordTreeElementjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193294 => 193295)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:07:37 UTC (rev 193294)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:07:45 UTC (rev 193295)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191770. rdar://problem/23221163
+
+ 2015-10-29 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Make use of other Timer details in Timeline (timeout, singleShot)
+ https://bugs.webkit.org/show_bug.cgi?id=150697
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype._processRecord):
+ Create a small object for timer details.
+
+ * UserInterface/Models/ScriptTimelineRecord.js:
+ (WebInspector.ScriptTimelineRecord.EventType.displayName):
+ New details object requires new path to timer identifier.
+
+ * UserInterface/Views/ScriptTimelineView.css:
+ (.sidebar > .panel.navigation.timeline:not(.timeline-recording-content-view-showing) .navigation-sidebar-panel-content-tree-outline.script .item .alternate-subtitle):
+ (.navigation-sidebar-panel-content-tree-outline .item .alternate-subtitle):
+ (.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected .alternate-subtitle):
+ (.navigation-sidebar-panel-content-tree-outline .item.small:not(.two-line) .alternate-subtitle::before):
+ Styles for an alternate-subtitle, a subtitle to show when the timeline
+ content view is showing and not a resource content view.
+
+ * UserInterface/Views/TimelineRecordTreeElement.js:
+ (WebInspector.TimelineRecordTreeElement):
+ Create alternate subtitle for Timers with the timeout millisecond details.
+ Differentiate between setTimeout / setInterval.
+
+ * UserInterface/Views/ScriptTimelineDataGridNode.js:
+ (WebInspector.ScriptTimelineDataGridNode.prototype.createCellContent): Deleted.
+ (WebInspector.ScriptTimelineDataGridNode): Deleted.
+ Remove dead code. Normally there would be a filter / scope bar for an eventType
+ column but no such column exists.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r191764. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-29 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (193294 => 193295)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 19:07:37 UTC (rev 193294)
+++ branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 19:07:45 UTC (rev 193295)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> localizedStrings["%s Event Dispatched"] = "%s Event Dispatched";
</span><span class="cx"> localizedStrings["%s Prototype"] = "%s Prototype";
</span><span class="cx"> localizedStrings["%s \u2014 %s"] = "%s \u2014 %s";
</span><ins>+localizedStrings["%s delay"] = "%s delay";
+localizedStrings["%s interval"] = "%s interval";
</ins><span class="cx"> localizedStrings["(Index)"] = "(Index)";
</span><span class="cx"> localizedStrings["(anonymous function)"] = "(anonymous function)";
</span><span class="cx"> localizedStrings["(many)"] = "(many)";
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (193294 => 193295)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-12-03 19:07:37 UTC (rev 193294)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-12-03 19:07:45 UTC (rev 193295)
</span><span class="lines">@@ -394,8 +394,8 @@
</span><span class="cx"> console.assert(isNaN(endTime));
</span><span class="cx">
</span><span class="cx"> // Pass the startTime as the endTime since this record type has no duration.
</span><del>- // FIXME: Make use of "timeout" and "singleShot" payload properties.
- return new WebInspector.ScriptTimelineRecord(WebInspector.ScriptTimelineRecord.EventType.TimerInstalled, startTime, startTime, callFrames, sourceCodeLocation, recordPayload.data.timerId);
</del><ins>+ var timerDetails = {timerId: recordPayload.data.timerId, timeout: recordPayload.data.timeout, repeating: !recordPayload.data.singleShot};
+ return new WebInspector.ScriptTimelineRecord(WebInspector.ScriptTimelineRecord.EventType.TimerInstalled, startTime, startTime, callFrames, sourceCodeLocation, timerDetails);
</ins><span class="cx">
</span><span class="cx"> case TimelineAgent.EventType.TimerRemove:
</span><span class="cx"> console.assert(isNaN(endTime));
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsScriptTimelineRecordjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js (193294 => 193295)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-12-03 19:07:37 UTC (rev 193294)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-12-03 19:07:45 UTC (rev 193295)
</span><span class="lines">@@ -340,8 +340,8 @@
</span><span class="cx"> return WebInspector.UIString("Timer %s Fired").format(details);
</span><span class="cx"> return WebInspector.UIString("Timer Fired");
</span><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.TimerInstalled:
</span><del>- if (details && includeTimerIdentifierInMainTitle)
- return WebInspector.UIString("Timer %s Installed").format(details);
</del><ins>+ if (details && includeDetailsInMainTitle)
+ return WebInspector.UIString("Timer %s Installed").format(details.timerId);
</ins><span class="cx"> return WebInspector.UIString("Timer Installed");
</span><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.TimerRemoved:
</span><span class="cx"> if (details && includeTimerIdentifierInMainTitle)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsScriptTimelineViewcss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.css (193294 => 193295)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.css 2015-12-03 19:07:37 UTC (rev 193294)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.css 2015-12-03 19:07:45 UTC (rev 193295)
</span><span class="lines">@@ -38,3 +38,19 @@
</span><span class="cx"> .sidebar > .panel.navigation.timeline.timeline-recording-content-view-showing .navigation-sidebar-panel-content-tree-outline.script .item .subtitle {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><ins>+
+.sidebar > .panel.navigation.timeline:not(.timeline-recording-content-view-showing) .navigation-sidebar-panel-content-tree-outline.script .item .alternate-subtitle {
+ display: none;
+}
+
+.navigation-sidebar-panel-content-tree-outline .item .alternate-subtitle {
+ color: hsla(0, 0%, 0%, 0.7);
+}
+
+.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected .alternate-subtitle {
+ color: hsla(0, 0%, 100%, 0.9);
+}
+
+.navigation-sidebar-panel-content-tree-outline .item.small:not(.two-line) .alternate-subtitle::before {
+ content: " — ";
+}
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js (193294 => 193295)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js 2015-12-03 19:07:37 UTC (rev 193294)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js 2015-12-03 19:07:45 UTC (rev 193295)
</span><span class="lines">@@ -32,7 +32,8 @@
</span><span class="cx"> sourceCodeLocation = sourceCodeLocation || timelineRecord.sourceCodeLocation || null;
</span><span class="cx">
</span><span class="cx"> var title = "";
</span><del>- var subtitle = "";
</del><ins>+ var subtitle = null;
+ var alternateSubtitle = null;
</ins><span class="cx">
</span><span class="cx"> if (sourceCodeLocation) {
</span><span class="cx"> subtitle = document.createElement("span");
</span><span class="lines">@@ -87,8 +88,20 @@
</span><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.ConsoleProfileRecorded:
</span><span class="cx"> iconStyleClass = WebInspector.TimelineRecordTreeElement.ConsoleProfileIconStyleClass;
</span><span class="cx"> break;
</span><ins>+ case WebInspector.ScriptTimelineRecord.EventType.TimerInstalled:
+ if (includeDetailsInMainTitle) {
+ var timeoutString = Number.secondsToString(timelineRecord.details.timeout / 1000);
+ alternateSubtitle = subtitle.appendChild(document.createElement("span"));
+ alternateSubtitle.classList.add("alternate-subtitle");
+ if (timelineRecord.details.repeating)
+ alternateSubtitle.textContent = WebInspector.UIString("%s interval").format(timeoutString);
+ else
+ alternateSubtitle.textContent = WebInspector.UIString("%s delay").format(timeoutString);
+ }
+
+ iconStyleClass = WebInspector.TimelineRecordTreeElement.TimerRecordIconStyleClass;
+ break;
</ins><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.TimerFired:
</span><del>- case WebInspector.ScriptTimelineRecord.EventType.TimerInstalled:
</del><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.TimerRemoved:
</span><span class="cx"> iconStyleClass = WebInspector.TimelineRecordTreeElement.TimerRecordIconStyleClass;
</span><span class="cx"> break;
</span><span class="lines">@@ -121,6 +134,9 @@
</span><span class="cx">
</span><span class="cx"> if (this._sourceCodeLocation)
</span><span class="cx"> this.tooltipHandledSeparately = true;
</span><ins>+
+ if (alternateSubtitle)
+ this.titlesElement.appendChild(alternateSubtitle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span></span></pre>
</div>
</div>
</body>
</html>