Changeset 254773 in webkit

Timestamp:

Jan 17, 2020 4:16:09 PM (4 years ago)

Author:

Nikita Vasilyev

Message:

Web Inspector: Unchecking Enable Preview Features on Engineering and Preview builds does not affect WI.arePreviewFeaturesEnabled()
​https://bugs.webkit.org/show_bug.cgi?id=204026

Reviewed by Brian Burg.

Make WI.arePreviewFeaturesEnabled() return false when Enable Preview Features is unchecked.

• UserInterface/Base/Setting.js:

(WI.canShowPreviewFeatures):
(WI.arePreviewFeaturesEnabled):
(WI.isTechnologyPreviewBuild): Deleted.
(WI.canShowPreviewFeatures): Added.

• UserInterface/Views/SettingsTabContentView.js:

Location:

trunk/Source/WebInspectorUI

Files:

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

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-01-17  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: Unchecking Enable Preview Features on Engineering and Preview builds does not affect WI.arePreviewFeaturesEnabled()
+        https://bugs.webkit.org/show_bug.cgi?id=204026
+
+        Reviewed by Brian Burg.
+
+        Make `WI.arePreviewFeaturesEnabled()` return false when Enable Preview Features is unchecked.
+
+        * UserInterface/Base/Setting.js:
+        (WI.canShowPreviewFeatures):
+        (WI.arePreviewFeaturesEnabled):
+        (WI.isTechnologyPreviewBuild): Deleted.
+        (WI.canShowPreviewFeatures): Added.
+        * UserInterface/Views/SettingsTabContentView.js:
+
 2020-01-16  Devin Rousso  <drousso@apple.com>
 

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

@@ -217 +217 @@
 
     // Experimental
-    experimentalEnablePreviewFeatures: new WI.Setting("experimental-enable-preview-features", false),
+    experimentalEnablePreviewFeatures: new WI.Setting("experimental-enable-preview-features", true),
     experimentalEnableNewTabBar: new WI.Setting("experimental-enable-new-tab-bar", false),
     experimentalEnableStylesJumpToEffective: new WI.Setting("experimental-styles-jump-to-effective", false),
@@ -246 +246 @@
 WI.previewFeatures = [];
 
-WI.isTechnologyPreviewBuild = function()
-{
-    return WI.isExperimentalBuild && !WI.isEngineeringBuild;
+// WebKit may by default enable certain features in a Technology Preview that are not enabled in trunk.
+// Provide a switch that will make non-preview builds behave like an experimental build, for those preview features.
+WI.canShowPreviewFeatures = function()
+{
+    let hasPreviewFeatures = WI.previewFeatures.length > 0;
+    return hasPreviewFeatures && WI.isExperimentalBuild;
 };
 
 WI.arePreviewFeaturesEnabled = function()
 {
-    if (WI.isExperimentalBuild)
-        return true;
-
-    if (WI.settings.experimentalEnablePreviewFeatures.value)
-        return true;
-
-    return false;
-};
+    return WI.canShowPreviewFeatures() && WI.settings.experimentalEnablePreviewFeatures.value;
+};

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

@@ -356 +356 @@
         let initialValues = new Map;
 
-        // WebKit may by default enable certain features in a Technology Preview that are not enabled in trunk.
-        // Provide a switch that will make non-preview builds behave like an experimental build, for those preview features.
-        let hasPreviewFeatures = WI.previewFeatures.length > 0;
-        if (hasPreviewFeatures && (WI.isTechnologyPreviewBuild() || WI.isEngineeringBuild)) {
+        if (WI.canShowPreviewFeatures()) {
             experimentalSettingsView.addSetting(WI.UIString("Staging:"), WI.settings.experimentalEnablePreviewFeatures, WI.UIString("Enable Preview Features"));
             experimentalSettingsView.addSeparator();