Changeset 200605 in webkit

Timestamp:

May 9, 2016 6:40:26 PM (8 years ago)

Author:

Nikita Vasilyev

Message:

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.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Utilities.js (modified) (1 diff)
• UserInterface/Views/ContentBrowser.js (modified) (3 diffs)
• UserInterface/Views/HierarchicalPathNavigationItem.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+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.
+
 2016-05-09  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js

@@ -425 +425 @@
 });
 
+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;
+    }
+});
+
 Object.defineProperty(Array.prototype, "lastValue",
 {

trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js

@@ -366 +366 @@
     _updateContentViewNavigationItems()
     {
-        var navigationBar = this.navigationBar;
-
-        // First, we remove the navigation items added by the previous content view.
-        this._currentContentViewNavigationItems.forEach(function(navigationItem) {
-            navigationBar.removeNavigationItem(navigationItem);
-        });
-
         var currentContentView = this.currentContentView;
         if (!currentContentView) {
+            this._removeAllNavigationItems();
             this._currentContentViewNavigationItems = [];
             return;
         }
 
-        var insertionIndex = navigationBar.navigationItems.indexOf(this._dividingFlexibleSpaceNavigationItem) + 1;
+        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;
         console.assert(insertionIndex >= 0);
 
         // Keep track of items we'll be adding to the navigation bar.
-        var newNavigationItems = [];
+        let newNavigationItems = [];
 
         // Go through each of the items of the new content view and add a divider before them.
@@ -389 +392 @@
             // Add dividers before items unless it's the first item and not a button.
             if (index !== 0 || navigationItem instanceof WebInspector.ButtonNavigationItem) {
-                var divider = new WebInspector.DividerNavigationItem;
+                let divider = new WebInspector.DividerNavigationItem;
                 navigationBar.insertNavigationItem(divider, insertionIndex++);
                 newNavigationItems.push(divider);
@@ -402 +405 @@
     }
 
+    _removeAllNavigationItems()
+    {
+        for (let navigationItem of this._currentContentViewNavigationItems)
+            this.navigationBar.removeNavigationItem(navigationItem);
+    }
+
     _updateFindBanner(currentContentView)
     {

trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathNavigationItem.js

@@ -45 +45 @@
             newComponents = [];
 
+        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;
+
         for (var i = 0; this._components && i < this._components.length; ++i)
             this._components[i].removeEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this._siblingPathComponentWasSelected, this);