<!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>[198441] 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/198441">198441</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-18 13:23:10 -0700 (Fri, 18 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Timeline reset issues after Navigation Sidebar removal
https://bugs.webkit.org/show_bug.cgi?id=155658
&lt;rdar://problem/25245292&gt;

Patch by Joseph Pecoraro &lt;pecoraro@apple.com&gt; on 2016-03-18
Reviewed by Timothy Hatcher.

* UserInterface/Views/CircleChart.js:
(WebInspector.CircleChart.prototype.set values):
If the segments have never been set the values list will be empty.
Allow clearing to set empty values again.

* UserInterface/Views/ScriptClusterTimelineView.js:
(WebInspector.ScriptClusterTimelineView.prototype._scriptClusterViewCurrentContentViewDidChange):
(WebInspector.ScriptClusterTimelineView):
Timeline sidebar no longer exists. Replace with the common
FIXME added to the other TimelineViews.

* UserInterface/Views/TimelineView.js:
(WebInspector.TimelineView.prototype.reset):
Timeline sidebar and content tree outline no longer exist.
Replace with the common comment indicating this method
is intended for subclasses.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCircleChartjs">trunk/Source/WebInspectorUI/UserInterface/Views/CircleChart.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScriptClusterTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (198440 => 198441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2016-03-18 19:58:28 UTC (rev 198440)
+++ trunk/Source/WebInspectorUI/ChangeLog        2016-03-18 20:23:10 UTC (rev 198441)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-03-18  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Web Inspector: Timeline reset issues after Navigation Sidebar removal
+        https://bugs.webkit.org/show_bug.cgi?id=155658
+        &lt;rdar://problem/25245292&gt;
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/CircleChart.js:
+        (WebInspector.CircleChart.prototype.set values):
+        If the segments have never been set the values list will be empty.
+        Allow clearing to set empty values again.
+
+        * UserInterface/Views/ScriptClusterTimelineView.js:
+        (WebInspector.ScriptClusterTimelineView.prototype._scriptClusterViewCurrentContentViewDidChange):
+        (WebInspector.ScriptClusterTimelineView):
+        Timeline sidebar no longer exists. Replace with the common
+        FIXME added to the other TimelineViews.
+
+        * UserInterface/Views/TimelineView.js:
+        (WebInspector.TimelineView.prototype.reset):
+        Timeline sidebar and content tree outline no longer exist.
+        Replace with the common comment indicating this method
+        is intended for subclasses.
+
</ins><span class="cx"> 2016-03-17  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r197724): [GTK] Web Inspector: Images being blocked by CSP 2.0
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCircleChartjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CircleChart.js (198440 => 198441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CircleChart.js        2016-03-18 19:58:28 UTC (rev 198440)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CircleChart.js        2016-03-18 20:23:10 UTC (rev 198441)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> 
</span><span class="cx">     set values(values)
</span><span class="cx">     {
</span><del>-        console.assert(values.length === this._pathElements.length, &quot;Should have the same number of values as segments&quot;);
</del><ins>+        console.assert(!values.length || values.length === this._pathElements.length, &quot;Should have the same number of values as segments&quot;);
</ins><span class="cx"> 
</span><span class="cx">         this._values = values;
</span><span class="cx">         this._total = 0;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScriptClusterTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js (198440 => 198441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js        2016-03-18 19:58:28 UTC (rev 198440)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js        2016-03-18 20:23:10 UTC (rev 198441)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx">         currentContentView.endTime = previousContentView.endTime;
</span><span class="cx">         currentContentView.currentTime = previousContentView.currentTime;
</span><span class="cx"> 
</span><del>-        currentContentView.timelineSidebarPanel.updateFilter();
</del><ins>+        // FIXME: &lt;https://webkit.org/b/154924&gt; Web Inspector: hook up grid row filtering in the new Timelines UI
</ins><span class="cx">     }
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (198440 => 198441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js        2016-03-18 19:58:28 UTC (rev 198440)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js        2016-03-18 20:23:10 UTC (rev 198441)
</span><span class="lines">@@ -134,8 +134,7 @@
</span><span class="cx"> 
</span><span class="cx">     reset()
</span><span class="cx">     {
</span><del>-        this._contentTreeOutline.removeChildren();
-        this._timelineSidebarPanel.hideEmptyContentPlaceholder();
</del><ins>+        // Implemented by sub-classes if needed.
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     filterDidChange()
</span></span></pre>
</div>
</div>

</body>
</html>