<!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>[180486] 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/180486">180486</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-22 08:49:13 -0800 (Sun, 22 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Lazily Create GeneralTreeElement Status Elements
https://bugs.webkit.org/show_bug.cgi?id=141873
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-02-22
Reviewed by Timothy Hatcher.
* UserInterface/Views/GeneralTreeElement.js:
(WebInspector.GeneralTreeElement.prototype.set status):
(WebInspector.GeneralTreeElement.prototype.onattach):
(WebInspector.GeneralTreeElement.prototype._createElementsIfNeeded):
(WebInspector.GeneralTreeElement.prototype._updateStatusElement):
Lazily create and attach the status element container if
"this.status" is actually used by a GeneralTreeElement subclass.
* UserInterface/Views/ResourceTreeElement.js:
(WebInspector.ResourceTreeElement.prototype._updateStatus):
Set to the empty string instead of null to avoid inadvertently
creating status elements for no reason.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsGeneralTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (180485 => 180486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-02-22 16:47:54 UTC (rev 180485)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-02-22 16:49:13 UTC (rev 180486)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-02-22 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Lazily Create GeneralTreeElement Status Elements
+ https://bugs.webkit.org/show_bug.cgi?id=141873
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/GeneralTreeElement.js:
+ (WebInspector.GeneralTreeElement.prototype.set status):
+ (WebInspector.GeneralTreeElement.prototype.onattach):
+ (WebInspector.GeneralTreeElement.prototype._createElementsIfNeeded):
+ (WebInspector.GeneralTreeElement.prototype._updateStatusElement):
+ Lazily create and attach the status element container if
+ "this.status" is actually used by a GeneralTreeElement subclass.
+
+ * UserInterface/Views/ResourceTreeElement.js:
+ (WebInspector.ResourceTreeElement.prototype._updateStatus):
+ Set to the empty string instead of null to avoid inadvertently
+ creating status elements for no reason.
+
+2015-02-22 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Give ObjectPreviewView a showTitle/showPreview toggle
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141874
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsGeneralTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js (180485 => 180486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js 2015-02-22 16:47:54 UTC (rev 180485)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js 2015-02-22 16:49:13 UTC (rev 180486)
</span><span class="lines">@@ -206,6 +206,11 @@
</span><span class="cx"> if (this._status === x)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!this._statusElement) {
+ this._statusElement = document.createElement("div");
+ this._statusElement.className = WebInspector.GeneralTreeElement.StatusElementStyleClassName;
+ }
+
</ins><span class="cx"> this._status = x || "";
</span><span class="cx"> this._updateStatusElement();
</span><span class="cx"> },
</span><span class="lines">@@ -236,7 +241,6 @@
</span><span class="cx"> {
</span><span class="cx"> this._createElementsIfNeeded();
</span><span class="cx"> this._updateTitleElements();
</span><del>- this._updateStatusElement();
</del><span class="cx">
</span><span class="cx"> this._listItemNode.classList.add(WebInspector.GeneralTreeElement.StyleClassName);
</span><span class="cx">
</span><span class="lines">@@ -253,7 +257,6 @@
</span><span class="cx">
</span><span class="cx"> this._listItemNode.appendChild(this._disclosureButton);
</span><span class="cx"> this._listItemNode.appendChild(this._iconElement);
</span><del>- this._listItemNode.appendChild(this._statusElement);
</del><span class="cx"> this._listItemNode.appendChild(this._titlesElement);
</span><span class="cx">
</span><span class="cx"> if (this.oncontextmenu && typeof this.oncontextmenu === "function") {
</span><span class="lines">@@ -265,6 +268,8 @@
</span><span class="cx"> this._boundContextMenuEventHandler = function(event) { this.treeOutline.oncontextmenu(event, this); }.bind(this);
</span><span class="cx"> this._listItemNode.addEventListener("contextmenu", this._boundContextMenuEventHandler, true);
</span><span class="cx"> }
</span><ins>+
+ this._updateStatusElement();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> ondetach: function()
</span><span class="lines">@@ -314,9 +319,6 @@
</span><span class="cx"> this._iconElement = document.createElement("img");
</span><span class="cx"> this._iconElement.className = WebInspector.GeneralTreeElement.IconElementStyleClassName;
</span><span class="cx">
</span><del>- this._statusElement = document.createElement("div");
- this._statusElement.className = WebInspector.GeneralTreeElement.StatusElementStyleClassName;
-
</del><span class="cx"> this._titlesElement = document.createElement("div");
</span><span class="cx"> this._titlesElement.className = WebInspector.GeneralTreeElement.TitlesElementStyleClassName;
</span><span class="cx">
</span><span class="lines">@@ -385,9 +387,12 @@
</span><span class="cx">
</span><span class="cx"> _updateStatusElement: function()
</span><span class="cx"> {
</span><del>- if (!this._createdElements)
</del><ins>+ if (!this._statusElement)
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!this._statusElement.parentNode && this._listItemNode)
+ this._listItemNode.insertBefore(this._statusElement, this._titlesElement);
+
</ins><span class="cx"> if (this._status instanceof Node) {
</span><span class="cx"> this._statusElement.removeChildren();
</span><span class="cx"> this._statusElement.appendChild(this._status);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js (180485 => 180486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2015-02-22 16:47:54 UTC (rev 180485)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2015-02-22 16:49:13 UTC (rev 180486)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> if (this._resource.isMainResource() && frame && frame.isMainFrame() && this instanceof WebInspector.FrameTreeElement)
</span><span class="cx"> this.updateStatusForMainFrame();
</span><span class="cx"> else
</span><del>- this.status = null;
</del><ins>+ this.status = "";
</ins><span class="cx"> } else {
</span><span class="cx"> var spinner = new WebInspector.IndeterminateProgressSpinner;
</span><span class="cx"> this.status = spinner.element;
</span></span></pre>
</div>
</div>
</body>
</html>