Modified: trunk/Source/WebKit2/ChangeLog (200439 => 200440)
--- trunk/Source/WebKit2/ChangeLog 2016-05-04 23:36:26 UTC (rev 200439)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-04 23:41:16 UTC (rev 200440)
@@ -1,5 +1,24 @@
2016-05-04 Dean Jackson <[email protected]>
+ Experimental Features don't need an "Experimental" prefix
+ https://bugs.webkit.org/show_bug.cgi?id=157363
+ <rdar://problem/26100630>
+
+ Reviewed by Anders Carlsson.
+
+ Since we're not persisting the value of the experimental
+ features, it's unlikely there will ever be the case
+ where we move a Preference from experimental to normal
+ and use a stored value.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
+2016-05-04 Dean Jackson <[email protected]>
+
Experimental features should toggle runtime flags
https://bugs.webkit.org/show_bug.cgi?id=157353
<rdar://problem/23621603>
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (200439 => 200440)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-05-04 23:36:26 UTC (rev 200439)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-05-04 23:41:16 UTC (rev 200440)
@@ -287,15 +287,13 @@
// - You must provide the last two parameters for all experimental features. They
// are the text exposed to the user from the WebKit client.
// - They should be alphabetically ordered by the human readable text.
-// - The key should be prefixed with "experimental" so that it doesn't clash if/when the feature
-// becomes stable.
// - They should be false by default. The client is responsible for enabling them.
#define FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(macro) \
- macro(ExperimentalCSSGridLayoutEnabled, experimentalCSSGridLayoutEnabled, Bool, bool, false, "CSS Grid", "CSS Grid Layout Module support") \
- macro(ExperimentalCustomElementsEnabled, experimentalCustomElementsEnabled, Bool, bool, false, "Custom Elements", "HTML Custom Elements prototype") \
- macro(ExperimentalShadowDOMEnabled, experimentalShadowDOMEnabled, Bool, bool, false, "Shadow DOM", "HTML Shadow DOM prototype") \
- macro(ExperimentalWebGL2Enabled, experimentalWebGL2Enabled, Bool, bool, false, "WebGL 2.0", "WebGL 2 prototype") \
+ macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, false, "CSS Grid", "CSS Grid Layout Module support") \
+ macro(CustomElementsEnabled, customElementsEnabled, Bool, bool, false, "Custom Elements", "HTML Custom Elements prototype") \
+ macro(ShadowDOMEnabled, shadowDOMEnabled, Bool, bool, false, "Shadow DOM", "HTML Shadow DOM prototype") \
+ macro(WebGL2Enabled, webGL2Enabled, Bool, bool, false, "WebGL 2.0", "WebGL 2 prototype") \
\
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (200439 => 200440)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-05-04 23:36:26 UTC (rev 200439)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-05-04 23:41:16 UTC (rev 200440)
@@ -204,22 +204,22 @@
#endif
#if ENABLE(CSS_GRID_LAYOUT)
- if (preference == "WebKitExperimentalCSSGridLayoutEnabled")
+ if (preference == "WebKitCSSGridLayoutEnabled")
RuntimeEnabledFeatures::sharedFeatures().setCSSGridLayoutEnabled(enabled);
#endif
#if ENABLE(CUSTOM_ELEMENTS)
- if (preference == "WebKitExperimentalCustomElementsEnabled")
+ if (preference == "WebKitCustomElementsEnabled")
RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(enabled);
#endif
#if ENABLE(SHADOW_DOM)
- if (preference == "WebKitExperimentalShadowDOMEnabled")
+ if (preference == "WebKitShadowDOMEnabled")
RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(enabled);
#endif
#if ENABLE(WEBGL2)
- if (preference == "WebKitExperimentalWebGL2Enabled")
+ if (preference == "WebKitWebGL2Enabled")
RuntimeEnabledFeatures::sharedFeatures().setWebGL2Enabled(enabled);
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (200439 => 200440)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-04 23:36:26 UTC (rev 200439)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-04 23:41:16 UTC (rev 200440)
@@ -3111,19 +3111,19 @@
// Experimental Features.
#if ENABLE(CSS_GRID_LAYOUT)
- RuntimeEnabledFeatures::sharedFeatures().setCSSGridLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::experimentalCSSGridLayoutEnabledKey()));
+ RuntimeEnabledFeatures::sharedFeatures().setCSSGridLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::cssGridLayoutEnabledKey()));
#endif
#if ENABLE(CUSTOM_ELEMENTS)
- RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(store.getBoolValueForKey(WebPreferencesKey::experimentalCustomElementsEnabledKey()));
+ RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(store.getBoolValueForKey(WebPreferencesKey::customElementsEnabledKey()));
#endif
#if ENABLE(SHADOW_DOM)
- RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(store.getBoolValueForKey(WebPreferencesKey::experimentalShadowDOMEnabledKey()));
+ RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(store.getBoolValueForKey(WebPreferencesKey::shadowDOMEnabledKey()));
#endif
#if ENABLE(WEBGL2)
- RuntimeEnabledFeatures::sharedFeatures().setWebGL2Enabled(store.getBoolValueForKey(WebPreferencesKey::experimentalWebGL2EnabledKey()));
+ RuntimeEnabledFeatures::sharedFeatures().setWebGL2Enabled(store.getBoolValueForKey(WebPreferencesKey::webGL2EnabledKey()));
#endif
bool processSuppressionEnabled = store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey());