<!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>[201133] branches/safari-602.1.32-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/201133">201133</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-19 01:39:56 -0700 (Thu, 19 May 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200716">r200716</a>. rdar://problem/26232856</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchSourceWebInspectorUIChangeLog">branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewGraphjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (201132 => 201133)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog        2016-05-19 08:39:53 UTC (rev 201132)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog        2016-05-19 08:39:56 UTC (rev 201133)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2016-05-19  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r200716. rdar://problem/26232856
+
+    2016-05-11  Matt Baker  &lt;mattbaker@apple.com&gt;
+
+            Web Inspector: Make it possible to do special styling on selected TimelineOverviewGraphs
+            https://bugs.webkit.org/show_bug.cgi?id=157593
+            &lt;rdar://problem/26232886&gt;
+
+            Reviewed by Timothy Hatcher.
+
+            * UserInterface/Views/TimelineOverview.js:
+            (WebInspector.TimelineOverview.prototype._timelinesTreeSelectionDidChange.updateGraphSelectedState):
+            (WebInspector.TimelineOverview.prototype._timelinesTreeSelectionDidChange):
+            Select the new overview graph and deselect the old one.
+
+            * UserInterface/Views/TimelineOverviewGraph.js:
+            (WebInspector.TimelineOverviewGraph):
+            (WebInspector.TimelineOverviewGraph.prototype.get selected):
+            (WebInspector.TimelineOverviewGraph.prototype.set selected):
+            New property, toggles &quot;selected&quot; class on the graph element.
+
+2016-05-19  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
</ins><span class="cx">         Merge r200656. rdar://problem/25898256
</span><span class="cx"> 
</span><span class="cx">     2016-05-10  Matt Baker  &lt;mattbaker@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (201132 => 201133)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js        2016-05-19 08:39:53 UTC (rev 201132)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js        2016-05-19 08:39:56 UTC (rev 201133)
</span><span class="lines">@@ -789,16 +789,29 @@
</span><span class="cx">         return this._viewMode === WebInspector.TimelineOverview.ViewMode.Timelines ? this._timelinesViewModeSettings : this._renderingFramesViewModeSettings;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    _timelinesTreeSelectionDidChange()
</del><ins>+    _timelinesTreeSelectionDidChange(event)
</ins><span class="cx">     {
</span><del>-        let treeElement = this._timelinesTreeOutline.selectedTreeElement;
</del><ins>+        function updateGraphSelectedState(timeline, selected)
+        {
+            let overviewGraph = this._overviewGraphsByTypeMap.get(timeline.type);
+            console.assert(overviewGraph, &quot;Missing overview graph for timeline&quot;, timeline);
+            overviewGraph.selected = selected;
+        }
+
+        let selectedTreeElement = event.data.selectedElement;
+        let deselectedTreeElement = event.data.deselectedElement;
</ins><span class="cx">         let timeline = null;
</span><del>-        if (treeElement) {
-            timeline = treeElement.representedObject;
</del><ins>+        if (selectedTreeElement) {
+            timeline = selectedTreeElement.representedObject;
</ins><span class="cx">             console.assert(timeline instanceof WebInspector.Timeline, timeline);
</span><span class="cx">             console.assert(this._recording.timelines.get(timeline.type) === timeline, timeline);
</span><ins>+
+            updateGraphSelectedState.call(this, timeline, true);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        if (deselectedTreeElement)
+            updateGraphSelectedState.call(this, deselectedTreeElement.representedObject, false);
+
</ins><span class="cx">         this._selectedTimeline = timeline;
</span><span class="cx">         this.dispatchEventToListeners(WebInspector.TimelineOverview.Event.TimelineSelected);
</span><span class="cx">     }
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewGraphjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js (201132 => 201133)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js        2016-05-19 08:39:53 UTC (rev 201132)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js        2016-05-19 08:39:56 UTC (rev 201133)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx">         this._selectedRecord = null;
</span><span class="cx">         this._selectedRecordChanged = false;
</span><span class="cx">         this._scheduledSelectedRecordLayoutUpdateIdentifier = undefined;
</span><ins>+        this._selected = false;
</ins><span class="cx">         this._visible = true;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -174,6 +175,17 @@
</span><span class="cx">         return 36;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    get selected() { return this._selected; }
+
+    set selected(x)
+    {
+        if (this._selected === x)
+            return;
+
+        this._selected = x;
+        this.element.classList.toggle(&quot;selected&quot;, this._selected);
+    }
+
</ins><span class="cx">     shown()
</span><span class="cx">     {
</span><span class="cx">         if (this._visible)
</span></span></pre>
</div>
</div>

</body>
</html>