<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200437] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200437">200437</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-05-04 15:29:18 -0700 (Wed, 04 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Experimental features should toggle runtime flags
https://bugs.webkit.org/show_bug.cgi?id=157353
<rdar://problem/23621603>
Reviewed by Anders Carlsson.
Hook up the experimental WebPreferences to RuntimeEnabledFeatures.
In the process I removed the general preference for WebGL 2 (we
already had an experimental feature for it) and moved Custom
Elements and Shadow DOM to experimental.
I also removed the C versions of the preferences, since experimental
features only need the ObjC API (which is generated automatically).
* Shared/WebPreferencesDefinitions.h: Move/remove some features and
make the experimental section more clear.
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetWebGL2Enabled): Deleted.
(WKPreferencesGetWebGL2Enabled): Deleted.
(WKPreferencesSetShadowDOMEnabled): Deleted.
(WKPreferencesGetShadowDOMEnabled): Deleted.
(WKPreferencesSetCustomElementsEnabled): Deleted.
(WKPreferencesGetCustomElementsEnabled): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/WebPreferences.cpp:
(WebKit::WebPreferences::updateBoolValueForExperimentalFeatureKey): A
version of updateBoolValueForKey that doesn't call the platform
function (e.g. doesn't save to NSUserDefaults).
* UIProcess/WebPreferences.h:
* UIProcess/mac/WebPreferencesMac.mm:
(WebKit::WebPreferences::platformInitializeStore): Deleted.
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPreferencescpp">trunk/Source/WebKit2/UIProcess/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPreferencesh">trunk/Source/WebKit2/UIProcess/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPreferencesMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200436 => 200437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-04 22:28:40 UTC (rev 200436)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-04 22:29:18 UTC (rev 200437)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2016-05-04 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><ins>+ Experimental features should toggle runtime flags
+ https://bugs.webkit.org/show_bug.cgi?id=157353
+ <rdar://problem/23621603>
+
+ Reviewed by Anders Carlsson.
+
+ Hook up the experimental WebPreferences to RuntimeEnabledFeatures.
+ In the process I removed the general preference for WebGL 2 (we
+ already had an experimental feature for it) and moved Custom
+ Elements and Shadow DOM to experimental.
+
+ I also removed the C versions of the preferences, since experimental
+ features only need the ObjC API (which is generated automatically).
+
+ * Shared/WebPreferencesDefinitions.h: Move/remove some features and
+ make the experimental section more clear.
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetWebGL2Enabled): Deleted.
+ (WKPreferencesGetWebGL2Enabled): Deleted.
+ (WKPreferencesSetShadowDOMEnabled): Deleted.
+ (WKPreferencesGetShadowDOMEnabled): Deleted.
+ (WKPreferencesSetCustomElementsEnabled): Deleted.
+ (WKPreferencesGetCustomElementsEnabled): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::WebPreferences::updateBoolValueForExperimentalFeatureKey): A
+ version of updateBoolValueForKey that doesn't call the platform
+ function (e.g. doesn't save to NSUserDefaults).
+ * UIProcess/WebPreferences.h:
+ * UIProcess/mac/WebPreferencesMac.mm:
+ (WebKit::WebPreferences::platformInitializeStore): Deleted.
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
+2016-05-04 Dean Jackson <dino@apple.com>
+
</ins><span class="cx"> TestRunner should always enable all the experimental features
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157360
</span><span class="cx"> <rdar://problem/26099748>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (200436 => 200437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-05-04 22:28:40 UTC (rev 200436)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-05-04 22:29:18 UTC (rev 200437)
</span><span class="lines">@@ -231,10 +231,7 @@
</span><span class="cx"> macro(NewBlockInsideInlineModelEnabled, newBlockInsideInlineModelEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(HTTPEquivEnabled, httpEquivEnabled, Bool, bool, true, "", "") \
</span><span class="cx"> macro(MockCaptureDevicesEnabled, mockCaptureDevicesEnabled, Bool, bool, false, "", "") \
</span><del>- macro(ShadowDOMEnabled, shadowDOMEnabled, Bool, bool, true, "", "") \
- macro(CustomElementsEnabled, customElementsEnabled, Bool, bool, false, "", "") \
</del><span class="cx"> macro(FetchAPIEnabled, fetchAPIEnabled, Bool, bool, false, "", "") \
</span><del>- macro(WebGL2Enabled, webGL2Enabled, Bool, bool, false, "", "") \
</del><span class="cx"> macro(DownloadAttributeEnabled, downloadAttributeEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(SelectionPaintingWithoutSelectionGapsEnabled, selectionPaintingWithoutSelectionGapsEnabled, Bool, bool, DEFAULT_SELECTION_PAINTING_WITHOUT_SELECTION_GAPS_ENABLED, "", "") \
</span><span class="cx"> FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE(macro) \
</span><span class="lines">@@ -285,15 +282,20 @@
</span><span class="cx"> #define FOR_EACH_WEBKIT_DEBUG_UINT32_PREFERENCE(macro) \
</span><span class="cx"> macro(VisibleDebugOverlayRegions, visibleDebugOverlayRegions, UInt32, uint32_t, 0, "", "")
</span><span class="cx">
</span><del>-// Remember to provide the last two parameters for all experimental features. They
-// are the text exposed to the user from the WebKit client. Also note that the key
-// should be prefixed with "experimental" so that it doesn't clash if/when the feature
-// becomes stable.
</del><ins>+// For experimental features:
+// - The type should be boolean.
+// - 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.
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(macro) \
</span><del>- macro(ExperimentalShadowDOMEnabled, experimentalShadowDOMEnabled, Bool, bool, false, "Shadow DOM", "Support for the Shadow DOM feature") \
- macro(ExperimentalWebGL2Enabled, experimentalWebGL2Enabled, Bool, bool, false, "WebGL 2.0", "Prototype WebGL 2 Support") \
- macro(ExperimentalCSSGridLayoutEnabled, experimentalCSSGridLayoutEnabled, Bool, bool, true, "CSS Grid Layout", "CSS Grid Layout") \
</del><ins>+ 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") \
</ins><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (200436 => 200437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-05-04 22:28:40 UTC (rev 200436)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-05-04 22:29:18 UTC (rev 200437)
</span><span class="lines">@@ -468,16 +468,6 @@
</span><span class="cx"> return toImpl(preferencesRef)->webGLEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPreferencesSetWebGL2Enabled(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setWebGL2Enabled(flag);
-}
-
-bool WKPreferencesGetWebGL2Enabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->webGL2Enabled();
-}
-
</del><span class="cx"> void WKPreferencesSetForceSoftwareWebGLRendering(WKPreferencesRef preferencesRef, bool flag)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setForceSoftwareWebGLRendering(flag);
</span><span class="lines">@@ -1506,26 +1496,6 @@
</span><span class="cx"> return toImpl(preferencesRef)->mockCaptureDevicesEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPreferencesSetShadowDOMEnabled(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setShadowDOMEnabled(flag);
-}
-
-bool WKPreferencesGetShadowDOMEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->shadowDOMEnabled();
-}
-
-void WKPreferencesSetCustomElementsEnabled(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setCustomElementsEnabled(flag);
-}
-
-bool WKPreferencesGetCustomElementsEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->customElementsEnabled();
-}
-
</del><span class="cx"> void WKPreferencesSetFetchAPIEnabled(WKPreferencesRef preferencesRef, bool flag)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setFetchAPIEnabled(flag);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (200436 => 200437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-05-04 22:28:40 UTC (rev 200436)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-05-04 22:29:18 UTC (rev 200437)
</span><span class="lines">@@ -100,10 +100,6 @@
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetWebGLEnabled(WKPreferencesRef);
</span><span class="cx">
</span><span class="cx"> // Defaults to false.
</span><del>-WK_EXPORT void WKPreferencesSetWebGL2Enabled(WKPreferencesRef, bool);
-WK_EXPORT bool WKPreferencesGetWebGL2Enabled(WKPreferencesRef);
-
-// Defaults to false.
</del><span class="cx"> WK_EXPORT void WKPreferencesSetForceSoftwareWebGLRendering(WKPreferencesRef, bool);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetForceSoftwareWebGLRendering(WKPreferencesRef);
</span><span class="cx">
</span><span class="lines">@@ -417,15 +413,7 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetMockCaptureDevicesEnabled(WKPreferencesRef, bool);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMockCaptureDevicesEnabled(WKPreferencesRef);
</span><span class="cx">
</span><del>-// Defaults to true
-WK_EXPORT void WKPreferencesSetShadowDOMEnabled(WKPreferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetShadowDOMEnabled(WKPreferencesRef);
-
</del><span class="cx"> // Defaults to false
</span><del>-WK_EXPORT void WKPreferencesSetCustomElementsEnabled(WKPreferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetCustomElementsEnabled(WKPreferencesRef);
-
-// Defaults to false
</del><span class="cx"> WK_EXPORT void WKPreferencesSetFetchAPIEnabled(WKPreferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetFetchAPIEnabled(WKPreferencesRef);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.cpp (200436 => 200437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2016-05-04 22:28:40 UTC (rev 200436)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2016-05-04 22:29:18 UTC (rev 200437)
</span><span class="lines">@@ -129,6 +129,11 @@
</span><span class="cx"> update(); // FIXME: Only send over the changed key and value.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPreferences::updateBoolValueForExperimentalFeatureKey(const String& key, bool value)
+{
+ update(); // FIXME: Only send over the changed key and value.
+}
+
</ins><span class="cx"> void WebPreferences::updateUInt32ValueForKey(const String& key, uint32_t value)
</span><span class="cx"> {
</span><span class="cx"> platformUpdateUInt32ValueForKey(key, value);
</span><span class="lines">@@ -187,10 +192,27 @@
</span><span class="cx">
</span><span class="cx"> FOR_EACH_WEBKIT_PREFERENCE(DEFINE_PREFERENCE_GETTER_AND_SETTERS)
</span><span class="cx"> FOR_EACH_WEBKIT_DEBUG_PREFERENCE(DEFINE_PREFERENCE_GETTER_AND_SETTERS)
</span><del>-FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(DEFINE_PREFERENCE_GETTER_AND_SETTERS)
</del><span class="cx">
</span><span class="cx"> #undef DEFINE_PREFERENCE_GETTER_AND_SETTERS
</span><span class="cx">
</span><ins>+#define DEFINE_EXPERIMENTAL_PREFERENCE_GETTER_AND_SETTERS(KeyUpper, KeyLower, TypeName, Type, DefaultValue, HumanReadableName, HumanReadableDescription) \
+ void WebPreferences::set##KeyUpper(const Type& value) \
+ { \
+ if (!m_store.set##TypeName##ValueForKey(WebPreferencesKey::KeyLower##Key(), value)) \
+ return; \
+ update##TypeName##ValueForExperimentalFeatureKey(WebPreferencesKey::KeyLower##Key(), value); \
+ \
+ } \
+ \
+ Type WebPreferences::KeyLower() const \
+ { \
+ return m_store.get##TypeName##ValueForKey(WebPreferencesKey::KeyLower##Key()); \
+ } \
+
+FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(DEFINE_EXPERIMENTAL_PREFERENCE_GETTER_AND_SETTERS)
+
+#undef DEFINE_EXPERIMENTAL_PREFERENCE_GETTER_AND_SETTERS
+
</ins><span class="cx"> static Vector<RefPtr<API::Object>> createExperimentalFeaturesVector()
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<API::Object>> features;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.h (200436 => 200437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPreferences.h 2016-05-04 22:28:40 UTC (rev 200436)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.h 2016-05-04 22:29:18 UTC (rev 200437)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx">
</span><span class="cx"> void updateStringValueForKey(const String& key, const String& value);
</span><span class="cx"> void updateBoolValueForKey(const String& key, bool value);
</span><ins>+ void updateBoolValueForExperimentalFeatureKey(const String& key, bool value);
</ins><span class="cx"> void updateUInt32ValueForKey(const String& key, uint32_t value);
</span><span class="cx"> void updateDoubleValueForKey(const String& key, double value);
</span><span class="cx"> void updateFloatValueForKey(const String& key, float value);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPreferencesMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm (200436 => 200437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2016-05-04 22:28:40 UTC (rev 200436)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2016-05-04 22:29:18 UTC (rev 200437)
</span><span class="lines">@@ -147,7 +147,6 @@
</span><span class="cx"> #define INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue, HumanReadableName, HumanReadableDescription) \
</span><span class="cx"> setDebug##TypeName##ValueIfInUserDefaults(m_identifier, m_keyPrefix, m_globalDebugKeyPrefix, WebPreferencesKey::KeyLower##Key(), m_store);
</span><span class="cx">
</span><del>- FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS)
</del><span class="cx"> FOR_EACH_WEBKIT_DEBUG_PREFERENCE(INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS)
</span><span class="cx">
</span><span class="cx"> #undef INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (200436 => 200437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-05-04 22:28:40 UTC (rev 200436)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-05-04 22:29:18 UTC (rev 200437)
</span><span class="lines">@@ -193,21 +193,6 @@
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setCSSCompositingEnabled(enabled);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
- if (preference == "WebKitShadowDOMEnabled")
- RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(enabled);
-#endif
-
-#if ENABLE(CUSTOM_ELEMENTS)
- if (preference == "WebKitCustomElementsEnabled")
- RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(enabled);
-#endif
-
-#if ENABLE(WEBGL2)
- if (preference == "WebKitWebGL2Enabled")
- RuntimeEnabledFeatures::sharedFeatures().setWebGL2Enabled(enabled);
-#endif
-
</del><span class="cx"> #if ENABLE(FETCH_API)
</span><span class="cx"> if (preference == "WebKitFetchAPIEnabled")
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setFetchAPIEnabled(enabled);
</span><span class="lines">@@ -223,6 +208,21 @@
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setCSSGridLayoutEnabled(enabled);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CUSTOM_ELEMENTS)
+ if (preference == "WebKitExperimentalCustomElementsEnabled")
+ RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(enabled);
+#endif
+
+#if ENABLE(SHADOW_DOM)
+ if (preference == "WebKitExperimentalShadowDOMEnabled")
+ RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(enabled);
+#endif
+
+#if ENABLE(WEBGL2)
+ if (preference == "WebKitExperimentalWebGL2Enabled")
+ RuntimeEnabledFeatures::sharedFeatures().setWebGL2Enabled(enabled);
+#endif
+
</ins><span class="cx"> // Map the names used in LayoutTests with the names used in WebCore::Settings and WebPreferencesStore.
</span><span class="cx"> #define FOR_EACH_OVERRIDE_BOOL_PREFERENCE(macro) \
</span><span class="cx"> macro(WebKitAcceleratedCompositingEnabled, AcceleratedCompositingEnabled, acceleratedCompositingEnabled) \
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (200436 => 200437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-04 22:28:40 UTC (rev 200436)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-04 22:29:18 UTC (rev 200437)
</span><span class="lines">@@ -3100,18 +3100,6 @@
</span><span class="cx"> settings.setServiceControlsEnabled(store.getBoolValueForKey(WebPreferencesKey::serviceControlsEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(SHADOW_DOM)
- RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(store.getBoolValueForKey(WebPreferencesKey::shadowDOMEnabledKey()));
-#endif
-
-#if ENABLE(CUSTOM_ELEMENTS)
- RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(store.getBoolValueForKey(WebPreferencesKey::customElementsEnabledKey()));
-#endif
-
-#if ENABLE(WEBGL2)
- RuntimeEnabledFeatures::sharedFeatures().setWebGL2Enabled(store.getBoolValueForKey(WebPreferencesKey::webGL2EnabledKey()));
-#endif
-
</del><span class="cx"> #if ENABLE(FETCH_API)
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setFetchAPIEnabled(store.getBoolValueForKey(WebPreferencesKey::fetchAPIEnabledKey()));
</span><span class="cx"> #endif
</span><span class="lines">@@ -3120,10 +3108,24 @@
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setDownloadAttributeEnabled(store.getBoolValueForKey(WebPreferencesKey::downloadAttributeEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ // Experimental Features.
+
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setCSSGridLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::experimentalCSSGridLayoutEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CUSTOM_ELEMENTS)
+ RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(store.getBoolValueForKey(WebPreferencesKey::experimentalCustomElementsEnabledKey()));
+#endif
+
+#if ENABLE(SHADOW_DOM)
+ RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(store.getBoolValueForKey(WebPreferencesKey::experimentalShadowDOMEnabledKey()));
+#endif
+
+#if ENABLE(WEBGL2)
+ RuntimeEnabledFeatures::sharedFeatures().setWebGL2Enabled(store.getBoolValueForKey(WebPreferencesKey::experimentalWebGL2EnabledKey()));
+#endif
+
</ins><span class="cx"> bool processSuppressionEnabled = store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey());
</span><span class="cx"> if (m_processSuppressionEnabled != processSuppressionEnabled) {
</span><span class="cx"> m_processSuppressionEnabled = processSuppressionEnabled;
</span></span></pre>
</div>
</div>
</body>
</html>