<!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>[200605] 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/200605">200605</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2016-05-09 18:40:26 -0700 (Mon, 09 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: Web Inspector: DOM path bar blinks when modifying inline styles
https://bugs.webkit.org/show_bug.cgi?id=149258
<rdar://problem/22737843>
Reviewed by Timothy Hatcher.
* UserInterface/Base/Utilities.js:
(Array.shallowEqual):
* UserInterface/Views/ContentBrowser.js:
(WebInspector.ContentBrowser.prototype._updateContentViewNavigationItems):
(WebInspector.ContentBrowser.prototype._removeAllNavigationItems):
Don't re-render the navigation bar when all new navigation items match the previous ones.
* UserInterface/Views/HierarchicalPathNavigationItem.js:
(WebInspector.HierarchicalPathNavigationItem.set components.let.componentsEqual):
(WebInspector.HierarchicalPathNavigationItem.prototype.set components):
Don't re-render HierarchicalPathComponent when all new path components match the previous ones.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHierarchicalPathNavigationItemjs">trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathNavigationItem.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (200604 => 200605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-10 01:35:48 UTC (rev 200604)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-10 01:40:26 UTC (rev 200605)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-05-09 Nikita Vasilyev <nvasilyev@apple.com>
+
+ REGRESSION: Web Inspector: DOM path bar blinks when modifying inline styles
+ https://bugs.webkit.org/show_bug.cgi?id=149258
+ <rdar://problem/22737843>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Utilities.js:
+ (Array.shallowEqual):
+ * UserInterface/Views/ContentBrowser.js:
+ (WebInspector.ContentBrowser.prototype._updateContentViewNavigationItems):
+ (WebInspector.ContentBrowser.prototype._removeAllNavigationItems):
+ Don't re-render the navigation bar when all new navigation items match the previous ones.
+
+ * UserInterface/Views/HierarchicalPathNavigationItem.js:
+ (WebInspector.HierarchicalPathNavigationItem.set components.let.componentsEqual):
+ (WebInspector.HierarchicalPathNavigationItem.prototype.set components):
+ Don't re-render HierarchicalPathComponent when all new path components match the previous ones.
+
</ins><span class="cx"> 2016-05-09 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove Global Breakpoints folder
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (200604 => 200605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-05-10 01:35:48 UTC (rev 200604)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-05-10 01:40:26 UTC (rev 200605)
</span><span class="lines">@@ -424,6 +424,27 @@
</span><span class="cx"> value: Element.prototype.createChild
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+Object.defineProperty(Array, "shallowEqual",
+{
+ value: function(a, b)
+ {
+ if (a === b)
+ return true;
+
+ let length = a.length;
+
+ if (length !== b.length)
+ return false;
+
+ for (var i = 0; i < length; ++i) {
+ if (a[i] !== b[i])
+ return false;
+ }
+
+ return true;
+ }
+});
+
</ins><span class="cx"> Object.defineProperty(Array.prototype, "lastValue",
</span><span class="cx"> {
</span><span class="cx"> get: function()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (200604 => 200605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2016-05-10 01:35:48 UTC (rev 200604)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2016-05-10 01:40:26 UTC (rev 200605)
</span><span class="lines">@@ -365,30 +365,33 @@
</span><span class="cx">
</span><span class="cx"> _updateContentViewNavigationItems()
</span><span class="cx"> {
</span><del>- var navigationBar = this.navigationBar;
-
- // First, we remove the navigation items added by the previous content view.
- this._currentContentViewNavigationItems.forEach(function(navigationItem) {
- navigationBar.removeNavigationItem(navigationItem);
- });
-
</del><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView) {
</span><ins>+ this._removeAllNavigationItems();
</ins><span class="cx"> this._currentContentViewNavigationItems = [];
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var insertionIndex = navigationBar.navigationItems.indexOf(this._dividingFlexibleSpaceNavigationItem) + 1;
</del><ins>+ let previousItems = this._currentContentViewNavigationItems.filter((item) => !(item instanceof WebInspector.DividerNavigationItem));
+ let isUnchanged = Array.shallowEqual(previousItems, currentContentView.navigationItems);
+
+ if (isUnchanged)
+ return;
+
+ this._removeAllNavigationItems();
+
+ let navigationBar = this.navigationBar;
+ let insertionIndex = navigationBar.navigationItems.indexOf(this._dividingFlexibleSpaceNavigationItem) + 1;
</ins><span class="cx"> console.assert(insertionIndex >= 0);
</span><span class="cx">
</span><span class="cx"> // Keep track of items we'll be adding to the navigation bar.
</span><del>- var newNavigationItems = [];
</del><ins>+ let newNavigationItems = [];
</ins><span class="cx">
</span><span class="cx"> // Go through each of the items of the new content view and add a divider before them.
</span><span class="cx"> currentContentView.navigationItems.forEach(function(navigationItem, index) {
</span><span class="cx"> // Add dividers before items unless it's the first item and not a button.
</span><span class="cx"> if (index !== 0 || navigationItem instanceof WebInspector.ButtonNavigationItem) {
</span><del>- var divider = new WebInspector.DividerNavigationItem;
</del><ins>+ let divider = new WebInspector.DividerNavigationItem;
</ins><span class="cx"> navigationBar.insertNavigationItem(divider, insertionIndex++);
</span><span class="cx"> newNavigationItems.push(divider);
</span><span class="cx"> }
</span><span class="lines">@@ -401,6 +404,12 @@
</span><span class="cx"> this._currentContentViewNavigationItems = newNavigationItems;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _removeAllNavigationItems()
+ {
+ for (let navigationItem of this._currentContentViewNavigationItems)
+ this.navigationBar.removeNavigationItem(navigationItem);
+ }
+
</ins><span class="cx"> _updateFindBanner(currentContentView)
</span><span class="cx"> {
</span><span class="cx"> if (!this._findBanner)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHierarchicalPathNavigationItemjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathNavigationItem.js (200604 => 200605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathNavigationItem.js 2016-05-10 01:35:48 UTC (rev 200604)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathNavigationItem.js 2016-05-10 01:40:26 UTC (rev 200605)
</span><span class="lines">@@ -44,6 +44,16 @@
</span><span class="cx"> if (!newComponents)
</span><span class="cx"> newComponents = [];
</span><span class="cx">
</span><ins>+ let componentsEqual = function(a, b) {
+ let getRepresentedObjects = (component) => component.representedObject;
+ let representedObjectsA = a.map(getRepresentedObjects);
+ let representedObjectsB = b.map(getRepresentedObjects);
+ return Array.shallowEqual(representedObjectsA, representedObjectsB);
+ };
+
+ if (this._components && componentsEqual(this._components, newComponents))
+ return;
+
</ins><span class="cx"> for (var i = 0; this._components && i < this._components.length; ++i)
</span><span class="cx"> this._components[i].removeEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this._siblingPathComponentWasSelected, this);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>