MiniBrowser doesn't respect default enabled-ness of experimental and internal debug features
https://bugs.webkit.org/show_bug.cgi?id=189989
Reviewed by Simon Fraser.
When the preference isn't found in user defaults, use the default value of each feature's enabledness.
* MiniBrowser/mac/AppDelegate.m:
(defaultConfiguration):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@236518 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3b12004..cae8646 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2018-09-26 Ryosuke Niwa <rniwa@webkit.org>
+
+ MiniBrowser doesn't respect default enabled-ness of experimental and internal debug features
+ https://bugs.webkit.org/show_bug.cgi?id=189989
+
+ Reviewed by Simon Fraser.
+
+ When the preference isn't found in user defaults, use the default value of each feature's enabledness.
+
+ * MiniBrowser/mac/AppDelegate.m:
+ (defaultConfiguration):
+
2018-09-26 Philippe Normand <pnormand@igalia.com>
[Flatpak] Bump to apr 1.6.5
diff --git a/Tools/MiniBrowser/mac/AppDelegate.m b/Tools/MiniBrowser/mac/AppDelegate.m
index 25617ec..bb8f528 100644
--- a/Tools/MiniBrowser/mac/AppDelegate.m
+++ b/Tools/MiniBrowser/mac/AppDelegate.m
@@ -109,13 +109,21 @@
#if WK_API_ENABLED
NSArray<_WKExperimentalFeature *> *experimentalFeatures = [WKPreferences _experimentalFeatures];
for (_WKExperimentalFeature *feature in experimentalFeatures) {
- BOOL enabled = [[NSUserDefaults standardUserDefaults] boolForKey:feature.key];
+ BOOL enabled;
+ if ([[NSUserDefaults standardUserDefaults] objectForKey:feature.key])
+ enabled = [[NSUserDefaults standardUserDefaults] boolForKey:feature.key];
+ else
+ enabled = [feature defaultValue];
[configuration.preferences _setEnabled:enabled forExperimentalFeature:feature];
}
NSArray<_WKInternalDebugFeature *> *internalDebugFeatures = [WKPreferences _internalDebugFeatures];
for (_WKInternalDebugFeature *feature in internalDebugFeatures) {
- BOOL enabled = [[NSUserDefaults standardUserDefaults] boolForKey:feature.key];
+ BOOL enabled;
+ if ([[NSUserDefaults standardUserDefaults] objectForKey:feature.key])
+ enabled = [[NSUserDefaults standardUserDefaults] boolForKey:feature.key];
+ else
+ enabled = [feature defaultValue];
[configuration.preferences _setEnabled:enabled forInternalDebugFeature:feature];
}
#endif