<!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>[186306] 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/186306">186306</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-07-06 00:13:43 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Exceptions in Network timeline when resource updates and filters are applied
https://bugs.webkit.org/show_bug.cgi?id=146609
Reviewed by Joseph Pecoraro.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype.insertChild):
(WebInspector.DataGrid.prototype.removeChild):
(WebInspector.DataGridNode.prototype.savePosition):
Convert exceptions to asserts and early returns.
* UserInterface/Views/TimelineDataGrid.js:
(WebInspector.TimelineDataGrid.prototype._refreshDirtyDataGridNodes): Add some asserts and checks.
* UserInterface/Views/TreeOutline.js:
(WebInspector.TreeOutline.prototype.appendChild):
(WebInspector.TreeOutline.prototype.insertChild):
(WebInspector.TreeOutline.prototype.removeChildAtIndex):
(WebInspector.TreeOutline.prototype.removeChild):
Convert exceptions to asserts and early returns.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs">trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (186305 => 186306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-06 07:02:48 UTC (rev 186305)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-06 07:13:43 UTC (rev 186306)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-07-06 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Exceptions in Network timeline when resource updates and filters are applied
+ https://bugs.webkit.org/show_bug.cgi?id=146609
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype.insertChild):
+ (WebInspector.DataGrid.prototype.removeChild):
+ (WebInspector.DataGridNode.prototype.savePosition):
+ Convert exceptions to asserts and early returns.
+
+ * UserInterface/Views/TimelineDataGrid.js:
+ (WebInspector.TimelineDataGrid.prototype._refreshDirtyDataGridNodes): Add some asserts and checks.
+
+ * UserInterface/Views/TreeOutline.js:
+ (WebInspector.TreeOutline.prototype.appendChild):
+ (WebInspector.TreeOutline.prototype.insertChild):
+ (WebInspector.TreeOutline.prototype.removeChildAtIndex):
+ (WebInspector.TreeOutline.prototype.removeChild):
+ Convert exceptions to asserts and early returns.
+
</ins><span class="cx"> 2015-07-05 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Cached resources are missing startTime and size in Network timeline
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (186305 => 186306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2015-07-06 07:02:48 UTC (rev 186305)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2015-07-06 07:13:43 UTC (rev 186306)
</span><span class="lines">@@ -719,10 +719,13 @@
</span><span class="cx">
</span><span class="cx"> insertChild: function(child, index)
</span><span class="cx"> {
</span><ins>+ console.assert(child);
</ins><span class="cx"> if (!child)
</span><del>- throw("insertChild: Node can't be undefined or null.");
</del><ins>+ return;
+
+ console.assert(child.parent !== this);
</ins><span class="cx"> if (child.parent === this)
</span><del>- throw("insertChild: Node is already a child of this node.");
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> if (child.parent)
</span><span class="cx"> child.parent.removeChild(child);
</span><span class="lines">@@ -755,10 +758,13 @@
</span><span class="cx">
</span><span class="cx"> removeChild: function(child)
</span><span class="cx"> {
</span><ins>+ console.assert(child);
</ins><span class="cx"> if (!child)
</span><del>- throw("removeChild: Node can't be undefined or null.");
</del><ins>+ return;
+
+ console.assert(child.parent === this);
</ins><span class="cx"> if (child.parent !== this)
</span><del>- throw("removeChild: Node is not a child of this node.");
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> child.deselect();
</span><span class="cx"> child._detach();
</span><span class="lines">@@ -1869,8 +1875,10 @@
</span><span class="cx"> if (this._savedPosition)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ console.assert(this.parent);
</ins><span class="cx"> if (!this.parent)
</span><del>- throw("savePosition: Node must have a parent.");
</del><ins>+ return;
+
</ins><span class="cx"> this._savedPosition = {
</span><span class="cx"> parent: this.parent,
</span><span class="cx"> index: this.parent.children.indexOf(this)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (186305 => 186306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2015-07-06 07:02:48 UTC (rev 186305)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2015-07-06 07:13:43 UTC (rev 186306)
</span><span class="lines">@@ -244,9 +244,14 @@
</span><span class="cx"> var treeElement = this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(dataGridNode);
</span><span class="cx"> console.assert(treeElement);
</span><span class="cx">
</span><del>- treeOutline.removeChild(treeElement);
- this.removeChild(dataGridNode);
</del><ins>+ console.assert(!treeElement.parent || treeElement.parent === treeOutline);
+ if (treeElement.parent === treeOutline)
+ treeOutline.removeChild(treeElement);
</ins><span class="cx">
</span><ins>+ console.assert(!dataGridNode.parent || dataGridNode.parent === this);
+ if (dataGridNode.parent === this)
+ this.removeChild(dataGridNode);
+
</ins><span class="cx"> var insertionIndex = insertionIndexForObjectInListSortedByFunction(dataGridNode, this.children, sortComparator);
</span><span class="cx"> treeOutline.insertChild(treeElement, insertionIndex);
</span><span class="cx"> this.insertChild(dataGridNode, insertionIndex);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js (186305 => 186306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2015-07-06 07:02:48 UTC (rev 186305)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2015-07-06 07:13:43 UTC (rev 186306)
</span><span class="lines">@@ -55,8 +55,9 @@
</span><span class="cx">
</span><span class="cx"> appendChild(child)
</span><span class="cx"> {
</span><ins>+ console.assert(child);
</ins><span class="cx"> if (!child)
</span><del>- throw "child can't be undefined or null";
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> var lastChild = this.children[this.children.length - 1];
</span><span class="cx"> if (lastChild) {
</span><span class="lines">@@ -97,8 +98,9 @@
</span><span class="cx">
</span><span class="cx"> insertChild(child, index)
</span><span class="cx"> {
</span><ins>+ console.assert(child);
</ins><span class="cx"> if (!child)
</span><del>- throw "child can't be undefined or null";
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> var previousChild = (index > 0 ? this.children[index - 1] : null);
</span><span class="cx"> if (previousChild) {
</span><span class="lines">@@ -146,8 +148,9 @@
</span><span class="cx">
</span><span class="cx"> removeChildAtIndex(childIndex, suppressOnDeselect, suppressSelectSibling)
</span><span class="cx"> {
</span><ins>+ console.assert(childIndex >= 0 && childIndex < this.children.length);
</ins><span class="cx"> if (childIndex < 0 || childIndex >= this.children.length)
</span><del>- throw "childIndex out of range";
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> var child = this.children[childIndex];
</span><span class="cx"> this.children.splice(childIndex, 1);
</span><span class="lines">@@ -184,12 +187,14 @@
</span><span class="cx">
</span><span class="cx"> removeChild(child, suppressOnDeselect, suppressSelectSibling)
</span><span class="cx"> {
</span><ins>+ console.assert(child);
</ins><span class="cx"> if (!child)
</span><del>- throw "child can't be undefined or null";
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> var childIndex = this.children.indexOf(child);
</span><ins>+ console.assert(childIndex !== -1);
</ins><span class="cx"> if (childIndex === -1)
</span><del>- throw "child not found in this node's children";
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> this.removeChildAtIndex(childIndex, suppressOnDeselect, suppressSelectSibling);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>