<!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>[200473] 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/200473">200473</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-05-05 13:27:12 -0700 (Thu, 05 May 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Shadow DOM should not be experimental
https://bugs.webkit.org/show_bug.cgi?id=157384
&lt;rdar://problem/26123254&gt;

Reviewed by Anders Carlsson.

Shadow DOM is not an experimental feature. We want
it enabled by default.

This fixes the timeout in:
WebKit2.InjectedBundleMakeAllShadowRootOpenTest

* Shared/WebPreferencesDefinitions.h: Move the Shadow
DOM preference out of Experimental.
* 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="#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 (200472 => 200473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-05-05 20:14:56 UTC (rev 200472)
+++ trunk/Source/WebKit2/ChangeLog        2016-05-05 20:27:12 UTC (rev 200473)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-05  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Shadow DOM should not be experimental
+        https://bugs.webkit.org/show_bug.cgi?id=157384
+        &lt;rdar://problem/26123254&gt;
+
+        Reviewed by Anders Carlsson.
+
+        Shadow DOM is not an experimental feature. We want
+        it enabled by default.
+
+        This fixes the timeout in:
+        WebKit2.InjectedBundleMakeAllShadowRootOpenTest
+
+        * Shared/WebPreferencesDefinitions.h: Move the Shadow
+        DOM preference out of Experimental.
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2016-05-05  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Revert r200390, thus putting r199259 and r200161 and back.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (200472 => 200473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h        2016-05-05 20:14:56 UTC (rev 200472)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h        2016-05-05 20:27:12 UTC (rev 200473)
</span><span class="lines">@@ -231,6 +231,7 @@
</span><span class="cx">     macro(NewBlockInsideInlineModelEnabled, newBlockInsideInlineModelEnabled, Bool, bool, false, &quot;&quot;, &quot;&quot;) \
</span><span class="cx">     macro(HTTPEquivEnabled, httpEquivEnabled, Bool, bool, true, &quot;&quot;, &quot;&quot;) \
</span><span class="cx">     macro(MockCaptureDevicesEnabled, mockCaptureDevicesEnabled, Bool, bool, false, &quot;&quot;, &quot;&quot;) \
</span><ins>+    macro(ShadowDOMEnabled, shadowDOMEnabled, Bool, bool, true, &quot;Shadow DOM&quot;, &quot;HTML Shadow DOM prototype&quot;) \
</ins><span class="cx">     macro(FetchAPIEnabled, fetchAPIEnabled, Bool, bool, false, &quot;&quot;, &quot;&quot;) \
</span><span class="cx">     macro(DownloadAttributeEnabled, downloadAttributeEnabled, Bool, bool, false, &quot;&quot;, &quot;&quot;) \
</span><span class="cx">     macro(SelectionPaintingWithoutSelectionGapsEnabled, selectionPaintingWithoutSelectionGapsEnabled, Bool, bool, DEFAULT_SELECTION_PAINTING_WITHOUT_SELECTION_GAPS_ENABLED, &quot;&quot;, &quot;&quot;) \
</span><span class="lines">@@ -292,7 +293,6 @@
</span><span class="cx"> #define FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(macro) \
</span><span class="cx">     macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, false, &quot;CSS Grid&quot;, &quot;CSS Grid Layout Module support&quot;) \
</span><span class="cx">     macro(CustomElementsEnabled, customElementsEnabled, Bool, bool, false, &quot;Custom Elements&quot;, &quot;HTML Custom Elements prototype&quot;) \
</span><del>-    macro(ShadowDOMEnabled, shadowDOMEnabled, Bool, bool, false, &quot;Shadow DOM&quot;, &quot;HTML Shadow DOM prototype&quot;) \
</del><span class="cx">     macro(WebGL2Enabled, webGL2Enabled, Bool, bool, false, &quot;WebGL 2.0&quot;, &quot;WebGL 2 prototype&quot;) \
</span><span class="cx">     \
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (200472 => 200473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp        2016-05-05 20:14:56 UTC (rev 200472)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp        2016-05-05 20:27:12 UTC (rev 200473)
</span><span class="lines">@@ -203,6 +203,11 @@
</span><span class="cx">         RuntimeEnabledFeatures::sharedFeatures().setDownloadAttributeEnabled(enabled);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if ENABLE(SHADOW_DOM)
+    if (preference == &quot;WebKitShadowDOMEnabled&quot;)
+        RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(enabled);
+#endif
+
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx">     if (preference == &quot;WebKitCSSGridLayoutEnabled&quot;)
</span><span class="cx">         RuntimeEnabledFeatures::sharedFeatures().setCSSGridLayoutEnabled(enabled);
</span><span class="lines">@@ -213,11 +218,6 @@
</span><span class="cx">         RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(enabled);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(SHADOW_DOM)
-    if (preference == &quot;WebKitShadowDOMEnabled&quot;)
-        RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(enabled);
-#endif
-
</del><span class="cx"> #if ENABLE(WEBGL2)
</span><span class="cx">     if (preference == &quot;WebKitWebGL2Enabled&quot;)
</span><span class="cx">         RuntimeEnabledFeatures::sharedFeatures().setWebGL2Enabled(enabled);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (200472 => 200473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2016-05-05 20:14:56 UTC (rev 200472)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2016-05-05 20:27:12 UTC (rev 200473)
</span><span class="lines">@@ -3108,6 +3108,10 @@
</span><span class="cx">     RuntimeEnabledFeatures::sharedFeatures().setDownloadAttributeEnabled(store.getBoolValueForKey(WebPreferencesKey::downloadAttributeEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if ENABLE(SHADOW_DOM)
+    RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(store.getBoolValueForKey(WebPreferencesKey::shadowDOMEnabledKey()));
+#endif
+
</ins><span class="cx">     // Experimental Features.
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="lines">@@ -3118,10 +3122,6 @@
</span><span class="cx">     RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(store.getBoolValueForKey(WebPreferencesKey::customElementsEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(SHADOW_DOM)
-    RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(store.getBoolValueForKey(WebPreferencesKey::shadowDOMEnabledKey()));
-#endif
-
</del><span class="cx"> #if ENABLE(WEBGL2)
</span><span class="cx">     RuntimeEnabledFeatures::sharedFeatures().setWebGL2Enabled(store.getBoolValueForKey(WebPreferencesKey::webGL2EnabledKey()));
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>