<!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>[209757] trunk</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/209757">209757</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-12-13 08:59:55 -0800 (Tue, 13 Dec 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
https://bugs.webkit.org/show_bug.cgi?id=165251

Reviewed by Youenn Fablet.

Source/WebCore:

No new tests, fixes an API test.

* page/Settings.in: Delete mediaStreamEnabled and peerConnectionEnabled, we don't need a
setting and a runtime feature.

Source/WebKit2:

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Update the media stream and peer connection runtime
feature instead of the setting.

Tools:

* TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp:
(TestWebKitAPI::TEST): Enable MediaStream, create web view from the page group upon which
the preferences have been set.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2EnumerateMediaDevicescpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209756 => 209757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Source/WebCore/ChangeLog        2016-12-13 16:59:55 UTC (rev 209757)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-12-13  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
+        https://bugs.webkit.org/show_bug.cgi?id=165251
+
+        Reviewed by Youenn Fablet.
+
+        No new tests, fixes an API test.
+
+        * page/Settings.in: Delete mediaStreamEnabled and peerConnectionEnabled, we don't need a
+        setting and a runtime feature.
+
</ins><span class="cx"> 2016-12-13  Antti Koivisto  &lt;antti@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r198990): Cannot edit content inside &lt;details&gt; in wysiwyg editor
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (209756 => 209757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in        2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Source/WebCore/page/Settings.in        2016-12-13 16:59:55 UTC (rev 209757)
</span><span class="lines">@@ -115,8 +115,6 @@
</span><span class="cx"> paginateDuringLayoutEnabled initial=false
</span><span class="cx"> fullScreenEnabled initial=false, conditional=FULLSCREEN_API
</span><span class="cx"> asynchronousSpellCheckingEnabled initial=false
</span><del>-mediaStreamEnabled initial=false
-peerConnectionEnabled initial=false
</del><span class="cx"> 
</span><span class="cx"> # This feature requires an implementation of ValidationMessageClient.
</span><span class="cx"> interactiveFormValidationEnabled initial=false
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209756 => 209757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Source/WebKit2/ChangeLog        2016-12-13 16:59:55 UTC (rev 209757)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-13  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
+        https://bugs.webkit.org/show_bug.cgi?id=165251
+
+        Reviewed by Youenn Fablet.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences): Update the media stream and peer connection runtime
+        feature instead of the setting.
+
</ins><span class="cx"> 2016-12-13  Sergio Villar Senin  &lt;svillar@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix GTK build after r209733
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (209756 => 209757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2016-12-13 16:59:55 UTC (rev 209757)
</span><span class="lines">@@ -3033,11 +3033,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>-    settings.setMediaStreamEnabled(store.getBoolValueForKey(WebPreferencesKey::mediaStreamEnabledKey()));
</del><ins>+    RuntimeEnabledFeatures::sharedFeatures().setMediaStreamEnabled(store.getBoolValueForKey(WebPreferencesKey::mediaStreamEnabledKey()));
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><del>-    settings.setPeerConnectionEnabled(store.getBoolValueForKey(WebPreferencesKey::peerConnectionEnabledKey()));
</del><ins>+    RuntimeEnabledFeatures::sharedFeatures().setPeerConnectionEnabled(store.getBoolValueForKey(WebPreferencesKey::peerConnectionEnabledKey()));
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209756 => 209757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Tools/ChangeLog        2016-12-13 16:59:55 UTC (rev 209757)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-13  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
+        https://bugs.webkit.org/show_bug.cgi?id=165251
+
+        Reviewed by Youenn Fablet.
+
+        * TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp:
+        (TestWebKitAPI::TEST): Enable MediaStream, create web view from the page group upon which
+        the preferences have been set.
+
</ins><span class="cx"> 2016-12-08  Antti Koivisto  &lt;antti@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Enable network cache speculative revalidation in MiniBrowser
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2EnumerateMediaDevicescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp (209756 => 209757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp        2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp        2016-12-13 16:59:55 UTC (rev 209757)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> 
</span><span class="cx">     WKRetainPtr&lt;WKPageGroupRef&gt; pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK(&quot;EnumerateDevices&quot;).get()));
</span><span class="cx">     WKPreferencesRef preferences = WKPageGroupGetPreferences(pageGroup.get());
</span><ins>+    WKPreferencesSetMediaStreamEnabled(preferences, true);
</ins><span class="cx">     WKPreferencesSetFileAccessFromFileURLsAllowed(preferences, true);
</span><span class="cx">     WKPreferencesSetMediaCaptureRequiresSecureConnection(preferences, false);
</span><span class="cx"> 
</span><span class="lines">@@ -61,7 +62,7 @@
</span><span class="cx">     uiClient.base.version = 6;
</span><span class="cx">     uiClient.checkUserMediaPermissionForOrigin = checkUserMediaPermissionCallback;
</span><span class="cx"> 
</span><del>-    PlatformWebView webView(context.get());
</del><ins>+    PlatformWebView webView(context.get(), pageGroup.get());
</ins><span class="cx">     WKPageSetPageUIClient(webView.page(), &amp;uiClient.base);
</span><span class="cx"> 
</span><span class="cx">     auto url = adoptWK(Util::createURLForResource(&quot;enumerateMediaDevices&quot;, &quot;html&quot;));
</span></span></pre>
</div>
</div>

</body>
</html>