<!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>[193289] 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/193289">193289</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:07:01 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191703">r191703</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsTimelineRecordingjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewcss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordBarcss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRulercss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.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 (193288 => 193289)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:06:52 UTC (rev 193288)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:07:01 UTC (rev 193289)
</span><span class="lines">@@ -1,5 +1,55 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191703. rdar://problem/23221163
+
+ 2015-10-28 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Show Timeline Markers again (DOMContentLoaded, Load, console.timeStamp)
+ https://bugs.webkit.org/show_bug.cgi?id=150612
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ Tooltip strings for the timeline markers.
+
+ * UserInterface/Models/TimelineRecording.js:
+ (WebInspector.TimelineRecording.prototype.addEventMarker):
+ Dispatch an event so the views listening to this recording can add the markers.
+
+ * UserInterface/Views/OverviewTimelineView.js:
+ (WebInspector.OverviewTimelineView):
+ (WebInspector.OverviewTimelineView.prototype._markerAdded):
+ Add the marker to the OverviewTimelineView's ruler.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview):
+ (WebInspector.TimelineOverview.prototype._markerAdded):
+ (WebInspector.TimelineOverview.prototype.addMarker): Deleted.
+ Add the marker to the TimelineOverview's ruler. Remove the unused method.
+
+ * UserInterface/Views/TimelineRuler.js:
+ (WebInspector.TimelineRuler.prototype.addMarker):
+ Give some marker's a tooltip based on their type.
+
+ * UserInterface/Views/TimelineOverview.css:
+ (.timeline-overview > .timeline-ruler > .markers):
+ (.timeline-overview.frames > .timeline-ruler > .markers > .marker:not(.current-time)):
+ Correct the height of markers in the timeline overview.
+ Hide markers non-current-time markers in the rendering frames view.
+
+ * UserInterface/Views/TimelineRuler.css:
+ (.timeline-ruler > .markers > .marker):
+ (.timeline-ruler > .markers > .marker::before):
+ Give markers a bit of width to make it easier to trigger their tooltip.
+
+ (.timeline-ruler > .markers > .marker.load-event):
+ (.timeline-ruler > .markers > .marker.dom-content-event):
+ (.timeline-ruler > .markers > .marker.timestamp):
+ Adjust coloring of the markers. hsla(0.5) was causing bleeding
+ with width 1px to 2px. hsl() with opacity it was always 1px.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r191697. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-28 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 (193288 => 193289)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 19:06:52 UTC (rev 193288)
+++ branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 19:07:01 UTC (rev 193289)
</span><span class="lines">@@ -114,7 +114,6 @@
</span><span class="cx"> localizedStrings["Click Listener"] = "Click Listener";
</span><span class="cx"> localizedStrings["Click or press the spacebar to record."] = "Click or press the spacebar to record.";
</span><span class="cx"> localizedStrings["Click or press the spacebar to stop recording."] = "Click or press the spacebar to stop recording.";
</span><del>-localizedStrings["Click to add a new item."] = "Click to add a new item.";
</del><span class="cx"> localizedStrings["Click to add a new rule."] = "Click to add a new rule.";
</span><span class="cx"> localizedStrings["Click to clear modified properties"] = "Click to clear modified properties";
</span><span class="cx"> localizedStrings["Click to close this tab"] = "Click to close this tab";
</span><span class="lines">@@ -165,6 +164,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><ins>+localizedStrings["DOMContentLoaded %s"] = "DOMContentLoaded %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">@@ -351,6 +351,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><ins>+localizedStrings["Load %s"] = "Load %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">@@ -589,6 +590,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><ins>+localizedStrings["Timestamp %s"] = "Timestamp %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="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsTimelineRecordingjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js (193288 => 193289)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js 2015-12-03 19:06:52 UTC (rev 193288)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js 2015-12-03 19:07:01 UTC (rev 193289)
</span><span class="lines">@@ -148,9 +148,11 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.TimelineRemoved, {timeline});
</span><span class="cx"> }
</span><span class="cx">
</span><del>- addEventMarker(eventMarker)
</del><ins>+ addEventMarker(marker)
</ins><span class="cx"> {
</span><del>- this._eventMarkers.push(eventMarker);
</del><ins>+ this._eventMarkers.push(marker);
+
+ this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.MarkerAdded, {marker});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> addRecord(record)
</span><span class="lines">@@ -280,7 +282,8 @@
</span><span class="cx"> SourceCodeTimelineAdded: "timeline-recording-source-code-timeline-added",
</span><span class="cx"> TimelineAdded: "timeline-recording-timeline-added",
</span><span class="cx"> TimelineRemoved: "timeline-recording-timeline-removed",
</span><del>- TimesUpdated: "timeline-recording-times-updated"
</del><ins>+ TimesUpdated: "timeline-recording-times-updated",
+ MarkerAdded: "timeline-recording-marker-added",
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineRecording.isLegacy = undefined;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js (193288 => 193289)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2015-12-03 19:06:52 UTC (rev 193288)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2015-12-03 19:07:01 UTC (rev 193289)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> this._networkTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
</span><span class="cx">
</span><span class="cx"> recording.addEventListener(WebInspector.TimelineRecording.Event.SourceCodeTimelineAdded, this._sourceCodeTimelineAdded, this);
</span><ins>+ recording.addEventListener(WebInspector.TimelineRecording.Event.MarkerAdded, this._markerAdded, this);
</ins><span class="cx">
</span><span class="cx"> this._pendingRepresentedObjects = [];
</span><span class="cx"> }
</span><span class="lines">@@ -353,6 +354,11 @@
</span><span class="cx"> this.needsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _markerAdded(event)
+ {
+ this._timelineRuler.addMarker(event.data.marker);
+ }
+
</ins><span class="cx"> _dataGridNodeSelected(event)
</span><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewcss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.css (193288 => 193289)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.css 2015-12-03 19:06:52 UTC (rev 193288)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.css 2015-12-03 19:07:01 UTC (rev 193289)
</span><span class="lines">@@ -53,6 +53,14 @@
</span><span class="cx"> right: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.timeline-overview > .timeline-ruler > .markers {
+ top: 28px;
+}
+
+.timeline-overview.frames > .timeline-ruler > .markers > .marker:not(.current-time) {
+ display: none;
+}
+
</ins><span class="cx"> .timeline-overview.frames > .timeline-ruler > .header > .divider,
</span><span class="cx"> .timeline-overview.frames > .timeline-ruler > .markers > .divider {
</span><span class="cx"> transform: translateX(0px);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (193288 => 193289)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-12-03 19:06:52 UTC (rev 193288)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-12-03 19:07:01 UTC (rev 193289)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> this._recording = timelineRecording;
</span><span class="cx"> this._recording.addEventListener(WebInspector.TimelineRecording.Event.TimelineAdded, this._timelineAdded, this);
</span><span class="cx"> this._recording.addEventListener(WebInspector.TimelineRecording.Event.TimelineRemoved, this._timelineRemoved, this);
</span><ins>+ this._recording.addEventListener(WebInspector.TimelineRecording.Event.MarkerAdded, this._markerAdded, this);
</ins><span class="cx">
</span><span class="cx"> this._element = document.createElement("div");
</span><span class="cx"> this._element.classList.add("timeline-overview", identifier);
</span><span class="lines">@@ -269,11 +270,6 @@
</span><span class="cx"> this._resetSelection();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- addMarker(marker)
- {
- this._timelineRuler.addMarker(marker);
- }
-
</del><span class="cx"> revealMarker(marker)
</span><span class="cx"> {
</span><span class="cx"> this.scrollStartTime = marker.time - (this.visibleDuration / 2);
</span><span class="lines">@@ -494,6 +490,11 @@
</span><span class="cx"> this._graphsContainerElement.removeChild(overviewGraph.element);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _markerAdded(event)
+ {
+ this._timelineRuler.addMarker(event.data.marker);
+ }
+
</ins><span class="cx"> _timelineRulerMouseDown(event)
</span><span class="cx"> {
</span><span class="cx"> this._timelineRulerSelectionChanged = false;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordBarcss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.css (193288 => 193289)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.css 2015-12-03 19:06:52 UTC (rev 193288)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.css 2015-12-03 19:07:01 UTC (rev 193289)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> .timeline-record-bar {
</span><span class="cx"> position: absolute;
</span><span class="cx"> height: 12px;
</span><ins>+ z-index: 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .timeline-record-bar > .segment {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRulercss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css (193288 => 193289)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2015-12-03 19:06:52 UTC (rev 193288)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2015-12-03 19:07:01 UTC (rev 193289)
</span><span class="lines">@@ -104,13 +104,28 @@
</span><span class="cx"> transform: translateX(-1px);
</span><span class="cx">
</span><span class="cx"> border-left-width: 1px;
</span><del>- border-left-style: dashed;
</del><ins>+ border-left-style: solid;
</ins><span class="cx"> border-left-color: hsla(0, 0%, 50%, 0.5);
</span><ins>+
+ pointer-events: all;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/* Larger tooltip area */
+.timeline-ruler > .markers > .marker {
+ z-index: 20;
+ width: 3px;
+}
+.timeline-ruler > .markers > .marker::before {
+ width: 3px;
+ content: "";
+ position: absolute;
+ left: -3px;
+ top: 0;
+ bottom: 0;
+}
+
</ins><span class="cx"> .timeline-ruler > .markers > .marker.current-time {
</span><span class="cx"> border-left-color: red;
</span><del>- border-left-style: solid;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .timeline-ruler > .markers > .marker.current-time::before {
</span><span class="lines">@@ -128,15 +143,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .timeline-ruler > .markers > .marker.load-event {
</span><del>- border-left-color: hsla(0, 100%, 50%, 0.5);
</del><ins>+ border-left-color: hsl(0, 100%, 50%);
+ opacity: 0.25;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .timeline-ruler > .markers > .marker.dom-content-event {
</span><del>- border-left-color: hsla(240, 100%, 50%, 0.5);
</del><ins>+ border-left-color: hsl(240, 100%, 50%);
+ opacity: 0.25;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .timeline-ruler > .markers > .marker.timestamp {
</span><del>- border-left-color: hsla(119, 100%, 21%, 0.5);
</del><ins>+ border-left-color: hsl(119, 100%, 21%);
+ opacity: 0.25;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .timeline-ruler > .selection-drag {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (193288 => 193289)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-12-03 19:06:52 UTC (rev 193288)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-12-03 19:07:01 UTC (rev 193289)
</span><span class="lines">@@ -309,6 +309,18 @@
</span><span class="cx"> var markerElement = document.createElement("div");
</span><span class="cx"> markerElement.classList.add(marker.type, "marker");
</span><span class="cx">
</span><ins>+ switch (marker.type) {
+ case WebInspector.TimelineMarker.Type.LoadEvent:
+ markerElement.title = WebInspector.UIString("Load – %s").format(Number.secondsToString(marker.time));
+ break;
+ case WebInspector.TimelineMarker.Type.DOMContentEvent:
+ markerElement.title = WebInspector.UIString("DOMContentLoaded – %s").format(Number.secondsToString(marker.time));
+ break;
+ case WebInspector.TimelineMarker.Type.TimeStamp:
+ markerElement.title = WebInspector.UIString("Timestamp – %s").format(Number.secondsToString(marker.time));
+ break;
+ }
+
</ins><span class="cx"> this._markerElementMap.set(marker, markerElement);
</span><span class="cx">
</span><span class="cx"> this._needsMarkerLayout();
</span></span></pre>
</div>
</div>
</body>
</html>