Changeset 240594 in webkit

Timestamp:

Jan 28, 2019 11:53:20 AM (5 years ago)

Author:

Matt Baker

Message:

REGRESSION(?): Web Inspector: Can have multiple Timelines selected after edit mode
​https://bugs.webkit.org/show_bug.cgi?id=193808
<rdar://problem/47537734>

Reviewed by Devin Rousso.

• UserInterface/Controllers/SelectionController.js:

(WI.SelectionController.prototype.didRemoveItems):

• UserInterface/Views/TreeOutline.js:

(WI.TreeOutline.prototype._indexesForSubtree):
Fix a bug where no IndexSet was returned when passed a TreeElement with
no children. This caused the Timelines tree selection to be corrupted when
entering and exiting edit mode, as TreeElements are inserted and removed.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Controllers/SelectionController.js (modified) (1 diff)
• UserInterface/Views/TreeOutline.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-01-28  Matt Baker  <mattbaker@apple.com>
+
+        REGRESSION(?): Web Inspector: Can have multiple Timelines selected after edit mode
+        https://bugs.webkit.org/show_bug.cgi?id=193808
+        <rdar://problem/47537734>
+
+        Reviewed by Devin Rousso.
+
+        * UserInterface/Controllers/SelectionController.js:
+        (WI.SelectionController.prototype.didRemoveItems):
+
+        * UserInterface/Views/TreeOutline.js:
+        (WI.TreeOutline.prototype._indexesForSubtree):
+        Fix a bug where no IndexSet was returned when passed a TreeElement with
+        no children. This caused the Timelines tree selection to be corrupted when
+        entering and exiting edit mode, as TreeElements are inserted and removed.
+
 2019-01-28  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/SelectionController.js

@@ -222 +222 @@
     didRemoveItems(indexes)
     {
+        if (!indexes)
+            return;
+
         console.assert(indexes instanceof WI.IndexSet);
 
-        if (!this._selectedIndexes.size)
+        if (!indexes.size || !this._selectedIndexes.size)
             return;
 

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

@@ -1083 +1083 @@
         let treeOutline = treeElement.treeOutline;
         if (!treeOutline)
-            return new WI.IndexSet;
+            return null;
 
         let firstChild = treeElement.children[0];
-        if (!firstChild)
-            return new WI.IndexSet;
-
-        let startIndex = treeOutline._indexOfTreeElement(firstChild);
+        if (treeElement.root && !firstChild)
+            return null;
+
+        let current = firstChild || treeElement;
+        let startIndex = treeOutline._indexOfTreeElement(current);
         let endIndex = startIndex;
 
@@ -1096 +1097 @@
         const dontPopulate = true;
 
-        let current = firstChild;
         while (current = current.traverseNextTreeElement(skipUnrevealed, stayWithin, dontPopulate))
             endIndex++;
-
-        // Include the index of the subtree's root, unless it's the TreeOutline root.
-        if (!treeElement.root)
-            startIndex--;
 
         let count = endIndex - startIndex + 1;