Changeset 195835 in webkit

Timestamp:

Jan 29, 2016 12:35:30 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Duplicate tab-types being saved to setting, causing duplicate tabs to be opened
​https://bugs.webkit.org/show_bug.cgi?id=153659
<rdar://problem/24413157>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-01-29
Reviewed by Brian Burg.

• UserInterface/Base/Main.js:

(WebInspector.contentLoaded):
(WebInspector._rememberOpenTabs):
De-duplicate the setting when building the list of tabs for existing
cases where the setting has duplicates and de-duplicate storing into
the setting, which was causing the issue to begin with.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-01-29  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Duplicate tab-types being saved to setting, causing duplicate tabs to be opened
+        https://bugs.webkit.org/show_bug.cgi?id=153659
+        <rdar://problem/24413157>
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Base/Main.js:
+        (WebInspector.contentLoaded):
+        (WebInspector._rememberOpenTabs):
+        De-duplicate the setting when building the list of tabs for existing
+        cases where the setting has duplicates and de-duplicate storing into
+        the setting, which was causing the issue to begin with.
+
 2016-01-29  Devin Rousso  <dcrousso+webkit@gmail.com>
 

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

@@ -391 +391 @@
     this._pendingOpenTabs = [];
 
+    // Previously we may have stored duplicates in this setting. Avoid creating duplicate tabs.
     let openTabTypes = this._openTabsSetting.value;
+    let seenTabTypes = new Set;
 
     for (let i = 0; i < openTabTypes.length; ++i) {
         let tabType = openTabTypes[i];
+
+        if (seenTabTypes.has(tabType))
+            continue;
+        seenTabTypes.add(tabType);
+
         if (!this.isTabTypeAllowed(tabType)) {
             this._pendingOpenTabs.push({tabType, index: i});
@@ -468 +475 @@
 WebInspector._rememberOpenTabs = function()
 {
+    let seenTabTypes = new Set;
     let openTabs = [];
 
@@ -478 +486 @@
         console.assert(tabContentView.type, "Tab type can't be null, undefined, or empty string", tabContentView.type, tabContentView);
         openTabs.push(tabContentView.type);
+        seenTabTypes.add(tabContentView.type);
     }
 
     // Keep currently unsupported tabs in the setting at their previous index.
-    for (let {tabType, index} of this._pendingOpenTabs)
+    for (let {tabType, index} of this._pendingOpenTabs) {
+        if (seenTabTypes.has(tabType))
+            continue;
         openTabs.insertAtIndex(tabType, index);
+        seenTabTypes.add(tabType);
+    }
 
     this._openTabsSetting.value = openTabs;