<!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>[215238] 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/215238">215238</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-11 10:06:53 -0700 (Tue, 11 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>MediaStream id should be equal to msid
https://bugs.webkit.org/show_bug.cgi?id=170712
Patch by Youenn Fablet <youenn@apple.com> on 2017-04-11
Reviewed by Eric Carlson.
LayoutTests/imported/w3c:
* web-platform-tests/webrtc/datachannel-emptystring-expected.txt:
* web-platform-tests/webrtc/no-media-call-expected.txt:
* web-platform-tests/webrtc/promises-call-expected.txt:
* web-platform-tests/webrtc/rtcpeerconnection/setRemoteDescription-expected.txt:
Source/WebCore:
Covered by rebased tests.
Setting MediaStream id to libwebrtc mediastream label.
Refactoring to use more Ref<> in MediaStream code.
Making PeerConnection use the libwebrtc backend by default for layout tests instead of the mock.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::create):
(WebCore::createTrackPrivateVector):
(WebCore::MediaStream::MediaStream):
* Modules/mediastream/MediaStream.h:
* Modules/mediastream/MediaStreamRegistry.cpp:
(WebCore::MediaStreamRegistry::lookUp):
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::allow):
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
(WebCore::LibWebRTCMediaEndpoint::mediaStreamFromRTCStream):
(WebCore::LibWebRTCMediaEndpoint::addRemoteStream):
(WebCore::LibWebRTCMediaEndpoint::addRemoteTrack):
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::load):
* platform/graphics/MediaPlayer.h:
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::MediaStreamPrivate):
* platform/mediastream/MediaStreamPrivate.h:
(WebCore::MediaStreamPrivate::create):
* testing/Internals.cpp:
(WebCore::Internals::Internals):
LayoutTests:
Removing no longer needed/Adding needed calls to useMockRTCPeerConnectionFactory.
* fast/mediastream/RTCPeerConnection-inspect-answer.html:
* fast/mediastream/RTCPeerConnection-inspect-offer.html:
* fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html:
* fast/mediastream/RTCPeerConnection-media-setup-single-dialog.html:
* fast/mediastream/RTCPeerConnection-remotely-assigned-transceiver-mid.html:
* fast/mediastream/RTCPeerConnection-setLocalDescription-offer.html:
* fast/mediastream/RTCPeerConnection-setRemoteDescription-offer.html:
* webrtc/audio-peer-connection-webaudio.html:
* webrtc/audio-replace-track.html:
* webrtc/connection-state.html:
* webrtc/datachannel/basic.html:
* webrtc/datachannel/bufferedAmountLowThreshold.html:
* webrtc/datachannel/datachannel-gc.html:
* webrtc/datachannel/datachannel-stats.html:
* webrtc/datachannel/filter-ice-candidate.html:
* webrtc/ephemeral-certificates-and-cnames.html:
* webrtc/libwebrtc/descriptionGetters.html:
* webrtc/negotiatedneeded-event-addStream.html:
* webrtc/no-port-zero-in-upd-candidates.html:
* webrtc/peer-connection-audio-mute.html:
* webrtc/peer-connection-audio-mute2.html:
* webrtc/peer-connection-remote-audio-mute.html:
* webrtc/peer-connection-remote-audio-mute2.html:
* webrtc/release-after-getting-track.html:
* webrtc/video-disabled-black.html:
* webrtc/video-getParameters.html:
* webrtc/video-mediastreamtrack-stats.html:
* webrtc/video-mute.html:
* webrtc/video-remote-mute.html:
* webrtc/video-replace-track-to-null.html:
* webrtc/video-replace-track.html:
* webrtc/video-stats.html:
* webrtc/video-with-receiver.html:
* webrtc/video.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectioninspectanswerhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-inspect-answer.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectioninspectofferhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-inspect-offer.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionlegacystreambasedapihtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionmediasetupsingledialoghtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-media-setup-single-dialog.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionremotelyassignedtransceivermidhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-remotely-assigned-transceiver-mid.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionsetLocalDescriptionofferhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-setLocalDescription-offer.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionsetRemoteDescriptionofferhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-setRemoteDescription-offer.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcdatachannelemptystringexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/datachannel-emptystring-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcnomediacallexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/no-media-call-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcpromisescallexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/promises-call-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebrtcrtcpeerconnectionsetRemoteDescriptionexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/setRemoteDescription-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebrtcaudiopeerconnectionwebaudiohtml">trunk/LayoutTests/webrtc/audio-peer-connection-webaudio.html</a></li>
<li><a href="#trunkLayoutTestswebrtcaudioreplacetrackhtml">trunk/LayoutTests/webrtc/audio-replace-track.html</a></li>
<li><a href="#trunkLayoutTestswebrtcconnectionstatehtml">trunk/LayoutTests/webrtc/connection-state.html</a></li>
<li><a href="#trunkLayoutTestswebrtcdatachannelbasichtml">trunk/LayoutTests/webrtc/datachannel/basic.html</a></li>
<li><a href="#trunkLayoutTestswebrtcdatachannelbufferedAmountLowThresholdexpectedtxt">trunk/LayoutTests/webrtc/datachannel/bufferedAmountLowThreshold-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebrtcdatachannelbufferedAmountLowThresholdhtml">trunk/LayoutTests/webrtc/datachannel/bufferedAmountLowThreshold.html</a></li>
<li><a href="#trunkLayoutTestswebrtcdatachanneldatachannelgchtml">trunk/LayoutTests/webrtc/datachannel/datachannel-gc.html</a></li>
<li><a href="#trunkLayoutTestswebrtcdatachanneldatachannelstatshtml">trunk/LayoutTests/webrtc/datachannel/datachannel-stats.html</a></li>
<li><a href="#trunkLayoutTestswebrtcdatachannelfiltericecandidatehtml">trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate.html</a></li>
<li><a href="#trunkLayoutTestswebrtcephemeralcertificatesandcnameshtml">trunk/LayoutTests/webrtc/ephemeral-certificates-and-cnames.html</a></li>
<li><a href="#trunkLayoutTestswebrtclibwebrtcdescriptionGettershtml">trunk/LayoutTests/webrtc/libwebrtc/descriptionGetters.html</a></li>
<li><a href="#trunkLayoutTestswebrtcnegotiatedneededeventaddStreamhtml">trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream.html</a></li>
<li><a href="#trunkLayoutTestswebrtcnoportzeroinupdcandidateshtml">trunk/LayoutTests/webrtc/no-port-zero-in-upd-candidates.html</a></li>
<li><a href="#trunkLayoutTestswebrtcpeerconnectionaudiomutehtml">trunk/LayoutTests/webrtc/peer-connection-audio-mute.html</a></li>
<li><a href="#trunkLayoutTestswebrtcpeerconnectionaudiomute2html">trunk/LayoutTests/webrtc/peer-connection-audio-mute2.html</a></li>
<li><a href="#trunkLayoutTestswebrtcpeerconnectionremoteaudiomutehtml">trunk/LayoutTests/webrtc/peer-connection-remote-audio-mute.html</a></li>
<li><a href="#trunkLayoutTestswebrtcpeerconnectionremoteaudiomute2html">trunk/LayoutTests/webrtc/peer-connection-remote-audio-mute2.html</a></li>
<li><a href="#trunkLayoutTestswebrtcreleaseaftergettingtrackhtml">trunk/LayoutTests/webrtc/release-after-getting-track.html</a></li>
<li><a href="#trunkLayoutTestswebrtcvideodisabledblackhtml">trunk/LayoutTests/webrtc/video-disabled-black.html</a></li>
<li><a href="#trunkLayoutTestswebrtcvideogetParametershtml">trunk/LayoutTests/webrtc/video-getParameters.html</a></li>
<li><a href="#trunkLayoutTestswebrtcvideomediastreamtrackstatshtml">trunk/LayoutTests/webrtc/video-mediastreamtrack-stats.html</a></li>
<li><a href="#trunkLayoutTestswebrtcvideomutehtml">trunk/LayoutTests/webrtc/video-mute.html</a></li>
<li><a href="#trunkLayoutTestswebrtcvideoremotemutehtml">trunk/LayoutTests/webrtc/video-remote-mute.html</a></li>
<li><a href="#trunkLayoutTestswebrtcvideoreplacetracktonullhtml">trunk/LayoutTests/webrtc/video-replace-track-to-null.html</a></li>
<li><a href="#trunkLayoutTestswebrtcvideoreplacetrackhtml">trunk/LayoutTests/webrtc/video-replace-track.html</a></li>
<li><a href="#trunkLayoutTestswebrtcvideostatshtml">trunk/LayoutTests/webrtc/video-stats.html</a></li>
<li><a href="#trunkLayoutTestswebrtcvideowithreceiverhtml">trunk/LayoutTests/webrtc/video-with-receiver.html</a></li>
<li><a href="#trunkLayoutTestswebrtcvideohtml">trunk/LayoutTests/webrtc/video.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamh">trunk/Source/WebCore/Modules/mediastream/MediaStream.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamRegistrycpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointh">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/ChangeLog 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2017-04-11 Youenn Fablet <youenn@apple.com>
+
+ MediaStream id should be equal to msid
+ https://bugs.webkit.org/show_bug.cgi?id=170712
+
+ Reviewed by Eric Carlson.
+
+ Removing no longer needed/Adding needed calls to useMockRTCPeerConnectionFactory.
+
+ * fast/mediastream/RTCPeerConnection-inspect-answer.html:
+ * fast/mediastream/RTCPeerConnection-inspect-offer.html:
+ * fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html:
+ * fast/mediastream/RTCPeerConnection-media-setup-single-dialog.html:
+ * fast/mediastream/RTCPeerConnection-remotely-assigned-transceiver-mid.html:
+ * fast/mediastream/RTCPeerConnection-setLocalDescription-offer.html:
+ * fast/mediastream/RTCPeerConnection-setRemoteDescription-offer.html:
+ * webrtc/audio-peer-connection-webaudio.html:
+ * webrtc/audio-replace-track.html:
+ * webrtc/connection-state.html:
+ * webrtc/datachannel/basic.html:
+ * webrtc/datachannel/bufferedAmountLowThreshold.html:
+ * webrtc/datachannel/datachannel-gc.html:
+ * webrtc/datachannel/datachannel-stats.html:
+ * webrtc/datachannel/filter-ice-candidate.html:
+ * webrtc/ephemeral-certificates-and-cnames.html:
+ * webrtc/libwebrtc/descriptionGetters.html:
+ * webrtc/negotiatedneeded-event-addStream.html:
+ * webrtc/no-port-zero-in-upd-candidates.html:
+ * webrtc/peer-connection-audio-mute.html:
+ * webrtc/peer-connection-audio-mute2.html:
+ * webrtc/peer-connection-remote-audio-mute.html:
+ * webrtc/peer-connection-remote-audio-mute2.html:
+ * webrtc/release-after-getting-track.html:
+ * webrtc/video-disabled-black.html:
+ * webrtc/video-getParameters.html:
+ * webrtc/video-mediastreamtrack-stats.html:
+ * webrtc/video-mute.html:
+ * webrtc/video-remote-mute.html:
+ * webrtc/video-replace-track-to-null.html:
+ * webrtc/video-replace-track.html:
+ * webrtc/video-stats.html:
+ * webrtc/video-with-receiver.html:
+ * webrtc/video.html:
+
</ins><span class="cx"> 2017-04-11 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Web article navigation does not work (article rotor for Facebook, Twitter, Messages etc.)
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectioninspectanswerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-inspect-answer.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-inspect-answer.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-inspect-answer.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -6,6 +6,9 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><ins>+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("");
+
</ins><span class="cx"> let remoteStream;
</span><span class="cx"> let remotePcAudioTrack;
</span><span class="cx"> let remotePcVideoTrack;
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectioninspectofferhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-inspect-offer.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-inspect-offer.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-inspect-offer.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -6,6 +6,9 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><ins>+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("");
+
</ins><span class="cx"> var stream;
</span><span class="cx"> var audioTrack;
</span><span class="cx"> var videoTrack;
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionlegacystreambasedapihtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -5,6 +5,9 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><ins>+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("");
+
</ins><span class="cx"> description("Test RTCPeerConnection's legacy MediaStream-based API");
</span><span class="cx">
</span><span class="cx"> let stream;
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionmediasetupsingledialoghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-media-setup-single-dialog.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-media-setup-single-dialog.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-media-setup-single-dialog.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -6,6 +6,9 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><ins>+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("");
+
</ins><span class="cx"> let stream;
</span><span class="cx"> let offer;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionremotelyassignedtransceivermidhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-remotely-assigned-transceiver-mid.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-remotely-assigned-transceiver-mid.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-remotely-assigned-transceiver-mid.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -6,6 +6,9 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><ins>+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("");
+
</ins><span class="cx"> let stream;
</span><span class="cx"> let midAssignedByA;
</span><span class="cx"> let event;
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionsetLocalDescriptionofferhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-setLocalDescription-offer.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-setLocalDescription-offer.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-setLocalDescription-offer.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -6,6 +6,9 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><ins>+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("");
+
</ins><span class="cx"> var stream;
</span><span class="cx"> var audioTrack;
</span><span class="cx"> var videoTrack;
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionsetRemoteDescriptionofferhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-setRemoteDescription-offer.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-setRemoteDescription-offer.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-setRemoteDescription-offer.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -6,6 +6,9 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><ins>+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("");
+
</ins><span class="cx"> var stream;
</span><span class="cx"> var remotePcAudioTrack;
</span><span class="cx"> var remotePcVideoTrack;
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-04-11 Youenn Fablet <youenn@apple.com>
+
+ MediaStream id should be equal to msid
+ https://bugs.webkit.org/show_bug.cgi?id=170712
+
+ Reviewed by Eric Carlson.
+
+ * web-platform-tests/webrtc/datachannel-emptystring-expected.txt:
+ * web-platform-tests/webrtc/no-media-call-expected.txt:
+ * web-platform-tests/webrtc/promises-call-expected.txt:
+ * web-platform-tests/webrtc/rtcpeerconnection/setRemoteDescription-expected.txt:
+
</ins><span class="cx"> 2017-04-09 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Resync WPT tests up to 23cd07d4685d81024b7440e042f8bbdb33e7ddec
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcdatachannelemptystringexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/datachannel-emptystring-expected.txt (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/datachannel-emptystring-expected.txt 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/datachannel-emptystring-expected.txt 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -1,5 +1,8 @@
</span><span class="cx">
</span><del>-FAIL Can send empty strings across a WebRTC data channel. assert_unreached: Error TypeError: Argument 1 ('description') to RTCPeerConnection.setRemoteDescription must be an instance of RTCSessionDescription Reached unreachable code
</del><ins>+FAIL Can send empty strings across a WebRTC data channel. assert_equals: Empty message not received expected "" but got "done"
</ins><span class="cx"> Messages exchanged
</span><span class="cx">
</span><ins>+Sent: [empty string]
+Sent: "done"
+Received: "done"
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcnomediacallexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/no-media-call-expected.txt (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/no-media-call-expected.txt 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/no-media-call-expected.txt 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -1,5 +1,8 @@
</span><span class="cx">
</span><del>-FAIL Can set up a basic WebRTC call with no data. assert_unreached: WebRTC called error callback for setRemoteDescription first Reached unreachable code
</del><ins>+Harness Error (TIMEOUT), message = null
+
+TIMEOUT Can set up a basic WebRTC call with no data. Test timed out
</ins><span class="cx"> iceConnectionState info
</span><span class="cx">
</span><del>-
</del><ins>+First: checking
+Second: new
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcpromisescallexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/promises-call-expected.txt (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/promises-call-expected.txt 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/promises-call-expected.txt 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx">
</span><del>-FAIL Can set up a basic WebRTC call with only data using promises. assert_unreached: Error TypeError: Argument 1 ('description') to RTCPeerConnection.setRemoteDescription must be an instance of RTCSessionDescription happened at step Set remote description at second Reached unreachable code
</del><ins>+PASS Can set up a basic WebRTC call with only data using promises.
</ins><span class="cx"> iceConnectionState info
</span><span class="cx">
</span><del>-
</del><ins>+First: completed
+Second: connected
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebrtcrtcpeerconnectionsetRemoteDescriptionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/setRemoteDescription-expected.txt (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/setRemoteDescription-expected.txt 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/rtcpeerconnection/setRemoteDescription-expected.txt 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -1,5 +1,3 @@
</span><span class="cx">
</span><del>-Harness Error (TIMEOUT), message = null
</del><ins>+PASS Triggers onaddstream when called with a remote description and the MSID is parsed.
</ins><span class="cx">
</span><del>-TIMEOUT Triggers onaddstream when called with a remote description and the MSID is parsed. Test timed out
-
</del></span></pre></div>
<a id="trunkLayoutTestswebrtcaudiopeerconnectionwebaudiohtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/audio-peer-connection-webaudio.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/audio-peer-connection-webaudio.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/audio-peer-connection-webaudio.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -12,8 +12,6 @@
</span><span class="cx"> testRunner.setUserMediaPermission(true);
</span><span class="cx">
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({audio: true}).then((stream) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
</del><span class="cx"> return new Promise((resolve, reject) => {
</span><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> firstConnection.addStream(stream);
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcaudioreplacetrackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/audio-replace-track.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/audio-replace-track.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/audio-replace-track.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ audio: { sampleRate: { exact: 48000 } } });
</span><span class="cx"> }).then((stream) => {
</span><span class="cx"> secondStream = stream;
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
</del><span class="cx"> return new Promise((resolve, reject) => {
</span><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> sender = firstConnection.addTrack(firstStream.getAudioTracks()[0], firstStream);
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcconnectionstatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/connection-state.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/connection-state.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/connection-state.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -22,9 +22,6 @@
</span><span class="cx"> var remoteGatheringStates = ["new"];
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true}).then((stream) => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((connection) => {
</span><span class="cx"> firstConnection = connection;
</span><span class="cx"> firstConnection.addTrack(stream.getVideoTracks()[0], stream);
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachannelbasichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/datachannel/basic.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/basic.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/datachannel/basic.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -45,9 +45,6 @@
</span><span class="cx"> promise_test((test) => {
</span><span class="cx"> counter = 0;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> finishTest = resolve;
</span><span class="cx"> createConnections((localConnection) => {
</span><span class="cx"> localChannel = localConnection.createDataChannel('sendDataChannel');
</span><span class="lines">@@ -64,9 +61,6 @@
</span><span class="cx"> promise_test((test) => {
</span><span class="cx"> counter = 0;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> finishTest = resolve;
</span><span class="cx"> createConnections((localConnection) => {
</span><span class="cx"> localChannel = localConnection.createDataChannel('sendDataChannel');
</span><span class="lines">@@ -83,9 +77,6 @@
</span><span class="cx"> promise_test((test) => {
</span><span class="cx"> counter = 0;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> finishTest = resolve;
</span><span class="cx"> createConnections((localConnection) => {
</span><span class="cx"> localChannel = localConnection.createDataChannel('sendDataChannel');
</span><span class="lines">@@ -103,7 +94,6 @@
</span><span class="cx"> counter = 0;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><span class="cx"> if (window.internals) {
</span><del>- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
</del><span class="cx"> internals.setEnumeratingAllNetworkInterfacesEnabled(true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -123,9 +113,6 @@
</span><span class="cx"> promise_test((test) => {
</span><span class="cx"> counter = 0;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> var checkDataChannelOptions = (channel, init) => {
</span><span class="cx"> assert_equals(channel.ordered, init.ordered, "ordered");
</span><span class="cx"> assert_equals(channel.maxPacketLifeTime, init.maxPacketLifeTime, "maxPacketLifeTime");
</span><span class="lines">@@ -155,15 +142,11 @@
</span><span class="cx"> longString += longString;
</span><span class="cx">
</span><span class="cx"> test(() => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("OneRealPeerConnections");
</del><span class="cx"> var pc = new RTCPeerConnection();
</span><span class="cx"> assert_throws(new TypeError, () => { pc.createDataChannel(longString); });
</span><span class="cx"> }, "Creating data channel with very long label");
</span><span class="cx">
</span><span class="cx"> test(() => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("OneRealPeerConnections");
</del><span class="cx"> var pc = new RTCPeerConnection();
</span><span class="cx"> pc.close();
</span><span class="cx"> assert_throws("InvalidStateError", () => { pc.createDataChannel('sendDataChannel'); });
</span><span class="lines">@@ -172,8 +155,6 @@
</span><span class="cx"> function testWrongDataChannelInit(init, title)
</span><span class="cx"> {
</span><span class="cx"> return test(() => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("OneRealPeerConnections");
</del><span class="cx"> var pc = new RTCPeerConnection();
</span><span class="cx"> assert_throws(new TypeError, () => { pc.createDataChannel('sendDataChannel', init); });
</span><span class="cx"> }, "Wrong data channel init: " + title);
</span><span class="lines">@@ -182,8 +163,6 @@
</span><span class="cx"> function testRightDataChannelInit(init, title)
</span><span class="cx"> {
</span><span class="cx"> return test(() => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("OneRealPeerConnections");
</del><span class="cx"> var pc = new RTCPeerConnection();
</span><span class="cx"> channel = pc.createDataChannel('sendDataChannel', init);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachannelbufferedAmountLowThresholdexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/datachannel/bufferedAmountLowThreshold-expected.txt (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/bufferedAmountLowThreshold-expected.txt 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/datachannel/bufferedAmountLowThreshold-expected.txt 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>-CONSOLE MESSAGE: line 76: channel send is throwing
-CONSOLE MESSAGE: line 76: channel send is throwing
</del><ins>+CONSOLE MESSAGE: line 73: channel send is throwing
+CONSOLE MESSAGE: line 73: channel send is throwing
</ins><span class="cx">
</span><span class="cx"> PASS Default buffer threshold
</span><span class="cx"> PASS Large buffer threshold reached
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachannelbufferedAmountLowThresholdhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/datachannel/bufferedAmountLowThreshold.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/bufferedAmountLowThreshold.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/datachannel/bufferedAmountLowThreshold.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -40,9 +40,6 @@
</span><span class="cx"> counter = 0;
</span><span class="cx"> var gotEvent = false;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> finishTest = resolve;
</span><span class="cx"> createConnections((localConnection) => {
</span><span class="cx"> localChannel = localConnection.createDataChannel('sendDataChannel');
</span><span class="lines">@@ -81,9 +78,6 @@
</span><span class="cx"> counter = 0;
</span><span class="cx"> var gotEvent = false;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> finishTest = resolve;
</span><span class="cx"> createConnections((localConnection) => {
</span><span class="cx"> localChannel = localConnection.createDataChannel('sendDataChannel');
</span><span class="lines">@@ -112,9 +106,6 @@
</span><span class="cx"> counter = 0;
</span><span class="cx"> var gotEvent = false;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> finishTest = resolve;
</span><span class="cx"> createConnections((localConnection) => {
</span><span class="cx"> localChannel = localConnection.createDataChannel('sendDataChannel');
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachanneldatachannelgchtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/datachannel/datachannel-gc.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/datachannel-gc.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/datachannel/datachannel-gc.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -13,9 +13,6 @@
</span><span class="cx"> promise_test((test) => {
</span><span class="cx"> counter = 0;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((localConnection) => {
</span><span class="cx"> localConnection.createDataChannel('sendDataChannel').onclose = resolve;
</span><span class="cx"> }, (remoteConnection) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachanneldatachannelstatshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/datachannel/datachannel-stats.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/datachannel-stats.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/datachannel/datachannel-stats.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -51,9 +51,6 @@
</span><span class="cx"> promise_test((test) => {
</span><span class="cx"> counter = 0;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> var localConnection, remoteConnection;
</span><span class="cx"> finishTest = () => {
</span><span class="cx"> getDataChannelStats(localConnection).then((stats) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachannelfiltericecandidatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -12,7 +12,6 @@
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><span class="cx"> var counter = 0;
</span><span class="cx"> if (window.internals) {
</span><del>- internals.useMockRTCPeerConnectionFactory("OneRealPeerConnection");
</del><span class="cx"> internals.setICECandidateFiltering(false);
</span><span class="cx"> }
</span><span class="cx"> var pc = new RTCPeerConnection();
</span><span class="lines">@@ -36,11 +35,7 @@
</span><span class="cx">
</span><span class="cx"> promise_test(function() {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("OneRealPeerConnection");
</del><span class="cx"> var counter = 0;
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("OneRealPeerConnection");
</del><span class="cx"> var pc = new RTCPeerConnection();
</span><span class="cx"> pc.createDataChannel('sendDataChannel');
</span><span class="cx"> pc.onicecandidate = (event) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcephemeralcertificatesandcnameshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/ephemeral-certificates-and-cnames.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/ephemeral-certificates-and-cnames.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/ephemeral-certificates-and-cnames.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -40,9 +40,6 @@
</span><span class="cx"> var offerCName;
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true, audio: true}).then((stream) => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> firstConnection.addTrack(stream.getVideoTracks()[0], stream);
</span><span class="cx"> }, (secondConnection) => {
</span><span class="lines">@@ -58,9 +55,6 @@
</span><span class="cx"> }).then(() => {
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true, audio: true}).then((stream) => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> firstConnection.addTrack(stream.getVideoTracks()[0], stream);
</span><span class="cx"> }, (secondConnection) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtclibwebrtcdescriptionGettershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/libwebrtc/descriptionGetters.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/libwebrtc/descriptionGetters.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/libwebrtc/descriptionGetters.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -12,9 +12,6 @@
</span><span class="cx"> testRunner.setUserMediaPermission(true);
</span><span class="cx">
</span><span class="cx"> promise_test((test) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> var localConnection = new RTCPeerConnection();
</span><span class="cx"> var remoteConnection = new RTCPeerConnection();
</span><span class="cx"> var currentSDP;
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcnegotiatedneededeventaddStreamhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -18,8 +18,6 @@
</span><span class="cx">
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true}).then((stream) => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("OneRealPeerConnection");
</del><span class="cx"> var pc = new RTCPeerConnection();
</span><span class="cx"> pc.onnegotiationneeded = () => { resolve(); };
</span><span class="cx"> pc.addStream(stream);
</span><span class="lines">@@ -33,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true}).then((stream) => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("OneRealPeerConnection");
</del><span class="cx"> var pc = new RTCPeerConnection();
</span><span class="cx"> pc.onnegotiationneeded = () => { reject(); };
</span><span class="cx"> pc.addStream(stream);
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcnoportzeroinupdcandidateshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/no-port-zero-in-upd-candidates.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/no-port-zero-in-upd-candidates.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/no-port-zero-in-upd-candidates.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -8,10 +8,6 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><del>-
-if (window.internals)
- internals.useMockRTCPeerConnectionFactory("OneRealPeerConnection");
-
</del><span class="cx"> function gatherCandidates(pc)
</span><span class="cx"> {
</span><span class="cx"> var candidates = [];
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcpeerconnectionaudiomutehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/peer-connection-audio-mute.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/peer-connection-audio-mute.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/peer-connection-audio-mute.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -15,9 +15,6 @@
</span><span class="cx">
</span><span class="cx"> var localTrack;
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({audio: true}).then((localStream) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> localTrack = localStream.getAudioTracks()[0];
</span><span class="cx"> var remoteStream;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcpeerconnectionaudiomute2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/peer-connection-audio-mute2.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/peer-connection-audio-mute2.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/peer-connection-audio-mute2.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -15,9 +15,6 @@
</span><span class="cx">
</span><span class="cx"> var localTrack;
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({audio: true}).then((localStream) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> localTrack = localStream.getAudioTracks()[0];
</span><span class="cx"> var remoteStream;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcpeerconnectionremoteaudiomutehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/peer-connection-remote-audio-mute.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/peer-connection-remote-audio-mute.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/peer-connection-remote-audio-mute.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -14,9 +14,6 @@
</span><span class="cx"> testRunner.setUserMediaPermission(true);
</span><span class="cx">
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({audio: true}).then((localStream) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> var remoteTrack;
</span><span class="cx"> var remoteStream;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcpeerconnectionremoteaudiomute2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/peer-connection-remote-audio-mute2.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/peer-connection-remote-audio-mute2.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/peer-connection-remote-audio-mute2.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -14,9 +14,6 @@
</span><span class="cx"> testRunner.setUserMediaPermission(true);
</span><span class="cx">
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({audio: true}).then((localStream) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> var remoteTrack;
</span><span class="cx"> var remoteStream;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcreleaseaftergettingtrackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/release-after-getting-track.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/release-after-getting-track.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/release-after-getting-track.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -15,9 +15,6 @@
</span><span class="cx">
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true, audio: true}).then((stream) => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> firstConnection.addStream(stream);
</span><span class="cx"> }, (secondConnection) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideodisabledblackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-disabled-black.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-disabled-black.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/video-disabled-black.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -11,9 +11,6 @@
</span><span class="cx"> <canvas id="canvas" width="640" height="480"></canvas>
</span><span class="cx"> <script src ="routines.js"></script>
</span><span class="cx"> <script>
</span><del>-if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.setUserMediaPermission(true);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideogetParametershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-getParameters.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-getParameters.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/video-getParameters.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -19,9 +19,6 @@
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true}).then((stream) => {
</span><span class="cx"> localStream = stream;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((connection) => {
</span><span class="cx"> firstConnection = connection;
</span><span class="cx"> sender = firstConnection.addTrack(stream.getVideoTracks()[0], stream);
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideomediastreamtrackstatshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-mediastreamtrack-stats.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-mediastreamtrack-stats.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/video-mediastreamtrack-stats.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -31,9 +31,6 @@
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true}).then((stream) => {
</span><span class="cx"> localStream = stream;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((connection) => {
</span><span class="cx"> firstConnection = connection;
</span><span class="cx"> firstConnection.addTrack(stream.getVideoTracks()[0], stream);
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideomutehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-mute.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-mute.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/video-mute.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -38,9 +38,6 @@
</span><span class="cx">
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true}).then((localStream) => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> track = localStream.getVideoTracks()[0];
</span><span class="cx">
</span><span class="cx"> createConnections((firstConnection) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideoremotemutehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-remote-mute.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-remote-mute.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/video-remote-mute.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -37,9 +37,6 @@
</span><span class="cx">
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true}).then((localStream) => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> firstConnection.addStream(localStream);
</span><span class="cx"> }, (secondConnection) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideoreplacetracktonullhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-replace-track-to-null.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-replace-track-to-null.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/video-replace-track-to-null.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -65,9 +65,6 @@
</span><span class="cx"> frontStream = stream;
</span><span class="cx"> }).then(() => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> sender = firstConnection.addTrack(frontStream.getVideoTracks()[0], frontStream);
</span><span class="cx"> }, (secondConnection) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideoreplacetrackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-replace-track.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-replace-track.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/video-replace-track.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -61,9 +61,6 @@
</span><span class="cx"> backStream = stream;
</span><span class="cx"> }).then(() => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> sender = firstConnection.addTrack(frontStream.getVideoTracks()[0], frontStream);
</span><span class="cx"> }, (secondConnection) => {
</span><span class="lines">@@ -108,9 +105,6 @@
</span><span class="cx"> assert_true(backStream.getVideoTracks()[0].getSettings().height < 400, "backStream should be smaller");
</span><span class="cx"> }).then(() => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> sender = firstConnection.addTrack(frontStream.getVideoTracks()[0], frontStream);
</span><span class="cx"> }, (secondConnection) => {
</span><span class="lines">@@ -151,9 +145,6 @@
</span><span class="cx"> assert_true(backStream.getVideoTracks()[0].getSettings().height >= 400, "back stream should be bigger");
</span><span class="cx"> }).then(() => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> sender = firstConnection.addTrack(frontStream.getVideoTracks()[0], frontStream);
</span><span class="cx"> }, (secondConnection) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideostatshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-stats.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-stats.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/video-stats.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -45,9 +45,6 @@
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true}).then((stream) => {
</span><span class="cx"> localStream = stream;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((connection) => {
</span><span class="cx"> firstConnection = connection;
</span><span class="cx"> firstConnection.addTrack(stream.getVideoTracks()[0], stream);
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideowithreceiverhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-with-receiver.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-with-receiver.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/video-with-receiver.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -45,9 +45,6 @@
</span><span class="cx">
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true}).then((stream) => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> firstConnection.addStream(stream);
</span><span class="cx"> }, (secondConnection) => {
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideohtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video.html (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video.html 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/LayoutTests/webrtc/video.html 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -45,9 +45,6 @@
</span><span class="cx">
</span><span class="cx"> return navigator.mediaDevices.getUserMedia({ video: true}).then((stream) => {
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><del>- if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> createConnections((firstConnection) => {
</span><span class="cx"> firstConnection.addStream(stream);
</span><span class="cx"> }, (secondConnection) => {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/ChangeLog 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2017-04-11 Youenn Fablet <youenn@apple.com>
+
+ MediaStream id should be equal to msid
+ https://bugs.webkit.org/show_bug.cgi?id=170712
+
+ Reviewed by Eric Carlson.
+
+ Covered by rebased tests.
+
+ Setting MediaStream id to libwebrtc mediastream label.
+ Refactoring to use more Ref<> in MediaStream code.
+
+ Making PeerConnection use the libwebrtc backend by default for layout tests instead of the mock.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::create):
+ (WebCore::createTrackPrivateVector):
+ (WebCore::MediaStream::MediaStream):
+ * Modules/mediastream/MediaStream.h:
+ * Modules/mediastream/MediaStreamRegistry.cpp:
+ (WebCore::MediaStreamRegistry::lookUp):
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::allow):
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+ (WebCore::LibWebRTCMediaEndpoint::mediaStreamFromRTCStream):
+ (WebCore::LibWebRTCMediaEndpoint::addRemoteStream):
+ (WebCore::LibWebRTCMediaEndpoint::addRemoteTrack):
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::load):
+ * platform/graphics/MediaPlayer.h:
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::MediaStreamPrivate):
+ * platform/mediastream/MediaStreamPrivate.h:
+ (WebCore::MediaStreamPrivate::create):
+ * testing/Internals.cpp:
+ (WebCore::Internals::Internals):
+
</ins><span class="cx"> 2017-04-11 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Web article navigation does not work (article rotor for Facebook, Twitter, Messages etc.)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -57,27 +57,33 @@
</span><span class="cx"> return adoptRef(*new MediaStream(context, tracks));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<MediaStream> MediaStream::create(ScriptExecutionContext& context, RefPtr<MediaStreamPrivate>&& streamPrivate)
</del><ins>+Ref<MediaStream> MediaStream::create(ScriptExecutionContext& context, Ref<MediaStreamPrivate>&& streamPrivate)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new MediaStream(context, WTFMove(streamPrivate)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline MediaStreamTrackPrivateVector createTrackPrivateVector(const MediaStreamTrackVector& tracks)
+{
+ MediaStreamTrackPrivateVector trackPrivates;
+ trackPrivates.reserveCapacity(tracks.size());
+ for (auto& track : tracks)
+ trackPrivates.append(&track->privateTrack());
+ return trackPrivates;
+}
+
</ins><span class="cx"> MediaStream::MediaStream(ScriptExecutionContext& context, const MediaStreamTrackVector& tracks)
</span><span class="cx"> : ContextDestructionObserver(&context)
</span><ins>+ , m_private(MediaStreamPrivate::create(createTrackPrivateVector(tracks)))
</ins><span class="cx"> , m_activityEventTimer(*this, &MediaStream::activityEventTimerFired)
</span><span class="cx"> {
</span><span class="cx"> // This constructor preserves MediaStreamTrack instances and must be used by calls originating
</span><span class="cx"> // from the JavaScript MediaStream constructor.
</span><del>- MediaStreamTrackPrivateVector trackPrivates;
- trackPrivates.reserveCapacity(tracks.size());
</del><span class="cx">
</span><span class="cx"> for (auto& track : tracks) {
</span><span class="cx"> track->addObserver(*this);
</span><span class="cx"> m_trackSet.add(track->id(), track);
</span><del>- trackPrivates.append(&track->privateTrack());
</del><span class="cx"> }
</span><span class="cx">
</span><del>- m_private = MediaStreamPrivate::create(trackPrivates);
</del><span class="cx"> setIsActive(m_private->active());
</span><span class="cx"> m_private->addObserver(*this);
</span><span class="cx"> MediaStreamRegistry::shared().registerStream(*this);
</span><span class="lines">@@ -84,13 +90,11 @@
</span><span class="cx"> document()->addAudioProducer(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStream::MediaStream(ScriptExecutionContext& context, RefPtr<MediaStreamPrivate>&& streamPrivate)
</del><ins>+MediaStream::MediaStream(ScriptExecutionContext& context, Ref<MediaStreamPrivate>&& streamPrivate)
</ins><span class="cx"> : ContextDestructionObserver(&context)
</span><del>- , m_private(streamPrivate)
</del><ins>+ , m_private(WTFMove(streamPrivate))
</ins><span class="cx"> , m_activityEventTimer(*this, &MediaStream::activityEventTimerFired)
</span><span class="cx"> {
</span><del>- ASSERT(m_private);
-
</del><span class="cx"> setIsActive(m_private->active());
</span><span class="cx"> if (document()->page() && document()->page()->isMediaCaptureMuted())
</span><span class="cx"> m_private->setCaptureTracksMuted(true);
</span><span class="lines">@@ -124,10 +128,10 @@
</span><span class="cx"> RefPtr<MediaStream> MediaStream::clone()
</span><span class="cx"> {
</span><span class="cx"> MediaStreamTrackVector clonedTracks;
</span><del>- clonedTracks.reserveCapacity(m_trackSet.size());
</del><ins>+ clonedTracks.reserveInitialCapacity(m_trackSet.size());
</ins><span class="cx">
</span><span class="cx"> for (auto& track : m_trackSet.values())
</span><del>- clonedTracks.append(track->clone());
</del><ins>+ clonedTracks.uncheckedAppend(track->clone());
</ins><span class="cx">
</span><span class="cx"> return MediaStream::create(*scriptExecutionContext(), clonedTracks);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> static Ref<MediaStream> create(ScriptExecutionContext&);
</span><span class="cx"> static Ref<MediaStream> create(ScriptExecutionContext&, MediaStream&);
</span><span class="cx"> static Ref<MediaStream> create(ScriptExecutionContext&, const MediaStreamTrackVector&);
</span><del>- static Ref<MediaStream> create(ScriptExecutionContext&, RefPtr<MediaStreamPrivate>&&);
</del><ins>+ static Ref<MediaStream> create(ScriptExecutionContext&, Ref<MediaStreamPrivate>&&);
</ins><span class="cx"> virtual ~MediaStream();
</span><span class="cx">
</span><span class="cx"> String id() const { return m_private->id(); }
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> bool active() const { return m_isActive; }
</span><span class="cx"> bool muted() const { return m_isMuted; }
</span><span class="cx">
</span><del>- MediaStreamPrivate* privateStream() const { return m_private.get(); }
</del><ins>+ MediaStreamPrivate& privateStream() { return m_private.get(); }
</ins><span class="cx">
</span><span class="cx"> void startProducingData();
</span><span class="cx"> void stopProducingData();
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> MediaStream(ScriptExecutionContext&, const MediaStreamTrackVector&);
</span><del>- MediaStream(ScriptExecutionContext&, RefPtr<MediaStreamPrivate>&&);
</del><ins>+ MediaStream(ScriptExecutionContext&, Ref<MediaStreamPrivate>&&);
</ins><span class="cx">
</span><span class="cx"> // ContextDestructionObserver
</span><span class="cx"> void contextDestroyed() final;
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> MediaStreamTrackVector trackVectorForType(RealtimeMediaSource::Type) const;
</span><span class="cx">
</span><del>- RefPtr<MediaStreamPrivate> m_private;
</del><ins>+ Ref<MediaStreamPrivate> m_private;
</ins><span class="cx">
</span><span class="cx"> HashMap<String, RefPtr<MediaStreamTrack>> m_trackSet;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<MediaStream*>& allStreams = mediaStreams();
</span><span class="cx"> for (auto& stream : allStreams) {
</span><del>- if (stream->privateStream() == &privateStream)
</del><ins>+ if (&stream->privateStream() == &privateStream)
</ins><span class="cx"> return stream;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto stream = MediaStream::create(*m_scriptExecutionContext, WTFMove(privateStream));
</del><ins>+ auto stream = MediaStream::create(*m_scriptExecutionContext, privateStream.releaseNonNull());
</ins><span class="cx"> if (stream->getTracks().isEmpty()) {
</span><span class="cx"> deny(MediaAccessDenialReason::HardwareError, emptyString());
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -450,10 +450,11 @@
</span><span class="cx"> return String(videoTrack.id().data(), videoTrack.id().size());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStream& LibWebRTCMediaEndpoint::mediaStreamFromRTCStream(webrtc::MediaStreamInterface* rtcStream)
</del><ins>+MediaStream& LibWebRTCMediaEndpoint::mediaStreamFromRTCStream(webrtc::MediaStreamInterface& rtcStream)
</ins><span class="cx"> {
</span><del>- auto mediaStream = m_streams.ensure(rtcStream, [this] {
- auto stream = MediaStream::create(*m_peerConnectionBackend.connection().scriptExecutionContext());
</del><ins>+ auto mediaStream = m_streams.ensure(&rtcStream, [&rtcStream, this] {
+ auto label = rtcStream.label();
+ auto stream = MediaStream::create(*m_peerConnectionBackend.connection().scriptExecutionContext(), MediaStreamPrivate::create({ }, String(label.data(), label.size())));
</ins><span class="cx"> auto streamPointer = stream.ptr();
</span><span class="cx"> m_peerConnectionBackend.addRemoteStream(WTFMove(stream));
</span><span class="cx"> return streamPointer;
</span><span class="lines">@@ -466,7 +467,7 @@
</span><span class="cx"> if (!RuntimeEnabledFeatures::sharedFeatures().webRTCLegacyAPIEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto& mediaStream = mediaStreamFromRTCStream(&rtcStream);
</del><ins>+ auto& mediaStream = mediaStreamFromRTCStream(rtcStream);
</ins><span class="cx"> m_peerConnectionBackend.connection().fireEvent(MediaStreamEvent::create(eventNames().addstreamEvent, false, false, &mediaStream));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -516,7 +517,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<MediaStream>> streams;
</span><span class="cx"> for (auto& rtcStream : rtcStreams) {
</span><del>- auto& mediaStream = mediaStreamFromRTCStream(rtcStream.get());
</del><ins>+ auto& mediaStream = mediaStreamFromRTCStream(*rtcStream.get());
</ins><span class="cx"> streams.append(&mediaStream);
</span><span class="cx"> mediaStream.addTrackFromPlatform(*track);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> void removeRemoteStream(webrtc::MediaStreamInterface&);
</span><span class="cx"> void addDataChannel(rtc::scoped_refptr<webrtc::DataChannelInterface>&&);
</span><span class="cx">
</span><del>- MediaStream& mediaStreamFromRTCStream(webrtc::MediaStreamInterface*);
</del><ins>+ MediaStream& mediaStreamFromRTCStream(webrtc::MediaStreamInterface&);
</ins><span class="cx">
</span><span class="cx"> int AddRef() const { ref(); return static_cast<int>(refCount()); }
</span><span class="cx"> int Release() const { deref(); return static_cast<int>(refCount()); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -428,12 +428,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>-bool MediaPlayer::load(MediaStreamPrivate* mediaStream)
</del><ins>+bool MediaPlayer::load(MediaStreamPrivate& mediaStream)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_reloadTimer.isActive());
</span><del>- ASSERT(mediaStream);
</del><span class="cx">
</span><del>- m_mediaStream = mediaStream;
</del><ins>+ m_mediaStream = &mediaStream;
</ins><span class="cx"> m_keySystem = emptyString();
</span><span class="cx"> m_contentMIMEType = emptyString();
</span><span class="cx"> m_contentMIMETypeWasInferredFromExtension = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> bool load(const URL&, const ContentType&, MediaSourcePrivateClient*);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>- bool load(MediaStreamPrivate*);
</del><ins>+ bool load(MediaStreamPrivate&);
</ins><span class="cx"> #endif
</span><span class="cx"> void cancelLoad();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx">
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "IntRect.h"
</span><del>-#include "UUID.h"
</del><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -59,14 +58,9 @@
</span><span class="cx"> return MediaStreamPrivate::create(tracks);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<MediaStreamPrivate> MediaStreamPrivate::create(const MediaStreamTrackPrivateVector& tracks)
-{
- return adoptRef(*new MediaStreamPrivate(createCanonicalUUIDString(), tracks));
-}
-
-MediaStreamPrivate::MediaStreamPrivate(const String& id, const MediaStreamTrackPrivateVector& tracks)
</del><ins>+MediaStreamPrivate::MediaStreamPrivate(const MediaStreamTrackPrivateVector& tracks, String&& id)
</ins><span class="cx"> : m_weakPtrFactory(this)
</span><del>- , m_id(id)
</del><ins>+ , m_id(WTFMove(id))
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_id.isEmpty());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include "FloatSize.h"
</span><span class="cx"> #include "MediaStreamTrack.h"
</span><span class="cx"> #include "MediaStreamTrackPrivate.h"
</span><ins>+#include "UUID.h"
</ins><span class="cx"> #include <wtf/Function.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/MediaTime.h>
</span><span class="lines">@@ -69,7 +70,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static Ref<MediaStreamPrivate> create(const Vector<Ref<RealtimeMediaSource>>& audioSources, const Vector<Ref<RealtimeMediaSource>>& videoSources);
</span><del>- static Ref<MediaStreamPrivate> create(const MediaStreamTrackPrivateVector&);
</del><ins>+ static Ref<MediaStreamPrivate> create(const MediaStreamTrackPrivateVector& tracks, String&& id = createCanonicalUUIDString()) { return adoptRef(*new MediaStreamPrivate(tracks, WTFMove(id))); }
</ins><span class="cx">
</span><span class="cx"> virtual ~MediaStreamPrivate();
</span><span class="cx">
</span><span class="lines">@@ -116,7 +117,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- MediaStreamPrivate(const String&, const MediaStreamTrackPrivateVector&);
</del><ins>+ MediaStreamPrivate(const MediaStreamTrackPrivateVector&, String&&);
</ins><span class="cx">
</span><span class="cx"> // MediaStreamTrackPrivate::Observer
</span><span class="cx"> void trackEnded(MediaStreamTrackPrivate&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (215237 => 215238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2017-04-11 17:03:59 UTC (rev 215237)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-04-11 17:06:53 UTC (rev 215238)
</span><span class="lines">@@ -468,8 +468,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> enableMockMediaEndpoint();
</span><del>- useMockRTCPeerConnectionFactory(String());
</del><ins>+#endif
</ins><span class="cx"> #if USE(LIBWEBRTC)
</span><span class="cx"> if (document.page())
</span><span class="cx"> document.page()->rtcController().disableICECandidateFiltering();
</span></span></pre>
</div>
</div>
</body>
</html>