Title: [255026] branches/safari-609-branch/Source/WebInspectorUI
- Revision
- 255026
- Author
- [email protected]
- Date
- 2020-01-23 13:44:27 -0800 (Thu, 23 Jan 2020)
Log Message
Cherry-pick r254773. rdar://problem/58807954
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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254773 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebInspectorUI/ChangeLog (255025 => 255026)
--- branches/safari-609-branch/Source/WebInspectorUI/ChangeLog 2020-01-23 21:44:24 UTC (rev 255025)
+++ branches/safari-609-branch/Source/WebInspectorUI/ChangeLog 2020-01-23 21:44:27 UTC (rev 255026)
@@ -1,5 +1,42 @@
2020-01-23 Russell Epstein <[email protected]>
+ Cherry-pick r254773. rdar://problem/58807954
+
+ 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:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254773 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-17 Nikita Vasilyev <[email protected]>
+
+ 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-23 Russell Epstein <[email protected]>
+
Cherry-pick r254726. rdar://problem/58816338
REGRESSION(r251487): Web Inspector: selected color in color picker has wrong lightness
Modified: branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Base/Setting.js (255025 => 255026)
--- branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Base/Setting.js 2020-01-23 21:44:24 UTC (rev 255025)
+++ branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Base/Setting.js 2020-01-23 21:44:27 UTC (rev 255026)
@@ -216,7 +216,7 @@
zoomFactor: new WI.Setting("zoom-factor", 1),
// 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),
@@ -245,18 +245,15 @@
WI.previewFeatures = [];
-WI.isTechnologyPreviewBuild = function()
+// 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()
{
- return WI.isExperimentalBuild && !WI.isEngineeringBuild;
+ 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;
};
Modified: branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js (255025 => 255026)
--- branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2020-01-23 21:44:24 UTC (rev 255025)
+++ branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2020-01-23 21:44:27 UTC (rev 255026)
@@ -346,10 +346,7 @@
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();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
