<!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>[209643] 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/209643">209643</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-12-09 18:46:31 -0800 (Fri, 09 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 Dean Jackson.
Based on a patch by Dr Alex Gouaillard <agouaillard@gmail.com>
Source/JavaScriptCore:
* runtime/CommonIdentifiers.h: Add WebRTC and MediaStream identifiers.
Source/WebCore:
No new tests, covered by existing tests.
* Modules/mediastream/MediaStreamEvent.idl: Add "EnabledAtRuntime".
* Modules/mediastream/NavigatorMediaDevices.idl: Ditto.
* Modules/mediastream/NavigatorUserMedia.idl: Ditto.
* Modules/mediastream/RTCDTMFToneChangeEvent.idl: Ditto.
* Modules/mediastream/RTCIceCandidate.idl: Ditto.
* Modules/mediastream/RTCPeerConnection.idl: Ditto.
* Modules/mediastream/RTCRtpReceiver.idl: Ditto.
* Modules/mediastream/RTCRtpSender.idl: Ditto.
* Modules/mediastream/RTCRtpTransceiver.idl: Ditto.
* Modules/mediastream/RTCSessionDescription.idl: Ditto.
* Modules/mediastream/RTCTrackEvent.idl: Ditto.
* bindings/generic/RuntimeEnabledFeatures.cpp:
(WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures): Set m_isMediaStreamEnabled in the
constructor instead of in reset() because the later is called by the Internals constructor,
making it impossible to override the runtime flag from WTR or DRT.
(WebCore::RuntimeEnabledFeatures::reset): Don't set m_isMediaStreamEnabled.
* page/Settings.in: Add peerConnectionEnabled.
Source/WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h: Add MediaStream and PeerConnection preferences.
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences mediaStreamEnabled]):
(-[WebPreferences setMediaStreamEnabled:]):
(-[WebPreferences peerConnectionEnabled]):
(-[WebPreferences setPeerConnectionEnabled:]):
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
Source/WebKit2:
* Shared/WebPreferencesDefinitions.h: Add peerConnectionEnabled.
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetPeerConnectionEnabled): Added.
(WKPreferencesGetPeerConnectionEnabled): Added.
* UIProcess/API/C/WKPreferencesRef.h:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner): Add WebKitMediaStreamEnabled
and WebKitPeerConnectionEnabled.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Initialize the peerConnection preference.
Tools:
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues): Enable MediaStream and PeerConnection.
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::beginTesting): Ditto.
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::setMediaStreamEnabled): New.
(WTR::TestRunner::setPeerConnectionEnabled): New.
* WebKitTestRunner/InjectedBundle/TestRunner.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonIdentifiersh">trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamEventidl">trunk/Source/WebCore/Modules/mediastream/MediaStreamEvent.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamNavigatorMediaDevicesidl">trunk/Source/WebCore/Modules/mediastream/NavigatorMediaDevices.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamNavigatorUserMediaidl">trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFToneChangeEventidl">trunk/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceCandidateidl">trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpReceiveridl">trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSenderidl">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpTransceiveridl">trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionidl">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCTrackEventidl">trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturescpp">trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<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="#trunkSourceWebKit2UIProcessAPICWKPreferencesRefh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.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>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-09 Eric Carlson <eric.carlson@apple.com>
+
+ Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
+ https://bugs.webkit.org/show_bug.cgi?id=165251
+
+ Reviewed by Dean Jackson.
+
+ Based on a patch by Dr Alex Gouaillard <agouaillard@gmail.com>
+
+ * runtime/CommonIdentifiers.h: Add WebRTC and MediaStream identifiers.
+
</ins><span class="cx"> 2016-12-09 JF Bastien <jfbastien@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssembly JS API: implement start function
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonIdentifiersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -78,8 +78,11 @@
</span><span class="cx"> macro(MediaKeyStatusMap) \
</span><span class="cx"> macro(MediaKeySystemAccess) \
</span><span class="cx"> macro(MediaKeys) \
</span><ins>+ macro(MediaStreamEvent) \
</ins><span class="cx"> macro(ModernMediaControls) \
</span><span class="cx"> macro(NaN) \
</span><ins>+ macro(NavigatorMediaDevices) \
+ macro(NavigatorUserMedia) \
</ins><span class="cx"> macro(Number) \
</span><span class="cx"> macro(NumberFormat) \
</span><span class="cx"> macro(Object) \
</span><span class="lines">@@ -94,6 +97,14 @@
</span><span class="cx"> macro(RegExp) \
</span><span class="cx"> macro(Response) \
</span><span class="cx"> macro(Request) \
</span><ins>+ macro(RTCDTMFToneChangeEvent) \
+ macro(RTCIceCandidate) \
+ macro(RTCPeerConnection) \
+ macro(RTCRtpReceiver) \
+ macro(RTCRtpSender) \
+ macro(RTCRtpTransceiver) \
+ macro(RTCSessionDescription) \
+ macro(RTCTrackEvent) \
</ins><span class="cx"> macro(Set)\
</span><span class="cx"> macro(SetIterator)\
</span><span class="cx"> macro(ShadowRoot) \
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/ChangeLog 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-12-09 Eric Carlson <eric.carlson@apple.com>
+
+ Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
+ https://bugs.webkit.org/show_bug.cgi?id=165251
+
+ Reviewed by Dean Jackson.
+
+ Based on a patch by Dr Alex Gouaillard <agouaillard@gmail.com>
+ No new tests, covered by existing tests.
+
+ * Modules/mediastream/MediaStreamEvent.idl: Add "EnabledAtRuntime".
+ * Modules/mediastream/NavigatorMediaDevices.idl: Ditto.
+ * Modules/mediastream/NavigatorUserMedia.idl: Ditto.
+ * Modules/mediastream/RTCDTMFToneChangeEvent.idl: Ditto.
+ * Modules/mediastream/RTCIceCandidate.idl: Ditto.
+ * Modules/mediastream/RTCPeerConnection.idl: Ditto.
+ * Modules/mediastream/RTCRtpReceiver.idl: Ditto.
+ * Modules/mediastream/RTCRtpSender.idl: Ditto.
+ * Modules/mediastream/RTCRtpTransceiver.idl: Ditto.
+ * Modules/mediastream/RTCSessionDescription.idl: Ditto.
+ * Modules/mediastream/RTCTrackEvent.idl: Ditto.
+
+ * bindings/generic/RuntimeEnabledFeatures.cpp:
+ (WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures): Set m_isMediaStreamEnabled in the
+ constructor instead of in reset() because the later is called by the Internals constructor,
+ making it impossible to override the runtime flag from WTR or DRT.
+ (WebCore::RuntimeEnabledFeatures::reset): Don't set m_isMediaStreamEnabled.
+ * page/Settings.in: Add peerConnectionEnabled.
+
</ins><span class="cx"> 2016-12-09 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove QuickLook scheme from the list of secure schemes
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamEvent.idl (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamEvent.idl 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamEvent.idl 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> Constructor(DOMString type, MediaStreamEventInit eventInitDict),
</span><ins>+ EnabledAtRuntime=mediaStream,
</ins><span class="cx"> ] interface MediaStreamEvent : Event {
</span><span class="cx"> readonly attribute MediaStream? stream;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamNavigatorMediaDevicesidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/NavigatorMediaDevices.idl (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/NavigatorMediaDevices.idl 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorMediaDevices.idl 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=MEDIA_STREAM,
</span><ins>+ EnabledAtRuntime=mediaStream,
</ins><span class="cx"> ] partial interface Navigator {
</span><span class="cx"> readonly attribute MediaDevices mediaDevices;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamNavigatorUserMediaidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=MEDIA_STREAM,
</span><ins>+ EnabledAtRuntime=mediaStream,
</ins><span class="cx"> ] partial interface Navigator {
</span><span class="cx"> [JSBuiltin] void webkitGetUserMedia(MediaStreamConstraints constraints, NavigatorUserMediaSuccessCallback successCallback, NavigatorUserMediaErrorCallback errorCallback);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFToneChangeEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.idl (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.idl 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.idl 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> Constructor(DOMString type, optional RTCDTMFToneChangeEventInit eventInitDict),
</span><ins>+ EnabledAtRuntime=peerConnection,
</ins><span class="cx"> ] interface RTCDTMFToneChangeEvent : Event {
</span><span class="cx"> readonly attribute DOMString tone;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceCandidateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> Constructor(Dictionary dictionary),
</span><span class="cx"> ConstructorMayThrowException,
</span><ins>+ EnabledAtRuntime=peerConnection,
</ins><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> PrivateIdentifier,
</span><span class="cx"> PublicIdentifier
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> ActiveDOMObject,
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> ConstructorCallWith=ScriptExecutionContext,
</span><ins>+ EnabledAtRuntime=peerConnection,
</ins><span class="cx"> ExportMacro=WEBCORE_EXPORT,
</span><span class="cx"> JSBuiltinConstructor,
</span><span class="cx"> ] interface RTCPeerConnection : EventTarget {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpReceiveridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.idl (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.idl 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.idl 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -29,7 +29,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Conditional=WEB_RTC
</del><ins>+ Conditional=WEB_RTC,
+ EnabledAtRuntime=peerConnection,
</ins><span class="cx"> ] interface RTCRtpReceiver {
</span><span class="cx"> readonly attribute MediaStreamTrack track;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSenderidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><ins>+ EnabledAtRuntime=peerConnection,
</ins><span class="cx"> ] interface RTCRtpSender {
</span><span class="cx"> readonly attribute MediaStreamTrack? track;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpTransceiveridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.idl (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.idl 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.idl 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -29,7 +29,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Conditional=WEB_RTC
</del><ins>+ Conditional=WEB_RTC,
+ EnabledAtRuntime=peerConnection,
</ins><span class="cx"> ] interface RTCRtpTransceiver {
</span><span class="cx"> readonly attribute DOMString? mid;
</span><span class="cx"> readonly attribute RTCRtpSender sender;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> Constructor(Dictionary dictionary),
</span><span class="cx"> ConstructorMayThrowException,
</span><ins>+ EnabledAtRuntime=peerConnection,
</ins><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> PrivateIdentifier,
</span><span class="cx"> PublicIdentifier,
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCTrackEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> Constructor(DOMString type, RTCTrackEventInit eventInitDict),
</span><ins>+ EnabledAtRuntime=peerConnection,
</ins><span class="cx"> ] interface RTCTrackEvent : Event {
</span><span class="cx"> readonly attribute RTCRtpReceiver receiver;
</span><span class="cx"> readonly attribute MediaStreamTrack track;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -42,6 +42,9 @@
</span><span class="cx"> RuntimeEnabledFeatures::RuntimeEnabledFeatures()
</span><span class="cx"> {
</span><span class="cx"> reset();
</span><ins>+#if ENABLE(MEDIA_STREAM) && PLATFORM(COCOA)
+ m_isMediaStreamEnabled = false;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RuntimeEnabledFeatures::reset()
</span><span class="lines">@@ -64,9 +67,6 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span><span class="cx"> m_isIndexedDBWorkersEnabled = true;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(MEDIA_STREAM) && PLATFORM(COCOA)
- m_isMediaStreamEnabled = false;
-#endif
</del><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx"> m_isPeerConnectionEnabled = true;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebCore/page/Settings.in 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -116,6 +116,7 @@
</span><span class="cx"> fullScreenEnabled initial=false, conditional=FULLSCREEN_API
</span><span class="cx"> asynchronousSpellCheckingEnabled initial=false
</span><span class="cx"> mediaStreamEnabled initial=false
</span><ins>+peerConnectionEnabled initial=false
</ins><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="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-12-09 Eric Carlson <eric.carlson@apple.com>
+
+ Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
+ https://bugs.webkit.org/show_bug.cgi?id=165251
+
+ Reviewed by Dean Jackson.
+
+ Based on a patch by Dr Alex Gouaillard <agouaillard@gmail.com>
+
+ * WebView/WebPreferenceKeysPrivate.h: Add MediaStream and PeerConnection preferences.
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences mediaStreamEnabled]):
+ (-[WebPreferences setMediaStreamEnabled:]):
+ (-[WebPreferences peerConnectionEnabled]):
+ (-[WebPreferences setPeerConnectionEnabled:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2016-12-09 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Don’t expose pointer lock in WebKit1 Objective-C API
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -173,6 +173,8 @@
</span><span class="cx"> #define WebKitVisualViewportEnabledPreferenceKey @"WebKitVisualViewportEnabled"
</span><span class="cx"> #define WebKitModernMediaControlsEnabledPreferenceKey @"WebKitModernMediaControlsEnabled"
</span><span class="cx"> #define WebKitSubtleCryptoEnabledPreferenceKey @"WebKitSubtleCryptoEnabled"
</span><ins>+#define WebKitMediaStreamEnabledPreferenceKey @"WebKitMediaStreamEnabled"
+#define WebKitPeerConnectionEnabledPreferenceKey @"WebKitPeerConnectionEnabled"
</ins><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> // These are private both because callers should be using the cover methods and because the
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -639,6 +639,15 @@
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitSubtleCryptoEnabledPreferenceKey,
</span><span class="cx"> #endif
</span><ins>+
+#if ENABLE(MEDIA_STREAM)
+ [NSNumber numberWithBool:NO], WebKitMediaStreamEnabledPreferenceKey,
+#endif
+
+#if ENABLE(WEB_RTC)
+ [NSNumber numberWithBool:NO], WebKitPeerConnectionEnabledPreferenceKey,
+#endif
+
</ins><span class="cx"> nil];
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -2689,7 +2698,26 @@
</span><span class="cx"> [self _setBoolValue:flag forKey:WebKitSubtleCryptoEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)mediaStreamEnabled
+{
+ return [self _boolValueForKey:WebKitMediaStreamEnabledPreferenceKey];
+}
</ins><span class="cx">
</span><ins>+- (void)setMediaStreamEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitMediaStreamEnabledPreferenceKey];
+}
+
+- (BOOL)peerConnectionEnabled
+{
+ return [self _boolValueForKey:WebKitPeerConnectionEnabledPreferenceKey];
+}
+
+- (void)setPeerConnectionEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitPeerConnectionEnabledPreferenceKey];
+}
+
</ins><span class="cx"> - (void)setMetaRefreshEnabled:(BOOL)enabled
</span><span class="cx"> {
</span><span class="cx"> [self setHTTPEquivEnabled:enabled];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -162,6 +162,12 @@
</span><span class="cx"> - (void)setSubtleCryptoEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)subtleCryptoEnabled;
</span><span class="cx">
</span><ins>+- (void)setMediaStreamEnabled:(BOOL)flag;
+- (BOOL)mediaStreamEnabled;
+
+- (void)setPeerConnectionEnabled:(BOOL)flag;
+- (BOOL)peerConnectionEnabled;
+
</ins><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> // zero means do AutoScale
</span><span class="cx"> - (float)PDFScaleFactor;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -2808,8 +2808,13 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> settings.setMockCaptureDevicesEnabled([preferences mockCaptureDevicesEnabled]);
</span><span class="cx"> settings.setMediaCaptureRequiresSecureConnection([preferences mediaCaptureRequiresSecureConnection]);
</span><ins>+ RuntimeEnabledFeatures::sharedFeatures().setMediaStreamEnabled([preferences mediaStreamEnabled]);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_RTC)
+ RuntimeEnabledFeatures::sharedFeatures().setPeerConnectionEnabled([preferences peerConnectionEnabled]);
+#endif
+
</ins><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="cx"> settings.setWebAudioEnabled([preferences webAudioEnabled]);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-12-09 Eric Carlson <eric.carlson@apple.com>
+
+ Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
+ https://bugs.webkit.org/show_bug.cgi?id=165251
+
+ Reviewed by Dean Jackson.
+
+ Based on a patch by Dr Alex Gouaillard <agouaillard@gmail.com>
+
+ * Shared/WebPreferencesDefinitions.h: Add peerConnectionEnabled.
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetPeerConnectionEnabled): Added.
+ (WKPreferencesGetPeerConnectionEnabled): Added.
+ * UIProcess/API/C/WKPreferencesRef.h:
+
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner): Add WebKitMediaStreamEnabled
+ and WebKitPeerConnectionEnabled.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Initialize the peerConnection preference.
+
</ins><span class="cx"> 2016-12-09 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Re-landing:
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -213,6 +213,7 @@
</span><span class="cx"> macro(SubpixelCSSOMElementMetricsEnabled, subpixelCSSOMElementMetricsEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(UseGiantTiles, useGiantTiles, Bool, bool, false, "", "") \
</span><span class="cx"> macro(MediaStreamEnabled, mediaStreamEnabled, Bool, bool, false, "", "") \
</span><ins>+ macro(PeerConnectionEnabled, peerConnectionEnabled, Bool, bool, false, "", "") \
</ins><span class="cx"> macro(UseLegacyTextAlignPositionedElementBehavior, useLegacyTextAlignPositionedElementBehavior, Bool, bool, false, "", "") \
</span><span class="cx"> macro(SpatialNavigationEnabled, spatialNavigationEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(MediaSourceEnabled, mediaSourceEnabled, Bool, bool, true, "", "") \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -1321,6 +1321,16 @@
</span><span class="cx"> return toImpl(preferencesRef)->mediaStreamEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPreferencesSetPeerConnectionEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+ toImpl(preferencesRef)->setPeerConnectionEnabled(enabled);
+}
+
+bool WKPreferencesGetPeerConnectionEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->peerConnectionEnabled();
+}
+
</ins><span class="cx"> void WKPreferencesSetSpatialNavigationEnabled(WKPreferencesRef preferencesRef, bool enabled)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setSpatialNavigationEnabled(enabled);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -256,6 +256,10 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetMediaStreamEnabled(WKPreferencesRef preferencesRef, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMediaStreamEnabled(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span><ins>+// Defaults to false
+WK_EXPORT void WKPreferencesSetPeerConnectionEnabled(WKPreferencesRef preferencesRef, bool enabled);
+WK_EXPORT bool WKPreferencesGetPeerConnectionEnabled(WKPreferencesRef preferencesRef);
+
</ins><span class="cx"> // Defaults to false.
</span><span class="cx"> WK_EXPORT void WKPreferencesSetSpatialNavigationEnabled(WKPreferencesRef preferencesRef, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetSpatialNavigationEnabled(WKPreferencesRef preferencesRef);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -226,6 +226,16 @@
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setSubtleCryptoEnabled(enabled);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_STREAM)
+ if (preference == "WebKitMediaStreamEnabled")
+ RuntimeEnabledFeatures::sharedFeatures().setMediaStreamEnabled(enabled);
+#endif
+
+#if ENABLE(WEB_RTC)
+ if (preference == "WebKitPeerConnectionEnabled")
+ RuntimeEnabledFeatures::sharedFeatures().setPeerConnectionEnabled(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 class="lines">@@ -244,7 +254,6 @@
</span><span class="cx"> macro(WebKitShouldRespectImageOrientation, ShouldRespectImageOrientation, shouldRespectImageOrientation) \
</span><span class="cx"> macro(WebKitEnableCaretBrowsing, CaretBrowsingEnabled, caretBrowsingEnabled) \
</span><span class="cx"> macro(WebKitDisplayImagesKey, LoadsImagesAutomatically, loadsImagesAutomatically) \
</span><del>- macro(WebKitMediaStreamEnabled, MediaStreamEnabled, mediaStreamEnabled) \
</del><span class="cx"> macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled) \
</span><span class="cx"> macro(WebKitVisualViewportEnabled, VisualViewportEnabled, visualViewportEnabled) \
</span><span class="cx"> macro(WebKitLargeImageAsyncDecodingEnabled, LargeImageAsyncDecodingEnabled, largeImageAsyncDecodingEnabled) \
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -3035,6 +3035,10 @@
</span><span class="cx"> settings.setMediaStreamEnabled(store.getBoolValueForKey(WebPreferencesKey::mediaStreamEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_RTC)
+ settings.setPeerConnectionEnabled(store.getBoolValueForKey(WebPreferencesKey::peerConnectionEnabledKey()));
+#endif
+
</ins><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> settings.setImageControlsEnabled(store.getBoolValueForKey(WebPreferencesKey::imageControlsEnabledKey()));
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Tools/ChangeLog 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-12-09 Eric Carlson <eric.carlson@apple.com>
+
+ Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
+ https://bugs.webkit.org/show_bug.cgi?id=165251
+
+ Reviewed by Dean Jackson.
+
+ Based on a patch by Dr Alex Gouaillard <agouaillard@gmail.com>
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebPreferencesToConsistentValues): Enable MediaStream and PeerConnection.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::beginTesting): Ditto.
+
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::setMediaStreamEnabled): New.
+ (WTR::TestRunner::setPeerConnectionEnabled): New.
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+
</ins><span class="cx"> 2016-12-09 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Re-landing:
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -1002,6 +1002,9 @@
</span><span class="cx">
</span><span class="cx"> [preferences setSubtleCryptoEnabled:YES];
</span><span class="cx">
</span><ins>+ [preferences setMediaStreamEnabled:YES];
+ [preferences setPeerConnectionEnabled:YES];
+
</ins><span class="cx"> [WebPreferences _clearNetworkLoaderSession];
</span><span class="cx"> [WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -338,6 +338,9 @@
</span><span class="cx">
</span><span class="cx"> m_testRunner->setSubtleCryptoEnabled(true);
</span><span class="cx">
</span><ins>+ m_testRunner->setMediaStreamEnabled(true);
+ m_testRunner->setPeerConnectionEnabled(true);
+
</ins><span class="cx"> if (m_timeout > 0)
</span><span class="cx"> m_testRunner->setCustomTimeout(m_timeout);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -361,6 +361,20 @@
</span><span class="cx"> WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TestRunner::setMediaStreamEnabled(bool enabled)
+{
+ WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitMediaStreamEnabled"));
+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);
+}
+
+void TestRunner::setPeerConnectionEnabled(bool enabled)
+{
+ WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitPeerConnectionEnabled"));
+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);
+}
+
</ins><span class="cx"> void TestRunner::setDOMIteratorEnabled(bool enabled)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitDOMIteratorEnabled"));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (209642 => 209643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-12-10 02:34:02 UTC (rev 209642)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-12-10 02:46:31 UTC (rev 209643)
</span><span class="lines">@@ -130,6 +130,8 @@
</span><span class="cx"> void setES6ModulesEnabled(bool);
</span><span class="cx"> void setEncryptedMediaAPIEnabled(bool);
</span><span class="cx"> void setSubtleCryptoEnabled(bool);
</span><ins>+ void setMediaStreamEnabled(bool);
+ void setPeerConnectionEnabled(bool);
</ins><span class="cx">
</span><span class="cx"> // Special DOM functions.
</span><span class="cx"> void clearBackForwardList();
</span></span></pre>
</div>
</div>
</body>
</html>