<!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>[193203] branches/safari-601-branch/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/193203">193203</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:57:20 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189385">r189385</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsSearchSidebarPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193202 => 193203)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog        2015-12-03 18:57:15 UTC (rev 193202)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog        2015-12-03 18:57:20 UTC (rev 193203)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r189385. rdar://problem/23221163
+
+ 2015-09-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Clean up and modernize DOMTreeManager
+ https://bugs.webkit.org/show_bug.cgi?id=148821
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/DOMTreeManager.js:
+ (WebInspector.DOMTreeManager.prototype.requestDocument.onDocumentAvailable):
+ (WebInspector.DOMTreeManager.prototype.requestDocument):
+ (WebInspector.DOMTreeManager.prototype.pushNodeByPathToFrontend):
+ (WebInspector.DOMTreeManager.prototype._wrapClientCallback):
+ (WebInspector.DOMTreeManager.prototype._attributeModified):
+ (WebInspector.DOMTreeManager.prototype._attributeRemoved):
+ (WebInspector.DOMTreeManager.prototype._inlineStyleInvalidated):
+ (WebInspector.DOMTreeManager.prototype._loadNodeAttributes):
+ (WebInspector.DOMTreeManager.prototype.cancelSearch):
+ (WebInspector.DOMTreeManager.prototype.querySelector):
+ (WebInspector.DOMTreeManager.prototype.querySelectorAll):
+ (WebInspector.DOMTreeManager.prototype.highlightDOMNode):
+ (WebInspector.DOMTreeManager.prototype._buildHighlightConfig):
+ Cleanup and modernize where appropriate.
+
+ * UserInterface/Views/SearchSidebarPanel.js:
+ (WebInspector.SearchSidebarPanel.prototype.performSearch):
+ Callback is now required.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r189374. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-09-04 Matt Baker <mattbaker@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js (193202 => 193203)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js        2015-12-03 18:57:15 UTC (rev 193202)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js        2015-12-03 18:57:20 UTC (rev 193203)
</span><span class="lines">@@ -59,8 +59,7 @@
</span><span class="cx"> requestDocument(callback)
</span><span class="cx"> {
</span><span class="cx"> if (this._document) {
</span><del>- if (callback)
- callback(this._document);
</del><ins>+ callback(this._document);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -76,12 +75,10 @@
</span><span class="cx"> if (!error)
</span><span class="cx"> this._setDocument(root);
</span><span class="cx">
</span><del>- for (var i = 0; i < this._pendingDocumentRequestCallbacks.length; ++i) {
- var callback = this._pendingDocumentRequestCallbacks[i];
- if (callback)
- callback(this._document);
- }
- delete this._pendingDocumentRequestCallbacks;
</del><ins>+ for (var callback of this._pendingDocumentRequestCallbacks)
+ callback(this._document);
+
+ this._pendingDocumentRequestCallbacks = null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DOMAgent.getDocument(onDocumentAvailable.bind(this));
</span><span class="lines">@@ -94,8 +91,7 @@
</span><span class="cx">
</span><span class="cx"> pushNodeByPathToFrontend(path, callback)
</span><span class="cx"> {
</span><del>- var callbackCast = callback;
- this._dispatchWhenDocumentAvailable(DOMAgent.pushNodeByPathToFrontend.bind(DOMAgent, path), callbackCast);
</del><ins>+ this._dispatchWhenDocumentAvailable(DOMAgent.pushNodeByPathToFrontend.bind(DOMAgent, path), callback);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="lines">@@ -103,7 +99,8 @@
</span><span class="cx"> _wrapClientCallback(callback)
</span><span class="cx"> {
</span><span class="cx"> if (!callback)
</span><del>- return;
</del><ins>+ return null;
+
</ins><span class="cx"> return function(error, result) {
</span><span class="cx"> if (error)
</span><span class="cx"> console.error("Error during DOMAgent operation: " + error);
</span><span class="lines">@@ -132,6 +129,7 @@
</span><span class="cx"> var node = this._idToDOMNode[nodeId];
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> node._setAttribute(name, value);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMTreeManager.Event.AttributeModified, {node, name});
</span><span class="cx"> node.dispatchEventToListeners(WebInspector.DOMNode.Event.AttributeModified, {name});
</span><span class="lines">@@ -142,6 +140,7 @@
</span><span class="cx"> var node = this._idToDOMNode[nodeId];
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> node._removeAttribute(name);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMTreeManager.Event.AttributeRemoved, {node, name});
</span><span class="cx"> node.dispatchEventToListeners(WebInspector.DOMNode.Event.AttributeRemoved, {name});
</span><span class="lines">@@ -149,8 +148,8 @@
</span><span class="cx">
</span><span class="cx"> _inlineStyleInvalidated(nodeIds)
</span><span class="cx"> {
</span><del>- for (var i = 0; i < nodeIds.length; ++i)
- this._attributeLoadNodeIds[nodeIds[i]] = true;
</del><ins>+ for (var nodeId of nodeIds)
+ this._attributeLoadNodeIds[nodeId] = true;
</ins><span class="cx"> if ("_loadNodeAttributesTimeout" in this)
</span><span class="cx"> return;
</span><span class="cx"> this._loadNodeAttributesTimeout = setTimeout(this._loadNodeAttributes.bind(this), 0);
</span><span class="lines">@@ -172,10 +171,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- delete this._loadNodeAttributesTimeout;
</del><ins>+ this._loadNodeAttributesTimeout = undefined;
</ins><span class="cx">
</span><span class="cx"> for (var nodeId in this._attributeLoadNodeIds) {
</span><del>- var nodeIdAsNumber = parseInt(nodeId, 10);
</del><ins>+ var nodeIdAsNumber = parseInt(nodeId);
</ins><span class="cx"> DOMAgent.getAttributes(nodeIdAsNumber, callback.bind(this, nodeIdAsNumber));
</span><span class="cx"> }
</span><span class="cx"> this._attributeLoadNodeIds = {};
</span><span class="lines">@@ -371,27 +370,25 @@
</span><span class="cx"> {
</span><span class="cx"> if (this._searchId) {
</span><span class="cx"> DOMAgent.discardSearchResults(this._searchId);
</span><del>- delete this._searchId;
</del><ins>+ this._searchId = undefined;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> querySelector(nodeId, selectors, callback)
</span><span class="cx"> {
</span><del>- var callbackCast = callback;
- DOMAgent.querySelector(nodeId, selectors, this._wrapClientCallback(callbackCast));
</del><ins>+ DOMAgent.querySelector(nodeId, selectors, this._wrapClientCallback(callback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> querySelectorAll(nodeId, selectors, callback)
</span><span class="cx"> {
</span><del>- var callbackCast = callback;
- DOMAgent.querySelectorAll(nodeId, selectors, this._wrapClientCallback(callbackCast));
</del><ins>+ DOMAgent.querySelectorAll(nodeId, selectors, this._wrapClientCallback(callback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> highlightDOMNode(nodeId, mode)
</span><span class="cx"> {
</span><span class="cx"> if (this._hideDOMNodeHighlightTimeout) {
</span><span class="cx"> clearTimeout(this._hideDOMNodeHighlightTimeout);
</span><del>- delete this._hideDOMNodeHighlightTimeout;
</del><ins>+ this._hideDOMNodeHighlightTimeout = undefined;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._highlightedDOMNodeId = nodeId;
</span><span class="lines">@@ -450,10 +447,10 @@
</span><span class="cx"> DOMAgent.setInspectModeEnabled(enabled, this._buildHighlightConfig(), callback.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _buildHighlightConfig(mode)
</del><ins>+ _buildHighlightConfig(mode = "all")
</ins><span class="cx"> {
</span><del>- mode = mode || "all";
- var highlightConfig = { showInfo: mode === "all" };
</del><ins>+ var highlightConfig = {showInfo: mode === "all"};
+
</ins><span class="cx"> if (mode === "all" || mode === "content")
</span><span class="cx"> highlightConfig.contentColor = {r: 111, g: 168, b: 220, a: 0.66};
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js (193202 => 193203)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js        2015-12-03 18:57:15 UTC (rev 193202)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js        2015-12-03 18:57:20 UTC (rev 193203)
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> if (childRecord.type === WebInspector.TimelineRecord.Type.Layout) {
</span><span class="cx"> childTreeElement = new WebInspector.TimelineRecordTreeElement(childRecord, WebInspector.SourceCodeLocation.NameStyle.Short);
</span><span class="cx"> if (childRecord.width && childRecord.height) {
</span><del>- let subtitle = document.createElement("span");
</del><ins>+ var subtitle = document.createElement("span");
</ins><span class="cx"> subtitle.textContent = WebInspector.UIString("%d \u2A09 %d").format(childRecord.width, childRecord.height);
</span><span class="cx"> childTreeElement.subtitle = subtitle;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsSearchSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js (193202 => 193203)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js        2015-12-03 18:57:15 UTC (rev 193202)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js        2015-12-03 18:57:20 UTC (rev 193203)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.DOMAgent)
</span><del>- WebInspector.domTreeManager.requestDocument();
</del><ins>+ WebInspector.domTreeManager.requestDocument(function(){});
</ins><span class="cx">
</span><span class="cx"> if (window.PageAgent)
</span><span class="cx"> PageAgent.searchInResources(searchQuery, isCaseSensitive, isRegex, resourcesCallback.bind(this));
</span></span></pre>
</div>
</div>
</body>
</html>