<!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>[171227] 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/171227">171227</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2014-07-18 11:20:54 -0700 (Fri, 18 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.webkit.org/projects/webkit/changeset/169735">r169735</a> since it broke Timeline, and fix bug 129696 in a more targeted way.
REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/169735">r169735</a>): Web Inspector: Timeline tree outline missing data until collapse-expand.
https://bugs.webkit.org/show_bug.cgi?id=134845
Reviewed by Joseph Pecoraro.
* UserInterface/Views/DOMTreeElement.js:
(WebInspector.DOMTreeElement.prototype.adjustCollapsedRange): Use button isteand of assuming
item.listItemElement will be ready to use. The listItemElement node is lazily created.
* UserInterface/Views/TreeOutline.js:
(TreeOutline.prototype.appendChild): Don't attach unless _childrenListNode exists.
(TreeOutline.prototype.insertChild): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.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 (171226 => 171227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-07-18 18:01:24 UTC (rev 171226)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-07-18 18:20:54 UTC (rev 171227)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-18 Timothy Hatcher <timothy@apple.com>
+
+ Revert r169735 since it broke Timeline, and fix bug 129696 in a more targeted way.
+
+ REGRESSION (r169735): Web Inspector: Timeline tree outline missing data until collapse-expand.
+ https://bugs.webkit.org/show_bug.cgi?id=134845
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype.adjustCollapsedRange): Use button isteand of assuming
+ item.listItemElement will be ready to use. The listItemElement node is lazily created.
+ * UserInterface/Views/TreeOutline.js:
+ (TreeOutline.prototype.appendChild): Don't attach unless _childrenListNode exists.
+ (TreeOutline.prototype.insertChild): Ditto.
+
</ins><span class="cx"> 2014-07-17 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Make console.profile record to the Timeline.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (171226 => 171227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2014-07-18 18:01:24 UTC (rev 171226)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2014-07-18 18:20:54 UTC (rev 171227)
</span><span class="lines">@@ -409,15 +409,18 @@
</span><span class="cx"> var button = document.createElement("button");
</span><span class="cx"> button.className = "show-all-nodes";
</span><span class="cx"> button.value = "";
</span><ins>+
</ins><span class="cx"> var item = new TreeElement(button, null, false);
</span><span class="cx"> item.selectable = false;
</span><span class="cx"> item.expandAllButton = true;
</span><ins>+
</ins><span class="cx"> this.insertChild(item, targetButtonIndex);
</span><del>- this.expandAllButtonElement = item.listItemElement.firstChild;
</del><ins>+ this.expandAllButtonElement = button;
</ins><span class="cx"> this.expandAllButtonElement.__treeElement = item;
</span><span class="cx"> this.expandAllButtonElement.addEventListener("click", this.handleLoadAllChildren.bind(this), false);
</span><span class="cx"> } else if (!this.expandAllButtonElement.__treeElement.parent)
</span><span class="cx"> this.insertChild(this.expandAllButtonElement.__treeElement, targetButtonIndex);
</span><ins>+
</ins><span class="cx"> this.expandAllButtonElement.textContent = WebInspector.UIString("Show All Nodes (%d More)").format(childNodeCount - expandedChildCount);
</span><span class="cx"> } else if (this.expandAllButtonElement)
</span><span class="cx"> delete this.expandAllButtonElement;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js (171226 => 171227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2014-07-18 18:01:24 UTC (rev 171226)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2014-07-18 18:20:54 UTC (rev 171227)
</span><span class="lines">@@ -85,16 +85,9 @@
</span><span class="cx"> if (child.hasChildren && child.treeOutline._treeElementsExpandedState[child.identifier] !== undefined)
</span><span class="cx"> child.expanded = child.treeOutline._treeElementsExpandedState[child.identifier];
</span><span class="cx">
</span><del>- if (!this._childrenListNode) {
- this._childrenListNode = this.treeOutline._childrenListNode.ownerDocument.createElement("ol");
- this._childrenListNode.parentTreeElement = this;
- this._childrenListNode.classList.add("children");
- if (this.hidden)
- this._childrenListNode.classList.add("hidden");
- }
</del><ins>+ if (this._childrenListNode)
+ child._attach();
</ins><span class="cx">
</span><del>- child._attach();
-
</del><span class="cx"> if (this.treeOutline.onadd)
</span><span class="cx"> this.treeOutline.onadd(child);
</span><span class="cx">
</span><span class="lines">@@ -141,16 +134,9 @@
</span><span class="cx"> if (child.hasChildren && child.treeOutline._treeElementsExpandedState[child.identifier] !== undefined)
</span><span class="cx"> child.expanded = child.treeOutline._treeElementsExpandedState[child.identifier];
</span><span class="cx">
</span><del>- if (!this._childrenListNode) {
- this._childrenListNode = this.treeOutline._childrenListNode.ownerDocument.createElement("ol");
- this._childrenListNode.parentTreeElement = this;
- this._childrenListNode.classList.add("children");
- if (this.hidden)
- this._childrenListNode.classList.add("hidden");
- }
</del><ins>+ if (this._childrenListNode)
+ child._attach();
</ins><span class="cx">
</span><del>- child._attach();
-
</del><span class="cx"> if (this.treeOutline.onadd)
</span><span class="cx"> this.treeOutline.onadd(child);
</span><span class="cx">
</span><span class="lines">@@ -358,6 +344,7 @@
</span><span class="cx"> // again, to prevent infinite recursion.
</span><span class="cx"> if (ancestors[i] === representedObject)
</span><span class="cx"> continue;
</span><ins>+
</ins><span class="cx"> // FIXME: we could do something faster than findTreeElement since we will know the next
</span><span class="cx"> // ancestor exists in the tree.
</span><span class="cx"> item = this.findTreeElement(ancestors[i], isAncestor, getParent);
</span></span></pre>
</div>
</div>
</body>
</html>