Changeset 240487 in webkit

Timestamp:

Jan 25, 2019 11:35:29 AM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: WI.Setting.migrateValue doesn't take into account the key prefix
​https://bugs.webkit.org/show_bug.cgi?id=193814

Reviewed by Matt Baker.

• UserInterface/Base/Setting.js:

(WI.Setting):
(WI.Setting.migrateValue):
(WI.Setting._localStorageKey): Added.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Setting.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-01-25  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: `WI.Setting.migrateValue` doesn't take into account the key prefix
+        https://bugs.webkit.org/show_bug.cgi?id=193814
+
+        Reviewed by Matt Baker.
+
+        * UserInterface/Base/Setting.js:
+        (WI.Setting):
+        (WI.Setting.migrateValue):
+        (WI.Setting._localStorageKey): Added.
+
 2019-01-25  Devin Rousso  <drousso@apple.com>
 

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

@@ -38 +38 @@
         this._name = name;
 
-        let inspectionLevel = InspectorFrontendHost ? InspectorFrontendHost.inspectionLevel() : 1;
-        let levelString = inspectionLevel > 1 ? "-" + inspectionLevel : "";
-        this._localStorageKey = `com.apple.WebInspector${levelString}.${name}`;
+        this._localStorageKey = WI.Setting._localStorageKey(this._name);
         this._defaultValue = defaultValue;
     }
@@ -48 +46 @@
     static migrateValue(key)
     {
+        let localStorageKey = WI.Setting._localStorageKey(key);
+
         let value = undefined;
-        if (!window.InspectorTest && window.localStorage && key in window.localStorage) {
+        if (!window.InspectorTest && window.localStorage && localStorageKey in window.localStorage) {
             try {
-                value = JSON.parse(window.localStorage[key]);
+                value = JSON.parse(window.localStorage[localStorageKey]);
             } catch { }
 
-            window.localStorage.removeItem(key);
+            window.localStorage.removeItem(localStorageKey);
         }
         return value;
+    }
+
+    static _localStorageKey(name)
+    {
+        let inspectionLevel = InspectorFrontendHost ? InspectorFrontendHost.inspectionLevel() : 1;
+        let levelString = inspectionLevel > 1 ? "-" + inspectionLevel : "";
+        return `com.apple.WebInspector${levelString}.${name}`;
     }