<!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>[199007] 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/199007">199007</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-04 09:12:43 -0700 (Mon, 04 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/198492">r198492</a>): [GTK] The WEB_RTC flag was not correctly added in some situations
https://bugs.webkit.org/show_bug.cgi?id=156164
Patch by Alejandro G. Castro <alex@igalia.com> on 2016-04-04
Reviewed by Philippe Normand.
.:
Remove double space in the error message when openwebrtc is not present.
* Source/cmake/OptionsGTK.cmake:
Source/WebCore:
Replace WEBRTC with WEB_RTC, in the idls add the new option
UsePointersEvenForNonNullableObjectArguments to fix compilation.
* Modules/mediastream/RTCDataChannel.idl:
* Modules/mediastream/RTCPeerConnection.idl:
* Modules/mediastream/RTCRtpReceiver.cpp:
* Modules/mediastream/RTCRtpReceiver.h:
* Modules/mediastream/RTCRtpSender.cpp:
* Modules/mediastream/RTCRtpSender.h:
* Modules/mediastream/RTCRtpSender.idl:
* Modules/mediastream/RTCRtpSenderReceiverBase.h:
* Modules/mediastream/RTCSessionDescription.cpp:
* Modules/mediastream/RTCSessionDescription.h:
* Modules/mediastream/RTCStatsReport.cpp:
* Modules/mediastream/RTCStatsResponse.cpp:
* Modules/mediastream/RTCTrackEvent.cpp:
* Modules/mediastream/RTCTrackEvent.h:
* Modules/mediastream/SDPProcessor.cpp:
* Modules/mediastream/SDPProcessor.h:
* bindings/generic/RuntimeEnabledFeatures.cpp:
(WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
* bindings/generic/RuntimeEnabledFeatures.h:
* bindings/js/WebCoreJSBuiltinInternals.cpp:
(WebCore::JSBuiltinInternalFunctions::JSBuiltinInternalFunctions):
(WebCore::JSBuiltinInternalFunctions::visit):
(WebCore::JSBuiltinInternalFunctions::initialize):
* bindings/js/WebCoreJSBuiltinInternals.h:
* bindings/js/WebCoreJSBuiltins.h:
(WebCore::JSBuiltinFunctions::JSBuiltinFunctions):
* platform/mediastream/RTCSessionDescriptionDescriptor.cpp:
* platform/mediastream/RTCSessionDescriptionDescriptor.h:
* platform/mediastream/RTCSessionDescriptionRequest.h:
* platform/mediastream/RTCStatsRequest.h:
* platform/mediastream/RTCStatsResponseBase.h:
* platform/mediastream/RTCVoidRequest.h:
* platform/mediastream/SDPProcessorScriptResource.cpp:
* platform/mediastream/SDPProcessorScriptResource.h:
* platform/mock/TimerEventBasedMock.h:
Tools:
Enable the new WEB_RTC option by default for Gtk+.
* Scripts/webkitperl/FeatureList.pm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelidl">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpReceivercpp">trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpReceiverh">trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSenderh">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSenderidl">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSenderReceiverBaseh">trunk/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptioncpp">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionh">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCStatsReportcpp">trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCStatsResponsecpp">trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCTrackEventcpp">trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCTrackEventh">trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamSDPProcessorcpp">trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamSDPProcessorh">trunk/Source/WebCore/Modules/mediastream/SDPProcessor.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturescpp">trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturesh">trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreJSBuiltinInternalscpp">trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreJSBuiltinInternalsh">trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreJSBuiltinsh">trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCSessionDescriptionDescriptorcpp">trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCSessionDescriptionDescriptorh">trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCSessionDescriptionRequesth">trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCStatsRequesth">trunk/Source/WebCore/platform/mediastream/RTCStatsRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCStatsResponseBaseh">trunk/Source/WebCore/platform/mediastream/RTCStatsResponseBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCVoidRequesth">trunk/Source/WebCore/platform/mediastream/RTCVoidRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamSDPProcessorScriptResourcecpp">trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamSDPProcessorScriptResourceh">trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockTimerEventBasedMockh">trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/ChangeLog 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-04 Alejandro G. Castro <alex@igalia.com>
+
+ REGRESSION(r198492): [GTK] The WEB_RTC flag was not correctly added in some situations
+ https://bugs.webkit.org/show_bug.cgi?id=156164
+
+ Reviewed by Philippe Normand.
+
+ Remove double space in the error message when openwebrtc is not present.
+
+ * Source/cmake/OptionsGTK.cmake:
+
</ins><span class="cx"> 2016-04-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Bump GTK+ versions numbers.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/ChangeLog 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2016-04-04 Alejandro G. Castro <alex@igalia.com>
+
+ REGRESSION(r198492): [GTK] The WEB_RTC flag was not correctly added in some situations
+ https://bugs.webkit.org/show_bug.cgi?id=156164
+
+ Reviewed by Philippe Normand.
+
+ Replace WEBRTC with WEB_RTC, in the idls add the new option
+ UsePointersEvenForNonNullableObjectArguments to fix compilation.
+
+ * Modules/mediastream/RTCDataChannel.idl:
+ * Modules/mediastream/RTCPeerConnection.idl:
+ * Modules/mediastream/RTCRtpReceiver.cpp:
+ * Modules/mediastream/RTCRtpReceiver.h:
+ * Modules/mediastream/RTCRtpSender.cpp:
+ * Modules/mediastream/RTCRtpSender.h:
+ * Modules/mediastream/RTCRtpSender.idl:
+ * Modules/mediastream/RTCRtpSenderReceiverBase.h:
+ * Modules/mediastream/RTCSessionDescription.cpp:
+ * Modules/mediastream/RTCSessionDescription.h:
+ * Modules/mediastream/RTCStatsReport.cpp:
+ * Modules/mediastream/RTCStatsResponse.cpp:
+ * Modules/mediastream/RTCTrackEvent.cpp:
+ * Modules/mediastream/RTCTrackEvent.h:
+ * Modules/mediastream/SDPProcessor.cpp:
+ * Modules/mediastream/SDPProcessor.h:
+ * bindings/generic/RuntimeEnabledFeatures.cpp:
+ (WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ * bindings/js/WebCoreJSBuiltinInternals.cpp:
+ (WebCore::JSBuiltinInternalFunctions::JSBuiltinInternalFunctions):
+ (WebCore::JSBuiltinInternalFunctions::visit):
+ (WebCore::JSBuiltinInternalFunctions::initialize):
+ * bindings/js/WebCoreJSBuiltinInternals.h:
+ * bindings/js/WebCoreJSBuiltins.h:
+ (WebCore::JSBuiltinFunctions::JSBuiltinFunctions):
+ * platform/mediastream/RTCSessionDescriptionDescriptor.cpp:
+ * platform/mediastream/RTCSessionDescriptionDescriptor.h:
+ * platform/mediastream/RTCSessionDescriptionRequest.h:
+ * platform/mediastream/RTCStatsRequest.h:
+ * platform/mediastream/RTCStatsResponseBase.h:
+ * platform/mediastream/RTCVoidRequest.h:
+ * platform/mediastream/SDPProcessorScriptResource.cpp:
+ * platform/mediastream/SDPProcessorScriptResource.h:
+ * platform/mock/TimerEventBasedMock.h:
+
</ins><span class="cx"> 2016-04-04 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r198792): [GTK] Inspector crashes in Inspector::Protocol::getEnumConstantValue since r198792
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span><span class="cx"> Conditional=WEB_RTC,
</span><ins>+ UsePointersEvenForNonNullableObjectArguments,
</ins><span class="cx"> ] interface RTCDataChannel : EventTarget {
</span><span class="cx"> readonly attribute DOMString label;
</span><span class="cx"> readonly attribute boolean ordered;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> ConstructorCallWith=ScriptExecutionContext,
</span><span class="cx"> ConstructorRaisesException,
</span><span class="cx"> InterfaceName=webkitRTCPeerConnection,
</span><ins>+ UsePointersEvenForNonNullableObjectArguments,
</ins><span class="cx"> ] interface RTCPeerConnection : EventTarget {
</span><span class="cx">
</span><span class="cx"> // Private functions called by runQueuedOperation() (RTCPeerConnectionInternals.js)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpReceivercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "RTCRtpReceiver.h"
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -42,4 +42,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpReceiverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef RTCRtpReceiver_h
</span><span class="cx"> #define RTCRtpReceiver_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "RTCRtpSenderReceiverBase.h"
</span><span class="cx">
</span><span class="lines">@@ -50,6 +50,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // RTCRtpReceiver_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "RTCRtpSender.h"
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "DOMError.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="lines">@@ -70,4 +70,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef RTCRtpSender_h
</span><span class="cx"> #define RTCRtpSender_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "PeerConnectionBackend.h"
</span><span class="cx"> #include "RTCRtpSenderReceiverBase.h"
</span><span class="lines">@@ -70,6 +70,5 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
-
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx"> #endif // RTCRtpSender_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSenderidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl 2016-04-04 16:12:43 UTC (rev 199007)
</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,
+ UsePointersEvenForNonNullableObjectArguments,
</ins><span class="cx"> ] interface RTCRtpSender {
</span><span class="cx"> readonly attribute MediaStreamTrack track;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSenderReceiverBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef RTCRtpSenderReceiverBase_h
</span><span class="cx"> #define RTCRtpSenderReceiverBase_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "MediaStreamTrack.h"
</span><span class="cx"> #include "ScriptWrappable.h"
</span><span class="lines">@@ -58,6 +58,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // RTCRtpSenderReceiverBase_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "RTCSessionDescription.h"
</span><span class="cx">
</span><span class="lines">@@ -89,4 +89,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef RTCSessionDescription_h
</span><span class="cx"> #define RTCSessionDescription_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "ScriptWrappable.h"
</span><span class="lines">@@ -65,6 +65,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // RTCSessionDescription_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCStatsReportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "RTCStatsReport.h"
</span><span class="cx">
</span><span class="lines">@@ -70,4 +70,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCStatsResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "RTCStatsResponse.h"
</span><span class="cx">
</span><span class="lines">@@ -67,4 +67,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCTrackEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "RTCTrackEvent.h"
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "MediaStreamTrack.h"
</span><span class="lines">@@ -65,4 +65,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCTrackEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef RTCTrackEvent_h
</span><span class="cx"> #define RTCTrackEvent_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="lines">@@ -66,6 +66,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // RTCTrackEvent_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamSDPProcessorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> #include "SDPProcessor.h"
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><span class="lines">@@ -538,4 +538,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamSDPProcessorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/SDPProcessor.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/SDPProcessor.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/Modules/mediastream/SDPProcessor.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef SDPProcessor_h
</span><span class="cx"> #define SDPProcessor_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "ContextDestructionObserver.h"
</span><span class="cx"> #include "IceCandidate.h"
</span><span class="lines">@@ -68,6 +68,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // SDPProcessor_h
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> , m_isMediaStreamEnabled(true)
</span><span class="cx"> #endif
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> , m_isPeerConnectionEnabled(true)
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(LEGACY_CSS_VENDOR_PREFIXES)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> bool webkitGetUserMediaEnabled() const { return m_isMediaStreamEnabled; }
</span><span class="cx"> bool webkitMediaStreamEnabled() const { return m_isMediaStreamEnabled; }
</span><span class="cx"> #endif
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> bool peerConnectionEnabled() const { return m_isMediaStreamEnabled && m_isPeerConnectionEnabled; }
</span><span class="cx"> void setPeerConnectionEnabled(bool isEnabled) { m_isPeerConnectionEnabled = isEnabled; }
</span><span class="cx"> bool webkitRTCPeerConnectionEnabled() const { return peerConnectionEnabled(); }
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> bool m_isMediaStreamEnabled;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> bool m_isPeerConnectionEnabled;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreJSBuiltinInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.cpp (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.cpp 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.cpp 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& v)
</span><span class="cx"> : vm(v)
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> , m_rtcPeerConnectionInternalsFunctions(vm)
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
</span><span class="cx"> {
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> m_rtcPeerConnectionInternalsFunctions.visit(visitor);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="lines">@@ -61,14 +61,14 @@
</span><span class="cx"> m_streamInternalsFunctions.visit(visitor);
</span><span class="cx"> m_writableStreamInternalsFunctions.visit(visitor);
</span><span class="cx"> #endif
</span><del>-#if !ENABLE(STREAMS_API) && !ENABLE(WEBRTC)
</del><ins>+#if !ENABLE(STREAMS_API) && !ENABLE(WEB_RTC)
</ins><span class="cx"> UNUSED_PARAM(visitor);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject, VM& vm)
</span><span class="cx"> {
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> m_rtcPeerConnectionInternalsFunctions.init(globalObject);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="lines">@@ -77,11 +77,11 @@
</span><span class="cx"> m_writableStreamInternalsFunctions.init(globalObject);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(STREAMS_API) || ENABLE(WEBRTC)
</del><ins>+#if ENABLE(STREAMS_API) || ENABLE(WEB_RTC)
</ins><span class="cx"> JSVMClientData& clientData = *static_cast<JSVMClientData*>(vm.clientData);
</span><span class="cx">
</span><span class="cx"> JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> #define DECLARE_GLOBAL_STATIC(name)\
</span><span class="cx"> JSDOMGlobalObject::GlobalPropertyInfo(\
</span><span class="cx"> clientData.builtinFunctions().rtcPeerConnectionInternalsBuiltins().name##PrivateName(), rtcPeerConnectionInternals().m_##name##Function.get() , DontDelete | ReadOnly),
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
</span><span class="cx"> #endif
</span><del>-#if !ENABLE(STREAMS_API) && !ENABLE(WEBRTC)
</del><ins>+#if !ENABLE(STREAMS_API) && !ENABLE(WEB_RTC)
</ins><span class="cx"> UNUSED_PARAM(globalObject);
</span><span class="cx"> UNUSED_PARAM(vm);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreJSBuiltinInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include <runtime/VM.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> #include "RTCPeerConnectionInternalsBuiltins.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit JSBuiltinInternalFunctions(JSC::VM&);
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> RTCPeerConnectionInternalsBuiltinFunctions rtcPeerConnectionInternals() { return m_rtcPeerConnectionInternalsFunctions; }
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> JSC::VM& vm;
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> RTCPeerConnectionInternalsBuiltinFunctions m_rtcPeerConnectionInternalsFunctions;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreJSBuiltinsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> , m_mediaDevicesBuiltins(&vm)
</span><span class="cx"> , m_navigatorUserMediaBuiltins(&vm)
</span><span class="cx"> #endif
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> , m_rtcPeerConnectionBuiltins(&vm)
</span><span class="cx"> , m_rtcPeerConnectionInternalsBuiltins(&vm)
</span><span class="cx"> #endif
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> m_streamInternalsBuiltins.exportNames();
</span><span class="cx"> m_writableStreamInternalsBuiltins.exportNames();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> m_rtcPeerConnectionInternalsBuiltins.exportNames();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> MediaDevicesBuiltinsWrapper& mediaDevicesBuiltins() { return m_mediaDevicesBuiltins; }
</span><span class="cx"> NavigatorUserMediaBuiltinsWrapper& navigatorUserMediaBuiltins() { return m_navigatorUserMediaBuiltins;}
</span><span class="cx"> #endif
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> RTCPeerConnectionBuiltinsWrapper& rtcPeerConnectionBuiltins() { return m_rtcPeerConnectionBuiltins; }
</span><span class="cx"> RTCPeerConnectionInternalsBuiltinsWrapper& rtcPeerConnectionInternalsBuiltins() { return m_rtcPeerConnectionInternalsBuiltins; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> MediaDevicesBuiltinsWrapper m_mediaDevicesBuiltins;
</span><span class="cx"> NavigatorUserMediaBuiltinsWrapper m_navigatorUserMediaBuiltins;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> RTCPeerConnectionBuiltinsWrapper m_rtcPeerConnectionBuiltins;
</span><span class="cx"> RTCPeerConnectionInternalsBuiltinsWrapper m_rtcPeerConnectionInternalsBuiltins;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCSessionDescriptionDescriptorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.cpp (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.cpp 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.cpp 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "RTCSessionDescriptionDescriptor.h"
</span><span class="cx">
</span><span class="lines">@@ -53,4 +53,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCSessionDescriptionDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef RTCSessionDescriptionDescriptor_h
</span><span class="cx"> #define RTCSessionDescriptionDescriptor_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -59,6 +59,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // RTCSessionDescriptionDescriptor_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCSessionDescriptionRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef RTCSessionDescriptionRequest_h
</span><span class="cx"> #define RTCSessionDescriptionRequest_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -66,6 +66,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // RTCSessionDescriptionRequest_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCStatsRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCStatsRequest.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCStatsRequest.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/platform/mediastream/RTCStatsRequest.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef RTCStatsRequest_h
</span><span class="cx"> #define RTCStatsRequest_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -58,6 +58,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // RTCStatsRequest_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCStatsResponseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCStatsResponseBase.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCStatsResponseBase.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/platform/mediastream/RTCStatsResponseBase.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #ifndef RTCStatsResponseBase_h
</span><span class="cx"> #define RTCStatsResponseBase_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // RTCStatsResponseBase_h
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCVoidRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCVoidRequest.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCVoidRequest.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/platform/mediastream/RTCVoidRequest.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef RTCVoidRequest_h
</span><span class="cx"> #define RTCVoidRequest_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -53,6 +53,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // RTCVoidRequest_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamSDPProcessorScriptResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx"> #include "SDPProcessorScriptResource.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -46,4 +46,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamSDPProcessorScriptResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef SDPProcessorScriptResource_h
</span><span class="cx"> #define SDPProcessorScriptResource_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -45,6 +45,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // SDPProcessorScriptResource_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockTimerEventBasedMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef TimerEventBasedMock_h
</span><span class="cx"> #define TimerEventBasedMock_h
</span><span class="cx">
</span><del>-#if ENABLE(WEBRTC)
</del><ins>+#if ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -85,6 +85,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(WEBRTC)
</del><ins>+#endif // ENABLE(WEB_RTC)
</ins><span class="cx">
</span><span class="cx"> #endif // TimerEventBasedMock_h
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Source/cmake/OptionsGTK.cmake 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
</span><span class="cx"> find_package(OpenWebRTC)
</span><span class="cx"> if (NOT OPENWEBRTC_FOUND)
</span><del>- message(FATAL_ERROR "OpenWebRTC is needed for ENABLE_MEDIA_STREAM and ENABLE_WEB_RTC.")
</del><ins>+ message(FATAL_ERROR "OpenWebRTC is needed for ENABLE_MEDIA_STREAM and ENABLE_WEB_RTC.")
</ins><span class="cx"> endif ()
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_OPENWEBRTC TRUE)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Tools/ChangeLog 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-04 Alejandro G. Castro <alex@igalia.com>
+
+ REGRESSION(r198492): [GTK] The WEB_RTC flag was not correctly added in some situations
+ https://bugs.webkit.org/show_bug.cgi?id=156164
+
+ Reviewed by Philippe Normand.
+
+ Enable the new WEB_RTC option by default for Gtk+.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
</ins><span class="cx"> 2016-04-03 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Use the correct value for the first nightly build with frameworks built for OS X 10.11.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (199006 => 199007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2016-04-04 15:46:17 UTC (rev 199006)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2016-04-04 16:12:43 UTC (rev 199007)
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx"> $mediaSourceSupport,
</span><span class="cx"> $mediaStatisticsSupport,
</span><span class="cx"> $mediaStreamSupport,
</span><ins>+ $webRTCSupport,
</ins><span class="cx"> $meterElementSupport,
</span><span class="cx"> $mhtmlSupport,
</span><span class="cx"> $modulesSupport,
</span><span class="lines">@@ -337,6 +338,9 @@
</span><span class="cx"> { option => "media-stream", desc => "Toggle Media Stream support",
</span><span class="cx"> define => "ENABLE_MEDIA_STREAM", default => (isGtk()), value => \$mediaStreamSupport },
</span><span class="cx">
</span><ins>+ { option => "web-rtc", desc => "Toggle WebRTC support",
+ define => "ENABLE_WEB_RTC", default => (isGtk()), value => \$webRTCSupport },
+
</ins><span class="cx"> { option => "meter-element", desc => "Toggle Meter Element support",
</span><span class="cx"> define => "ENABLE_METER_ELEMENT", default => !isAppleWinWebKit(), value => \$meterElementSupport },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>