<!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>[193294] 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/193294">193294</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:07:37 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191764">r191764</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsTimelineMarkerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.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 (193293 => 193294)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:07:30 UTC (rev 193293)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:07:37 UTC (rev 193294)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191764. rdar://problem/23221163
+
+ 2015-10-29 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Display console.timeStamp(title) title in timeline markers
+ https://bugs.webkit.org/show_bug.cgi?id=150691
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype._processRecord):
+ (WebInspector.TimelineManager.prototype._processEvent):
+ Detect unused timeline records.
+
+ * UserInterface/Models/TimelineMarker.js:
+ (WebInspector.TimelineMarker):
+ (WebInspector.TimelineMarker.prototype.get details):
+ Give markers an optional details argument.
+
+ * UserInterface/Views/TimelineRuler.js:
+ (WebInspector.TimelineRuler.prototype.addMarker):
+ When a marker is a TimeStamp, use the details title in
+ the tooltip if one is available.
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype._refreshFrameSelectionChart):
+ Used \u in localized string. Kept this an endash since it is a range.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r191740. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-29 Timothy Hatcher <timothy@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 (193293 => 193294)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 19:07:30 UTC (rev 193293)
+++ branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 19:07:37 UTC (rev 193294)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> localizedStrings["%s (hidden)"] = "%s (hidden)";
</span><span class="cx"> localizedStrings["%s Event Dispatched"] = "%s Event Dispatched";
</span><span class="cx"> localizedStrings["%s Prototype"] = "%s Prototype";
</span><ins>+localizedStrings["%s \u2014 %s"] = "%s \u2014 %s";
</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 class="lines">@@ -167,7 +168,7 @@
</span><span class="cx"> localizedStrings["Create a new tab"] = "Create a new tab";
</span><span class="cx"> localizedStrings["Cursor"] = "Cursor";
</span><span class="cx"> localizedStrings["Custom"] = "Custom";
</span><del>-localizedStrings["DOMContentLoaded %s"] = "DOMContentLoaded %s";
</del><ins>+localizedStrings["DOMContentLoaded \u2014 %s"] = "DOMContentLoaded \u2014 %s";
</ins><span class="cx"> localizedStrings["Data"] = "Data";
</span><span class="cx"> localizedStrings["Data returned from the database is too large."] = "Data returned from the database is too large.";
</span><span class="cx"> localizedStrings["Database no longer has expected version."] = "Database no longer has expected version.";
</span><span class="lines">@@ -288,9 +289,9 @@
</span><span class="cx"> localizedStrings["Fragment"] = "Fragment";
</span><span class="cx"> localizedStrings["Frame %d"] = "Frame %d";
</span><span class="cx"> localizedStrings["Frame URL"] = "Frame URL";
</span><del>-localizedStrings["Frame: %d (%s %s)"] = "Frame: %d (%s %s)";
</del><ins>+localizedStrings["Frame: %d (%s \u2013 %s)"] = "Frame: %d (%s \u2013 %s)";
</ins><span class="cx"> localizedStrings["Frames"] = "Frames";
</span><del>-localizedStrings["Frames: %d %d (%s %s)"] = "Frames: %d %d (%s %s)";
</del><ins>+localizedStrings["Frames: %d \u2013 %d (%s \u2013 %s)"] = "Frames: %d \u2013 %d (%s \u2013 %s)";
</ins><span class="cx"> localizedStrings["Frames: None Selected"] = "Frames: None Selected";
</span><span class="cx"> localizedStrings["Full URL"] = "Full URL";
</span><span class="cx"> localizedStrings["Function"] = "Function";
</span><span class="lines">@@ -354,7 +355,7 @@
</span><span class="cx"> localizedStrings["Line Number"] = "Line Number";
</span><span class="cx"> localizedStrings["Linear Gradient"] = "Linear Gradient";
</span><span class="cx"> localizedStrings["Live"] = "Live";
</span><del>-localizedStrings["Load %s"] = "Load %s";
</del><ins>+localizedStrings["Load \u2014 %s"] = "Load \u2014 %s";
</ins><span class="cx"> localizedStrings["Local File"] = "Local File";
</span><span class="cx"> localizedStrings["Local Storage"] = "Local Storage";
</span><span class="cx"> localizedStrings["Local Variables"] = "Local Variables";
</span><span class="lines">@@ -593,7 +594,7 @@
</span><span class="cx"> localizedStrings["Timer Fired"] = "Timer Fired";
</span><span class="cx"> localizedStrings["Timer Installed"] = "Timer Installed";
</span><span class="cx"> localizedStrings["Timer Removed"] = "Timer Removed";
</span><del>-localizedStrings["Timestamp %s"] = "Timestamp %s";
</del><ins>+localizedStrings["Timestamp \u2014 %s"] = "Timestamp \u2014 %s";
</ins><span class="cx"> localizedStrings["Timing"] = "Timing";
</span><span class="cx"> localizedStrings["Top"] = "Top";
</span><span class="cx"> localizedStrings["Total Time"] = "Total Time";
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (193293 => 193294)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-12-03 19:07:30 UTC (rev 193293)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-12-03 19:07:37 UTC (rev 193294)
</span><span class="lines">@@ -311,6 +311,10 @@
</span><span class="cx">
</span><span class="cx"> return new WebInspector.RenderingFrameTimelineRecord(startTime, endTime);
</span><span class="cx">
</span><ins>+ case TimelineAgent.EventType.ParseHTML:
+ // FIXME: <https://webkit.org/b/150689> Web Inspector: Handle or Remove ParseHTML Timeline Event Records
+ return null;
+
</ins><span class="cx"> case TimelineAgent.EventType.EvaluateScript:
</span><span class="cx"> if (!sourceCodeLocation) {
</span><span class="cx"> var mainFrame = WebInspector.frameResourceManager.mainFrame;
</span><span class="lines">@@ -340,6 +344,12 @@
</span><span class="cx"> console.assert(profileData);
</span><span class="cx"> return new WebInspector.ScriptTimelineRecord(WebInspector.ScriptTimelineRecord.EventType.ConsoleProfileRecorded, startTime, endTime, callFrames, sourceCodeLocation, recordPayload.data.title, profileData);
</span><span class="cx">
</span><ins>+ case TimelineAgent.EventType.TimerFire:
+ case TimelineAgent.EventType.EventDispatch:
+ case TimelineAgent.EventType.FireAnimationFrame:
+ // These are handled when the parent of FunctionCall or EvaluateScript.
+ break;
+
</ins><span class="cx"> case TimelineAgent.EventType.FunctionCall:
</span><span class="cx"> // FunctionCall always happens as a child of another record, and since the FunctionCall record
</span><span class="cx"> // has useful info we just make the timeline record here (combining the data from both records).
</span><span class="lines">@@ -404,6 +414,9 @@
</span><span class="cx">
</span><span class="cx"> // Pass the startTime as the endTime since this record type has no duration.
</span><span class="cx"> return new WebInspector.ScriptTimelineRecord(WebInspector.ScriptTimelineRecord.EventType.AnimationFrameCanceled, startTime, startTime, callFrames, sourceCodeLocation, recordPayload.data.id);
</span><ins>+
+ default:
+ console.error("Missing handling of Timeline Event Type: " + recordPayload.type);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return null;
</span><span class="lines">@@ -413,12 +426,17 @@
</span><span class="cx"> {
</span><span class="cx"> switch (recordPayload.type) {
</span><span class="cx"> case TimelineAgent.EventType.TimeStamp:
</span><del>- // FIXME: Make use of "message" payload properties.
</del><span class="cx"> var timestamp = this.activeRecording.computeElapsedTime(recordPayload.startTime);
</span><del>- var eventMarker = new WebInspector.TimelineMarker(timestamp, WebInspector.TimelineMarker.Type.TimeStamp);
</del><ins>+ var eventMarker = new WebInspector.TimelineMarker(timestamp, WebInspector.TimelineMarker.Type.TimeStamp, recordPayload.data.message);
</ins><span class="cx"> this._activeRecording.addEventMarker(eventMarker);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case TimelineAgent.EventType.Time:
+ case TimelineAgent.EventType.TimeEnd:
+ // FIXME: <https://webkit.org/b/150690> Web Inspector: Show console.time/timeEnd ranges in Timeline
+ // FIXME: Make use of "message" payload properties.
+ break;
+
</ins><span class="cx"> default:
</span><span class="cx"> return this._processRecord(recordPayload, parentRecordPayload);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsTimelineMarkerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js (193293 => 193294)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js 2015-12-03 19:07:30 UTC (rev 193293)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js 2015-12-03 19:07:37 UTC (rev 193294)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineMarker = class TimelineMarker extends WebInspector.Object
</span><span class="cx"> {
</span><del>- constructor(time, type)
</del><ins>+ constructor(time, type, details)
</ins><span class="cx"> {
</span><span class="cx"> super();
</span><span class="cx">
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> this._time = time || 0;
</span><span class="cx"> this._type = type;
</span><ins>+ this._details = details || null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="lines">@@ -56,6 +57,11 @@
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><span class="cx"> }
</span><ins>+
+ get details()
+ {
+ return this._details;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineMarker.Event = {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (193293 => 193294)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-12-03 19:07:30 UTC (rev 193293)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-12-03 19:07:37 UTC (rev 193294)
</span><span class="lines">@@ -311,13 +311,16 @@
</span><span class="cx">
</span><span class="cx"> switch (marker.type) {
</span><span class="cx"> case WebInspector.TimelineMarker.Type.LoadEvent:
</span><del>- markerElement.title = WebInspector.UIString("Load – %s").format(Number.secondsToString(marker.time));
</del><ins>+ markerElement.title = WebInspector.UIString("Load \u2014 %s").format(Number.secondsToString(marker.time));
</ins><span class="cx"> break;
</span><span class="cx"> case WebInspector.TimelineMarker.Type.DOMContentEvent:
</span><del>- markerElement.title = WebInspector.UIString("DOMContentLoaded – %s").format(Number.secondsToString(marker.time));
</del><ins>+ markerElement.title = WebInspector.UIString("DOMContentLoaded \u2014 %s").format(Number.secondsToString(marker.time));
</ins><span class="cx"> break;
</span><span class="cx"> case WebInspector.TimelineMarker.Type.TimeStamp:
</span><del>- markerElement.title = WebInspector.UIString("Timestamp – %s").format(Number.secondsToString(marker.time));
</del><ins>+ if (marker.details)
+ markerElement.title = WebInspector.UIString("%s \u2014 %s").format(marker.details, Number.secondsToString(marker.time));
+ else
+ markerElement.title = WebInspector.UIString("Timestamp \u2014 %s").format(Number.secondsToString(marker.time));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (193293 => 193294)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-12-03 19:07:30 UTC (rev 193293)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-12-03 19:07:37 UTC (rev 193294)
</span><span class="lines">@@ -921,10 +921,10 @@
</span><span class="cx"> var lastRecord = records.lastValue;
</span><span class="cx">
</span><span class="cx"> if (records.length > 1) {
</span><del>- this._frameSelectionChartRow.title = WebInspector.UIString("Frames: %d – %d (%s – %s)").format(firstRecord.frameNumber, lastRecord.frameNumber,
</del><ins>+ this._frameSelectionChartRow.title = WebInspector.UIString("Frames: %d \u2013 %d (%s \u2013 %s)").format(firstRecord.frameNumber, lastRecord.frameNumber,
</ins><span class="cx"> Number.secondsToString(firstRecord.startTime), Number.secondsToString(lastRecord.endTime));
</span><span class="cx"> } else {
</span><del>- this._frameSelectionChartRow.title = WebInspector.UIString("Frame: %d (%s – %s)").format(firstRecord.frameNumber,
</del><ins>+ this._frameSelectionChartRow.title = WebInspector.UIString("Frame: %d (%s \u2013 %s)").format(firstRecord.frameNumber,
</ins><span class="cx"> Number.secondsToString(firstRecord.startTime), Number.secondsToString(lastRecord.endTime));
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>