<!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>[183119] 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/183119">183119</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-04-22 12:00:50 -0700 (Wed, 22 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Fix an exception preventing switching timelines
https://bugs.webkit.org/show_bug.cgi?id=144053
Reviewed by Darin Adler.
* UserInterface/Views/TreeOutline.js:
(WebInspector.TreeElement.prototype.select): Store treeOutline in a local so
we have a reference to it when we go to reset processingSelectionChange.
The calls to onselect was removing the tree element from the outline, causing
"delete this.treeOutline.processingSelectionChange" to throw an exception.
This patch changes the delete to a set to false for good measure too.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</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 (183118 => 183119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2015-04-22 19:00:20 UTC (rev 183118)
+++ trunk/Source/WebInspectorUI/ChangeLog        2015-04-22 19:00:50 UTC (rev 183119)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-04-22 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Fix an exception preventing switching timelines
+ https://bugs.webkit.org/show_bug.cgi?id=144053
+
+ Reviewed by Darin Adler.
+
+ * UserInterface/Views/TreeOutline.js:
+ (WebInspector.TreeElement.prototype.select): Store treeOutline in a local so
+ we have a reference to it when we go to reset processingSelectionChange.
+ The calls to onselect was removing the tree element from the outline, causing
+ "delete this.treeOutline.processingSelectionChange" to throw an exception.
+ This patch changes the delete to a set to false for good measure too.
+
</ins><span class="cx"> 2015-04-21 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Use String.prototype.startsWith in more places
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js (183118 => 183119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js        2015-04-22 19:00:20 UTC (rev 183118)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js        2015-04-22 19:00:50 UTC (rev 183119)
</span><span class="lines">@@ -974,17 +974,18 @@
</span><span class="cx"> this.treeOutline._childrenListNode.focus();
</span><span class="cx">
</span><span class="cx"> // Focusing on another node may detach "this" from tree.
</span><del>- if (!this.treeOutline)
</del><ins>+ var treeOutline = this.treeOutline;
+ if (!treeOutline)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- this.treeOutline.processingSelectionChange = true;
</del><ins>+ treeOutline.processingSelectionChange = true;
</ins><span class="cx">
</span><span class="cx"> if (!this.selected) {
</span><del>- if (this.treeOutline.selectedTreeElement)
- this.treeOutline.selectedTreeElement.deselect(suppressOnDeselect);
</del><ins>+ if (treeOutline.selectedTreeElement)
+ treeOutline.selectedTreeElement.deselect(suppressOnDeselect);
</ins><span class="cx">
</span><span class="cx"> this.selected = true;
</span><del>- this.treeOutline.selectedTreeElement = this;
</del><ins>+ treeOutline.selectedTreeElement = this;
</ins><span class="cx">
</span><span class="cx"> if (this._listItemNode)
</span><span class="cx"> this._listItemNode.classList.add("selected");
</span><span class="lines">@@ -993,10 +994,10 @@
</span><span class="cx"> if (this.onselect && !suppressOnSelect)
</span><span class="cx"> this.onselect(this, selectedByUser);
</span><span class="cx">
</span><del>- if (this.treeOutline.onselect && !suppressOnSelect)
- this.treeOutline.onselect(this, selectedByUser);
</del><ins>+ if (treeOutline.onselect && !suppressOnSelect)
+ treeOutline.onselect(this, selectedByUser);
</ins><span class="cx">
</span><del>- delete this.treeOutline.processingSelectionChange;
</del><ins>+ treeOutline.processingSelectionChange = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> revealAndSelect(omitFocus, selectedByUser, suppressOnSelect, suppressOnDeselect)
</span></span></pre>
</div>
</div>
</body>
</html>