<!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>[212269] trunk/Source</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/212269">212269</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-13 18:09:03 -0800 (Mon, 13 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] Creating RTCPeerConnection with libwebrtc backend is crashing on rwt
https://bugs.webkit.org/show_bug.cgi?id=168250
Patch by Youenn Fablet <youennf@gmail.com> on 2017-02-13
Reviewed by Alex Christensen.
Source/WebCore:
Covered by webrtc tests in LayoutTests and in web-platform-tests.
Making mock peer connection factory keep a ref of the real libwebrtc peer connection factory.
That way, it can create real libwebrtc backends whenever requested by tests.
Moving LibWebRTCUtils.h routines as static LibWebRTCProvider methods.
In the future, we should make them no longer static.
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
(WebCore::LibWebRTCMediaEndpoint::doCreateOffer):
(WebCore::LibWebRTCMediaEndpoint::doCreateAnswer):
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
* WebCore.xcodeproj/project.pbxproj:
* platform/mediastream/libwebrtc/LibWebRTCProvider.cpp: Renamed from Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCUtils.cpp.
(WebCore::LibWebRTCProvider::callOnWebRTCNetworkThread):
(WebCore::LibWebRTCProvider::callOnWebRTCSignalingThread):
(WebCore::LibWebRTCProvider::factory):
(WebCore::LibWebRTCProvider::setPeerConnectionFactory):
(WebCore::createActualPeerConnection):
(WebCore::LibWebRTCProvider::createPeerConnection):
* platform/mediastream/libwebrtc/LibWebRTCProvider.h:
* platform/mediastream/libwebrtc/LibWebRTCUtils.h: Removed.
* platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp:
(WebCore::RealtimeOutgoingAudioSource::audioSamplesAvailable):
* testing/Internals.cpp:
* testing/MockLibWebRTCPeerConnection.cpp:
(WebCore::useMockRTCPeerConnectionFactory):
(WebCore::MockLibWebRTCPeerConnectionForIceCandidates::gotLocalDescription):
(WebCore::releaseInNetworkThread):
(WebCore::MockLibWebRTCPeerConnection::SetLocalDescription):
(WebCore::MockLibWebRTCPeerConnection::SetRemoteDescription):
(WebCore::MockLibWebRTCPeerConnection::CreateOffer):
(WebCore::MockLibWebRTCPeerConnection::CreateAnswer):
Source/WebKit2:
* WebProcess/Network/webrtc/LibWebRTCProvider.cpp:
(WebKit::LibWebRTCProvider::createPeerConnection):
* WebProcess/Network/webrtc/LibWebRTCProvider.h:
* WebProcess/Network/webrtc/LibWebRTCSocket.h:
* WebProcess/Network/webrtc/WebRTCMonitor.cpp:
(WebKit::WebRTCMonitor::StartUpdating):
(WebKit::WebRTCMonitor::networksChanged):
* WebProcess/Network/webrtc/WebRTCMonitor.h:
* WebProcess/Network/webrtc/WebRTCResolver.cpp:
(WebKit::WebRTCResolver::setResolvedAddress):
(WebKit::WebRTCResolver::resolvedAddressError):
* WebProcess/Network/webrtc/WebRTCSocket.cpp:
(WebKit::WebRTCSocket::signalOnNetworkThread):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCProviderh">trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourcecpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingMockLibWebRTCPeerConnectioncpp">trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingMockLibWebRTCPeerConnectionh">trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCProvidercpp">trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCSocketh">trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCMonitorcpp">trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCMonitor.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCMonitorh">trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCMonitor.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCResolvercpp">trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCResolver.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCSocketcpp">trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCProvidercpp">trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCUtilscpp">trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCUtils.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCUtilsh">trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCUtils.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebCore/ChangeLog 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2017-02-13 Youenn Fablet <youennf@gmail.com>
+
+ [WebRTC] Creating RTCPeerConnection with libwebrtc backend is crashing on rwt
+ https://bugs.webkit.org/show_bug.cgi?id=168250
+
+ Reviewed by Alex Christensen.
+
+ Covered by webrtc tests in LayoutTests and in web-platform-tests.
+ Making mock peer connection factory keep a ref of the real libwebrtc peer connection factory.
+ That way, it can create real libwebrtc backends whenever requested by tests.
+
+ Moving LibWebRTCUtils.h routines as static LibWebRTCProvider methods.
+ In the future, we should make them no longer static.
+
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+ (WebCore::LibWebRTCMediaEndpoint::doCreateOffer):
+ (WebCore::LibWebRTCMediaEndpoint::doCreateAnswer):
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/mediastream/libwebrtc/LibWebRTCProvider.cpp: Renamed from Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCUtils.cpp.
+ (WebCore::LibWebRTCProvider::callOnWebRTCNetworkThread):
+ (WebCore::LibWebRTCProvider::callOnWebRTCSignalingThread):
+ (WebCore::LibWebRTCProvider::factory):
+ (WebCore::LibWebRTCProvider::setPeerConnectionFactory):
+ (WebCore::createActualPeerConnection):
+ (WebCore::LibWebRTCProvider::createPeerConnection):
+ * platform/mediastream/libwebrtc/LibWebRTCProvider.h:
+ * platform/mediastream/libwebrtc/LibWebRTCUtils.h: Removed.
+ * platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp:
+ (WebCore::RealtimeOutgoingAudioSource::audioSamplesAvailable):
+ * testing/Internals.cpp:
+ * testing/MockLibWebRTCPeerConnection.cpp:
+ (WebCore::useMockRTCPeerConnectionFactory):
+ (WebCore::MockLibWebRTCPeerConnectionForIceCandidates::gotLocalDescription):
+ (WebCore::releaseInNetworkThread):
+ (WebCore::MockLibWebRTCPeerConnection::SetLocalDescription):
+ (WebCore::MockLibWebRTCPeerConnection::SetRemoteDescription):
+ (WebCore::MockLibWebRTCPeerConnection::CreateOffer):
+ (WebCore::MockLibWebRTCPeerConnection::CreateAnswer):
+
</ins><span class="cx"> 2017-02-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify DragController::startDrag
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "LibWebRTCDataChannelHandler.h"
</span><span class="cx"> #include "LibWebRTCPeerConnectionBackend.h"
</span><span class="cx"> #include "LibWebRTCProvider.h"
</span><del>-#include "LibWebRTCUtils.h"
</del><span class="cx"> #include "MediaStreamEvent.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "PlatformStrategies.h"
</span><span class="lines">@@ -123,7 +122,7 @@
</span><span class="cx"> auto& senders = m_peerConnectionBackend.connection().getSenders();
</span><span class="cx"> if (senders.size()) {
</span><span class="cx"> // FIXME: We only support one stream for the moment.
</span><del>- auto stream = peerConnectionFactory().CreateLocalMediaStream(streamId(m_peerConnectionBackend.connection()));
</del><ins>+ auto stream = LibWebRTCProvider::factory().CreateLocalMediaStream(streamId(m_peerConnectionBackend.connection()));
</ins><span class="cx"> for (RTCRtpSender& sender : senders) {
</span><span class="cx"> auto* track = sender.track();
</span><span class="cx"> if (track) {
</span><span class="lines">@@ -131,13 +130,13 @@
</span><span class="cx"> auto& source = track->source();
</span><span class="cx"> if (source.type() == RealtimeMediaSource::Audio) {
</span><span class="cx"> auto trackSource = RealtimeOutgoingAudioSource::create(source);
</span><del>- auto rtcTrack = peerConnectionFactory().CreateAudioTrack(track->id().utf8().data(), trackSource.ptr());
</del><ins>+ auto rtcTrack = LibWebRTCProvider::factory().CreateAudioTrack(track->id().utf8().data(), trackSource.ptr());
</ins><span class="cx"> trackSource->setTrack(rtc::scoped_refptr<webrtc::AudioTrackInterface>(rtcTrack));
</span><span class="cx"> m_peerConnectionBackend.addAudioSource(WTFMove(trackSource));
</span><span class="cx"> stream->AddTrack(WTFMove(rtcTrack));
</span><span class="cx"> } else {
</span><span class="cx"> auto videoSource = RealtimeOutgoingVideoSource::create(source);
</span><del>- auto videoTrack = peerConnectionFactory().CreateVideoTrack(track->id().utf8().data(), videoSource.ptr());
</del><ins>+ auto videoTrack = LibWebRTCProvider::factory().CreateVideoTrack(track->id().utf8().data(), videoSource.ptr());
</ins><span class="cx"> m_peerConnectionBackend.addVideoSource(WTFMove(videoSource));
</span><span class="cx"> stream->AddTrack(WTFMove(videoTrack));
</span><span class="cx"> }
</span><span class="lines">@@ -155,7 +154,7 @@
</span><span class="cx"> auto& senders = m_peerConnectionBackend.connection().getSenders();
</span><span class="cx"> if (senders.size()) {
</span><span class="cx"> // FIXME: We only support one stream for the moment.
</span><del>- auto stream = peerConnectionFactory().CreateLocalMediaStream(streamId(m_peerConnectionBackend.connection()));
</del><ins>+ auto stream = LibWebRTCProvider::factory().CreateLocalMediaStream(streamId(m_peerConnectionBackend.connection()));
</ins><span class="cx"> for (RTCRtpSender& sender : senders) {
</span><span class="cx"> auto* track = sender.track();
</span><span class="cx"> if (track) {
</span><span class="lines">@@ -163,13 +162,13 @@
</span><span class="cx"> auto& source = track->source();
</span><span class="cx"> if (source.type() == RealtimeMediaSource::Audio) {
</span><span class="cx"> auto trackSource = RealtimeOutgoingAudioSource::create(source);
</span><del>- auto rtcTrack = peerConnectionFactory().CreateAudioTrack(track->id().utf8().data(), trackSource.ptr());
</del><ins>+ auto rtcTrack = LibWebRTCProvider::factory().CreateAudioTrack(track->id().utf8().data(), trackSource.ptr());
</ins><span class="cx"> trackSource->setTrack(rtc::scoped_refptr<webrtc::AudioTrackInterface>(rtcTrack));
</span><span class="cx"> m_peerConnectionBackend.addAudioSource(WTFMove(trackSource));
</span><span class="cx"> stream->AddTrack(WTFMove(rtcTrack));
</span><span class="cx"> } else {
</span><span class="cx"> auto videoSource = RealtimeOutgoingVideoSource::create(source);
</span><del>- auto videoTrack = peerConnectionFactory().CreateVideoTrack(track->id().utf8().data(), videoSource.ptr());
</del><ins>+ auto videoTrack = LibWebRTCProvider::factory().CreateVideoTrack(track->id().utf8().data(), videoSource.ptr());
</ins><span class="cx"> m_peerConnectionBackend.addVideoSource(WTFMove(videoSource));
</span><span class="cx"> stream->AddTrack(WTFMove(videoTrack));
</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 (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(LIBWEBRTC)
</span><span class="cx">
</span><del>-#include "LibWebRTCUtils.h"
</del><ins>+#include "LibWebRTCProvider.h"
</ins><span class="cx"> #include "PeerConnectionBackend.h"
</span><span class="cx"> #include "RealtimeOutgoingAudioSource.h"
</span><span class="cx"> #include "RealtimeOutgoingVideoSource.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -1551,8 +1551,6 @@
</span><span class="cx"> 415670471DBE1533009AC3BB /* PeerConnectionStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 415670461DBE1524009AC3BB /* PeerConnectionStates.h */; };
</span><span class="cx"> 415747471E3869A400E914D8 /* LibWebRTCMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 415747431E38699E00E914D8 /* LibWebRTCMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 415747481E3869A700E914D8 /* LibWebRTCProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 415747441E38699E00E914D8 /* LibWebRTCProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 415747491E3869AA00E914D8 /* LibWebRTCUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 415747451E38699E00E914D8 /* LibWebRTCUtils.cpp */; };
- 4157474A1E3869AD00E914D8 /* LibWebRTCUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 415747461E38699E00E914D8 /* LibWebRTCUtils.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 4157AF8012F1FB0400A8C6F5 /* MediaControlsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */; };
</span><span class="cx"> 4157AF8112F1FB0400A8C6F5 /* MediaControlsApple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4157AF7F12F1FB0400A8C6F5 /* MediaControlsApple.cpp */; };
</span><span class="cx"> 4157EBFA1E3AB67900AC9FE9 /* MockLibWebRTCPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4157EBF91E3AB06800AC9FE9 /* MockLibWebRTCPeerConnection.cpp */; };
</span><span class="lines">@@ -1597,6 +1595,7 @@
</span><span class="cx"> 419BC2DE1685329900D64D6D /* VisitedLinkState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419BC2DC1685329900D64D6D /* VisitedLinkState.cpp */; };
</span><span class="cx"> 419BC2DF1685329900D64D6D /* VisitedLinkState.h in Headers */ = {isa = PBXBuildFile; fileRef = 419BC2DD1685329900D64D6D /* VisitedLinkState.h */; };
</span><span class="cx"> 419BE7591BC7F42B00E1C85B /* WebCoreBuiltinNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 419BE7521BC7F3DB00E1C85B /* WebCoreBuiltinNames.h */; };
</span><ins>+ 41A1B00E1E526579007F3769 /* LibWebRTCProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A1B00D1E52656E007F3769 /* LibWebRTCProvider.cpp */; };
</ins><span class="cx"> 41A3D58E101C152D00316D07 /* DedicatedWorkerThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A3D58C101C152D00316D07 /* DedicatedWorkerThread.cpp */; };
</span><span class="cx"> 41A3D58F101C152D00316D07 /* DedicatedWorkerThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 41A3D58D101C152D00316D07 /* DedicatedWorkerThread.h */; };
</span><span class="cx"> 41ABE67B1D0580DB006D862D /* CrossOriginPreflightChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 41ABE67A1D0580D5006D862D /* CrossOriginPreflightChecker.h */; };
</span><span class="lines">@@ -8806,8 +8805,6 @@
</span><span class="cx"> 415670461DBE1524009AC3BB /* PeerConnectionStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeerConnectionStates.h; sourceTree = "<group>"; };
</span><span class="cx"> 415747431E38699E00E914D8 /* LibWebRTCMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibWebRTCMacros.h; path = libwebrtc/LibWebRTCMacros.h; sourceTree = "<group>"; };
</span><span class="cx"> 415747441E38699E00E914D8 /* LibWebRTCProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibWebRTCProvider.h; path = libwebrtc/LibWebRTCProvider.h; sourceTree = "<group>"; };
</span><del>- 415747451E38699E00E914D8 /* LibWebRTCUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LibWebRTCUtils.cpp; path = libwebrtc/LibWebRTCUtils.cpp; sourceTree = "<group>"; };
- 415747461E38699E00E914D8 /* LibWebRTCUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibWebRTCUtils.h; path = libwebrtc/LibWebRTCUtils.h; sourceTree = "<group>"; };
</del><span class="cx"> 4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlsApple.h; sourceTree = "<group>"; };
</span><span class="cx"> 4157AF7F12F1FB0400A8C6F5 /* MediaControlsApple.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControlsApple.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4157EBF81E3AB06800AC9FE9 /* MockLibWebRTCPeerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockLibWebRTCPeerConnection.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -8859,6 +8856,7 @@
</span><span class="cx"> 419FAFAD1ABABCD5005B828B /* ReadableStreamDefaultReader.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadableStreamDefaultReader.idl; sourceTree = "<group>"; };
</span><span class="cx"> 41A023ED1A39DB7900F722CF /* ReadableStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadableStream.idl; sourceTree = "<group>"; };
</span><span class="cx"> 41A023ED1A39DB7900F722DF /* WritableStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WritableStream.idl; sourceTree = "<group>"; };
</span><ins>+ 41A1B00D1E52656E007F3769 /* LibWebRTCProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LibWebRTCProvider.cpp; path = libwebrtc/LibWebRTCProvider.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 41A3D58C101C152D00316D07 /* DedicatedWorkerThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DedicatedWorkerThread.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 41A3D58D101C152D00316D07 /* DedicatedWorkerThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DedicatedWorkerThread.h; sourceTree = "<group>"; };
</span><span class="cx"> 41ABE6791D0580D5006D862D /* CrossOriginPreflightChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CrossOriginPreflightChecker.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16844,8 +16842,7 @@
</span><span class="cx"> 415080351E3F00AA0051D75D /* LibWebRTCAudioModule.h */,
</span><span class="cx"> 415747431E38699E00E914D8 /* LibWebRTCMacros.h */,
</span><span class="cx"> 415747441E38699E00E914D8 /* LibWebRTCProvider.h */,
</span><del>- 415747451E38699E00E914D8 /* LibWebRTCUtils.cpp */,
- 415747461E38699E00E914D8 /* LibWebRTCUtils.h */,
</del><ins>+ 41A1B00D1E52656E007F3769 /* LibWebRTCProvider.cpp */,
</ins><span class="cx"> );
</span><span class="cx"> name = libwebrtc;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -27174,7 +27171,6 @@
</span><span class="cx"> 417612B01E3A994000C3D81D /* LibWebRTCMediaEndpoint.h in Headers */,
</span><span class="cx"> 417612B21E3A994000C3D81D /* LibWebRTCPeerConnectionBackend.h in Headers */,
</span><span class="cx"> 415747481E3869A700E914D8 /* LibWebRTCProvider.h in Headers */,
</span><del>- 4157474A1E3869AD00E914D8 /* LibWebRTCUtils.h in Headers */,
</del><span class="cx"> 84730D911248F0B300D3A9C9 /* LightSource.h in Headers */,
</span><span class="cx"> B22279650D00BF220071B782 /* LinearGradientAttributes.h in Headers */,
</span><span class="cx"> AB31C91E10AE1B8E000C7B92 /* LineClampValue.h in Headers */,
</span><span class="lines">@@ -31046,7 +31042,6 @@
</span><span class="cx"> 5CDD83641E4325A000621E92 /* LibWebRTCDataChannelHandler.cpp in Sources */,
</span><span class="cx"> 417612AF1E3A994000C3D81D /* LibWebRTCMediaEndpoint.cpp in Sources */,
</span><span class="cx"> 417612B11E3A994000C3D81D /* LibWebRTCPeerConnectionBackend.cpp in Sources */,
</span><del>- 415747491E3869AA00E914D8 /* LibWebRTCUtils.cpp in Sources */,
</del><span class="cx"> FFB698CC1833EE0D00158A31 /* LineBreaker.cpp in Sources */,
</span><span class="cx"> 89B5EAA111E8003D00F2367E /* LineEnding.cpp in Sources */,
</span><span class="cx"> FFB698CF183402BB00158A31 /* LineInfo.cpp in Sources */,
</span><span class="lines">@@ -32209,6 +32204,7 @@
</span><span class="cx"> 0F7DF1481E2BF1B10095951B /* WebCoreJSClientData.cpp in Sources */,
</span><span class="cx"> 3140379C124BEA7F00AF40E4 /* WebCoreMotionManager.mm in Sources */,
</span><span class="cx"> CDC979F41C498C0900DB50D4 /* WebCoreNSErrorExtras.mm in Sources */,
</span><ins>+ 41A1B00E1E526579007F3769 /* LibWebRTCProvider.cpp in Sources */,
</ins><span class="cx"> 934D9BA50B8C116B007B42A9 /* WebCoreNSStringExtras.mm in Sources */,
</span><span class="cx"> C5B4C24E1509236C00A6EF37 /* WebCoreNSURLExtras.mm in Sources */,
</span><span class="cx"> CD225C0B1C46FBF400140761 /* WebCoreNSURLSession.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCProvidercppfromrev212268trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCUtilscpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp (from rev 212268, trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCUtils.cpp) (0 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -0,0 +1,160 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "LibWebRTCProvider.h"
+
+#if USE(LIBWEBRTC)
+
+#include "LibWebRTCAudioModule.h"
+#include <webrtc/api/peerconnectionfactory.h>
+#include <webrtc/api/peerconnectionfactoryproxy.h>
+#include <webrtc/base/physicalsocketserver.h>
+#include <webrtc/p2p/client/basicportallocator.h>
+#include <webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.h>
+#include <wtf/Function.h>
+#include <wtf/NeverDestroyed.h>
+
+namespace WebCore {
+
+struct PeerConnectionFactoryAndThreads : public rtc::MessageHandler {
+ std::unique_ptr<LibWebRTCAudioModule> audioDeviceModule;
+ std::unique_ptr<rtc::Thread> networkThread;
+ std::unique_ptr<rtc::Thread> signalingThread;
+ rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory;
+ bool networkThreadWithSocketServer { false };
+private:
+ void OnMessage(rtc::Message*);
+};
+
+static inline PeerConnectionFactoryAndThreads& staticFactoryAndThreads()
+{
+ static NeverDestroyed<PeerConnectionFactoryAndThreads> factoryAndThreads;
+ return factoryAndThreads.get();
+}
+
+struct ThreadMessageData : public rtc::MessageData {
+ ThreadMessageData(Function<void()>&& callback)
+ : callback(WTFMove(callback))
+ { }
+ Function<void()> callback;
+};
+
+void PeerConnectionFactoryAndThreads::OnMessage(rtc::Message* message)
+{
+ ASSERT(message->message_id == 1);
+ static_cast<ThreadMessageData*>(message->pdata)->callback();
+}
+
+void LibWebRTCProvider::callOnWebRTCNetworkThread(Function<void()>&& callback)
+{
+ PeerConnectionFactoryAndThreads& threads = staticFactoryAndThreads();
+ threads.networkThread->Post(RTC_FROM_HERE, &threads, 1, new ThreadMessageData(WTFMove(callback)));
+}
+
+void LibWebRTCProvider::callOnWebRTCSignalingThread(Function<void()>&& callback)
+{
+ PeerConnectionFactoryAndThreads& threads = staticFactoryAndThreads();
+ threads.signalingThread->Post(RTC_FROM_HERE, &threads, 1, new ThreadMessageData(WTFMove(callback)));
+}
+
+static void initializePeerConnectionFactoryAndThreads()
+{
+ auto& factoryAndThreads = staticFactoryAndThreads();
+
+ ASSERT(!factoryAndThreads.factory);
+
+ auto thread = rtc::Thread::Create();
+ factoryAndThreads.networkThread = factoryAndThreads.networkThreadWithSocketServer ? rtc::Thread::CreateWithSocketServer() : rtc::Thread::Create();
+ bool result = factoryAndThreads.networkThread->Start();
+ ASSERT_UNUSED(result, result);
+
+ factoryAndThreads.signalingThread = rtc::Thread::Create();
+ result = factoryAndThreads.signalingThread->Start();
+ ASSERT(result);
+
+ factoryAndThreads.audioDeviceModule = std::make_unique<LibWebRTCAudioModule>();
+
+ factoryAndThreads.factory = webrtc::CreatePeerConnectionFactory(factoryAndThreads.networkThread.get(), factoryAndThreads.networkThread.get(), factoryAndThreads.signalingThread.get(), factoryAndThreads.audioDeviceModule.get(), new webrtc::VideoToolboxVideoEncoderFactory(), new webrtc::VideoToolboxVideoDecoderFactory());
+
+ ASSERT(factoryAndThreads.factory);
+}
+
+webrtc::PeerConnectionFactoryInterface& LibWebRTCProvider::factory()
+{
+ if (!staticFactoryAndThreads().factory)
+ initializePeerConnectionFactoryAndThreads();
+ return *staticFactoryAndThreads().factory;
+}
+
+void LibWebRTCProvider::setPeerConnectionFactory(rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>&& factory)
+{
+ if (!staticFactoryAndThreads().factory)
+ initializePeerConnectionFactoryAndThreads();
+
+ staticFactoryAndThreads().factory = webrtc::PeerConnectionFactoryProxy::Create(staticFactoryAndThreads().signalingThread.get(), WTFMove(factory));
+}
+
+static rtc::scoped_refptr<webrtc::PeerConnectionInterface> createActualPeerConnection(webrtc::PeerConnectionObserver& observer, std::unique_ptr<cricket::BasicPortAllocator>&& portAllocator)
+{
+ ASSERT(staticFactoryAndThreads().factory);
+
+ webrtc::PeerConnectionInterface::RTCConfiguration config;
+ // FIXME: Add a default configuration.
+ return staticFactoryAndThreads().factory->CreatePeerConnection(config, WTFMove(portAllocator), nullptr, &observer);
+}
+
+rtc::scoped_refptr<webrtc::PeerConnectionInterface> LibWebRTCProvider::createPeerConnection(webrtc::PeerConnectionObserver& observer)
+{
+ // Default WK1 implementation.
+ auto& factoryAndThreads = staticFactoryAndThreads();
+ if (!factoryAndThreads.factory) {
+ staticFactoryAndThreads().networkThreadWithSocketServer = true;
+ initializePeerConnectionFactoryAndThreads();
+ }
+ ASSERT(staticFactoryAndThreads().networkThreadWithSocketServer);
+
+ return createActualPeerConnection(observer, nullptr);
+}
+
+rtc::scoped_refptr<webrtc::PeerConnectionInterface> LibWebRTCProvider::createPeerConnection(webrtc::PeerConnectionObserver& observer, rtc::NetworkManager& networkManager, rtc::PacketSocketFactory& packetSocketFactory)
+{
+ ASSERT(!staticFactoryAndThreads().networkThreadWithSocketServer);
+
+ auto& factoryAndThreads = staticFactoryAndThreads();
+ if (!factoryAndThreads.factory)
+ initializePeerConnectionFactoryAndThreads();
+
+ std::unique_ptr<cricket::BasicPortAllocator> portAllocator;
+ staticFactoryAndThreads().signalingThread->Invoke<void>(RTC_FROM_HERE, [&]() {
+ portAllocator.reset(new cricket::BasicPortAllocator(&networkManager, &packetSocketFactory));
+ });
+
+ return createActualPeerConnection(observer, WTFMove(portAllocator));
+}
+
+} // namespace WebCore
+
+#endif // USE(LIBWEBRTC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.h (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.h 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.h 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -25,9 +25,22 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#include "LibWebRTCMacros.h"
+#include <wtf/Forward.h>
+
</ins><span class="cx"> #if USE(LIBWEBRTC)
</span><del>-#include "LibWebRTCUtils.h"
</del><ins>+
</ins><span class="cx"> #include <webrtc/api/peerconnectioninterface.h>
</span><ins>+#include <webrtc/base/scoped_ref_ptr.h>
+
+namespace rtc {
+class NetworkManager;
+class PacketSocketFactory;
+}
+
+namespace webrtc {
+class PeerConnectionFactoryInterface;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -34,11 +47,22 @@
</span><span class="cx">
</span><span class="cx"> class WEBCORE_EXPORT LibWebRTCProvider {
</span><span class="cx"> public:
</span><ins>+ LibWebRTCProvider() = default;
+ virtual ~LibWebRTCProvider() = default;
+
</ins><span class="cx"> #if USE(LIBWEBRTC)
</span><del>- virtual rtc::scoped_refptr<webrtc::PeerConnectionInterface> createPeerConnection(webrtc::PeerConnectionObserver& observer) { return WebCore::createPeerConnection(observer); };
</del><ins>+ WEBCORE_EXPORT virtual rtc::scoped_refptr<webrtc::PeerConnectionInterface> createPeerConnection(webrtc::PeerConnectionObserver&);
+
+ // FIXME: Make these methods not static.
+ static WEBCORE_EXPORT void callOnWebRTCNetworkThread(Function<void()>&&);
+ static WEBCORE_EXPORT void callOnWebRTCSignalingThread(Function<void()>&&);
+ static WEBCORE_EXPORT webrtc::PeerConnectionFactoryInterface& factory();
+ // Used for mock testing
+ static void setPeerConnectionFactory(rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>&&);
+
+protected:
+ WEBCORE_EXPORT rtc::scoped_refptr<webrtc::PeerConnectionInterface> createPeerConnection(webrtc::PeerConnectionObserver&, rtc::NetworkManager&, rtc::PacketSocketFactory&);
</ins><span class="cx"> #endif
</span><del>- virtual ~LibWebRTCProvider() = default;
-
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCUtilscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCUtils.cpp (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCUtils.cpp 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCUtils.cpp 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -1,163 +0,0 @@
</span><del>-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "LibWebRTCUtils.h"
-
-#if USE(LIBWEBRTC)
-
-#include "LibWebRTCAudioModule.h"
-#include <webrtc/api/peerconnectionfactoryproxy.h>
-#include <webrtc/api/peerconnectionfactory.h>
-#include <webrtc/base/physicalsocketserver.h>
-#include <webrtc/p2p/client/basicportallocator.h>
-#include <webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.h>
-#include <wtf/Function.h>
-#include <wtf/NeverDestroyed.h>
-
-namespace WebCore {
-
-struct PeerConnectionFactoryAndThreads : public rtc::MessageHandler {
- std::unique_ptr<LibWebRTCAudioModule> audioDeviceModule;
- std::unique_ptr<rtc::Thread> networkThread;
- std::unique_ptr<rtc::Thread> signalingThread;
- rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory;
- bool networkThreadWithSocketServer { false };
-private:
- void OnMessage(rtc::Message*);
-};
-
-static inline PeerConnectionFactoryAndThreads& staticFactoryAndThreads()
-{
- static NeverDestroyed<PeerConnectionFactoryAndThreads> factoryAndThreads;
- return factoryAndThreads.get();
-}
-
-struct ThreadMessageData : public rtc::MessageData {
- ThreadMessageData(Function<void()>&& callback)
- : callback(WTFMove(callback))
- { }
- Function<void()> callback;
-};
-
-void PeerConnectionFactoryAndThreads::OnMessage(rtc::Message* message)
-{
- ASSERT(message->message_id == 1);
- static_cast<ThreadMessageData*>(message->pdata)->callback();
-}
-
-void callOnWebRTCNetworkThread(Function<void()>&& callback)
-{
- PeerConnectionFactoryAndThreads& threads = staticFactoryAndThreads();
- threads.networkThread->Post(RTC_FROM_HERE, &threads, 1, new ThreadMessageData(WTFMove(callback)));
-}
-
-void callOnWebRTCSignalingThread(Function<void()>&& callback)
-{
- PeerConnectionFactoryAndThreads& threads = staticFactoryAndThreads();
- threads.signalingThread->Post(RTC_FROM_HERE, &threads, 1, new ThreadMessageData(WTFMove(callback)));
-}
-
-static void initializePeerConnectionFactoryAndThreads()
-{
- auto& factoryAndThreads = staticFactoryAndThreads();
-
- ASSERT(!factoryAndThreads.factory);
-
- auto thread = rtc::Thread::Create();
- factoryAndThreads.networkThread = factoryAndThreads.networkThreadWithSocketServer ? rtc::Thread::CreateWithSocketServer() : rtc::Thread::Create();
- bool result = factoryAndThreads.networkThread->Start();
- ASSERT_UNUSED(result, result);
-
- factoryAndThreads.signalingThread = rtc::Thread::Create();
- result = factoryAndThreads.signalingThread->Start();
- ASSERT(result);
-
- factoryAndThreads.audioDeviceModule = std::make_unique<LibWebRTCAudioModule>();
-
- factoryAndThreads.factory = webrtc::CreatePeerConnectionFactory(factoryAndThreads.networkThread.get(), factoryAndThreads.networkThread.get(), factoryAndThreads.signalingThread.get(), factoryAndThreads.audioDeviceModule.get(), new webrtc::VideoToolboxVideoEncoderFactory(), new webrtc::VideoToolboxVideoDecoderFactory());
-
- ASSERT(factoryAndThreads.factory);
-}
-
-void initializeLibWebRTCInternalsWithSocketServer()
-{
- staticFactoryAndThreads().networkThreadWithSocketServer = true;
-}
-
-webrtc::PeerConnectionFactoryInterface& peerConnectionFactory()
-{
- if (!staticFactoryAndThreads().factory)
- initializePeerConnectionFactoryAndThreads();
- return *staticFactoryAndThreads().factory;
-}
-
-void setPeerConnectionFactory(rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>&& factory)
-{
- if (!staticFactoryAndThreads().factory)
- initializePeerConnectionFactoryAndThreads();
-
- staticFactoryAndThreads().factory = webrtc::PeerConnectionFactoryProxy::Create(staticFactoryAndThreads().signalingThread.get(), WTFMove(factory));
-}
-
-static rtc::scoped_refptr<webrtc::PeerConnectionInterface> createPeerConnection(webrtc::PeerConnectionObserver& observer, std::unique_ptr<cricket::BasicPortAllocator>&& portAllocator)
-{
- ASSERT(staticFactoryAndThreads().factory);
-
- webrtc::PeerConnectionInterface::RTCConfiguration config;
- // FIXME: Add a default configuration.
- return staticFactoryAndThreads().factory->CreatePeerConnection(config, WTFMove(portAllocator), nullptr, &observer);
-}
-
-rtc::scoped_refptr<webrtc::PeerConnectionInterface> createPeerConnection(webrtc::PeerConnectionObserver& observer)
-{
- ASSERT(staticFactoryAndThreads().networkThreadWithSocketServer);
-
- auto& factoryAndThreads = staticFactoryAndThreads();
- if (!factoryAndThreads.factory)
- initializePeerConnectionFactoryAndThreads();
-
- return createPeerConnection(observer, nullptr);
-}
-
-rtc::scoped_refptr<webrtc::PeerConnectionInterface> createPeerConnection(webrtc::PeerConnectionObserver& observer, rtc::NetworkManager& networkManager, rtc::PacketSocketFactory& packetSocketFactory)
-{
- ASSERT(!staticFactoryAndThreads().networkThreadWithSocketServer);
-
- auto& factoryAndThreads = staticFactoryAndThreads();
- if (!factoryAndThreads.factory)
- initializePeerConnectionFactoryAndThreads();
-
- std::unique_ptr<cricket::BasicPortAllocator> portAllocator;
- staticFactoryAndThreads().signalingThread->Invoke<void>(RTC_FROM_HERE, [&]() {
- portAllocator.reset(new cricket::BasicPortAllocator(&networkManager, &packetSocketFactory));
- });
-
- return createPeerConnection(observer, WTFMove(portAllocator));
-}
-
-} // namespace WebCore
-
-#endif // USE(LIBWEBRTC)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCUtilsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCUtils.h (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCUtils.h 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCUtils.h 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -1,61 +0,0 @@
</span><del>-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if USE(LIBWEBRTC)
-
-#include "LibWebRTCMacros.h"
-#include <webrtc/base/scoped_ref_ptr.h>
-#include <wtf/Forward.h>
-
-namespace rtc {
-class NetworkManager;
-class PacketSocketFactory;
-}
-
-namespace webrtc {
-class PeerConnectionFactoryInterface;
-class PeerConnectionInterface;
-class PeerConnectionObserver;
-}
-
-namespace WebCore {
-
-WEBCORE_EXPORT void initializeLibWebRTCInternalsWithSocketServer();
-
-webrtc::PeerConnectionFactoryInterface& peerConnectionFactory();
-WEBCORE_EXPORT rtc::scoped_refptr<webrtc::PeerConnectionInterface> createPeerConnection(webrtc::PeerConnectionObserver&, rtc::NetworkManager&, rtc::PacketSocketFactory&);
-WEBCORE_EXPORT rtc::scoped_refptr<webrtc::PeerConnectionInterface> createPeerConnection(webrtc::PeerConnectionObserver&);
-
-WEBCORE_EXPORT void callOnWebRTCNetworkThread(Function<void()>&&);
-
-// Used for mock testing
-WEBCORE_EXPORT void setPeerConnectionFactory(rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>&&);
-WEBCORE_EXPORT void callOnWebRTCSignalingThread(Function<void()>&&);
-
-} // namespace WebCore
-
-#endif // USE(LIBWEBRTC)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CAAudioStreamDescription.h"
</span><span class="cx"> #include "LibWebRTCAudioFormat.h"
</span><del>-#include "LibWebRTCUtils.h"
</del><ins>+#include "LibWebRTCProvider.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> }
</span><span class="cx"> m_sampleConverter->pushSamples(time, audioData, sampleCount);
</span><span class="cx">
</span><del>- callOnWebRTCSignalingThread([protectedThis = makeRef(*this)] {
</del><ins>+ LibWebRTCProvider::callOnWebRTCSignalingThread([protectedThis = makeRef(*this)] {
</ins><span class="cx"> protectedThis->pullAudioData();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -86,7 +86,6 @@
</span><span class="cx"> #include "InternalSettings.h"
</span><span class="cx"> #include "Language.h"
</span><span class="cx"> #include "LibWebRTCProvider.h"
</span><del>-#include "LibWebRTCUtils.h"
</del><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "MallocStatistics.h"
</span><span class="cx"> #include "MediaPlayer.h"
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockLibWebRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -28,17 +28,33 @@
</span><span class="cx"> #if USE(LIBWEBRTC)
</span><span class="cx">
</span><span class="cx"> #include "LibWebRTCProvider.h"
</span><del>-#include "LibWebRTCUtils.h"
</del><span class="cx"> #include <sstream>
</span><span class="cx"> #include <webrtc/api/mediastream.h>
</span><span class="cx"> #include <wtf/Function.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static inline rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>& getRealPeerConnectionFactory()
+{
+ static NeverDestroyed<rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>> realPeerConnectionFactory;
+ return realPeerConnectionFactory;
+}
+
+static inline webrtc::PeerConnectionFactoryInterface* realPeerConnectionFactory()
+{
+ return getRealPeerConnectionFactory().get();
+}
+
</ins><span class="cx"> void useMockRTCPeerConnectionFactory(LibWebRTCProvider* provider, const String& testCase)
</span><span class="cx"> {
</span><del>- setPeerConnectionFactory(MockLibWebRTCPeerConnectionFactory::create(provider, String(testCase)));
</del><ins>+ if (provider && !realPeerConnectionFactory()) {
+ auto& factory = getRealPeerConnectionFactory();
+ factory = &provider->factory();
+ }
+
+ LibWebRTCProvider::setPeerConnectionFactory(MockLibWebRTCPeerConnectionFactory::create(String(testCase)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class MockLibWebRTCPeerConnectionForIceCandidates : public MockLibWebRTCPeerConnection {
</span><span class="lines">@@ -52,19 +68,19 @@
</span><span class="cx"> void MockLibWebRTCPeerConnectionForIceCandidates::gotLocalDescription()
</span><span class="cx"> {
</span><span class="cx"> // Let's gather candidates
</span><del>- callOnWebRTCSignalingThread([this]() {
</del><ins>+ LibWebRTCProvider::callOnWebRTCSignalingThread([this]() {
</ins><span class="cx"> MockLibWebRTCIceCandidate candidate("2013266431 1 udp 2013266432 192.168.0.100 38838 typ host generation 0", "1");
</span><span class="cx"> m_observer.OnIceCandidate(&candidate);
</span><span class="cx"> });
</span><del>- callOnWebRTCSignalingThread([this]() {
</del><ins>+ LibWebRTCProvider::callOnWebRTCSignalingThread([this]() {
</ins><span class="cx"> MockLibWebRTCIceCandidate candidate("1019216383 1 tcp 1019216384 192.168.0.100 9 typ host tcptype passive generation 0", "1");
</span><span class="cx"> m_observer.OnIceCandidate(&candidate);
</span><span class="cx"> });
</span><del>- callOnWebRTCSignalingThread([this]() {
</del><ins>+ LibWebRTCProvider::callOnWebRTCSignalingThread([this]() {
</ins><span class="cx"> MockLibWebRTCIceCandidate candidate("1677722111 1 tcp 1677722112 172.18.0.1 47989 typ srflx raddr 192.168.0.100 rport 47989 generation 0", "1");
</span><span class="cx"> m_observer.OnIceCandidate(&candidate);
</span><span class="cx"> });
</span><del>- callOnWebRTCSignalingThread([this]() {
</del><ins>+ LibWebRTCProvider::callOnWebRTCSignalingThread([this]() {
</ins><span class="cx"> m_observer.OnIceGatheringChange(webrtc::PeerConnectionInterface::kIceGatheringComplete);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -93,7 +109,7 @@
</span><span class="cx"> mock.AddRef();
</span><span class="cx"> observer.AddRef();
</span><span class="cx"> callOnMainThread([&mock, &observer] {
</span><del>- callOnWebRTCNetworkThread([&mock, &observer]() {
</del><ins>+ LibWebRTCProvider::callOnWebRTCNetworkThread([&mock, &observer]() {
</ins><span class="cx"> observer.Release();
</span><span class="cx"> mock.Release();
</span><span class="cx"> });
</span><span class="lines">@@ -133,26 +149,22 @@
</span><span class="cx"> void SetLocalDescription(webrtc::SetSessionDescriptionObserver* observer, webrtc::SessionDescriptionInterface*) final { releaseInNetworkThread(*this, *observer); }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-
-MockLibWebRTCPeerConnectionFactory::MockLibWebRTCPeerConnectionFactory(LibWebRTCProvider* provider, String&& testCase)
- : m_provider(provider)
- , m_testCase(WTFMove(testCase))
</del><ins>+MockLibWebRTCPeerConnectionFactory::MockLibWebRTCPeerConnectionFactory(String&& testCase)
+ : m_testCase(WTFMove(testCase))
</ins><span class="cx"> {
</span><del>- if (m_testCase == "TwoRealPeerConnections" && m_provider) {
</del><ins>+ if (m_testCase == "TwoRealPeerConnections") {
</ins><span class="cx"> m_numberOfRealPeerConnections = 2;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (m_testCase == "OneRealPeerConnection" && m_provider)
</del><ins>+ if (m_testCase == "OneRealPeerConnection")
</ins><span class="cx"> m_numberOfRealPeerConnections = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-rtc::scoped_refptr<webrtc::PeerConnectionInterface> MockLibWebRTCPeerConnectionFactory::CreatePeerConnection(const webrtc::PeerConnectionInterface::RTCConfiguration&, std::unique_ptr<cricket::PortAllocator>, std::unique_ptr<rtc::RTCCertificateGeneratorInterface>, webrtc::PeerConnectionObserver* observer)
</del><ins>+rtc::scoped_refptr<webrtc::PeerConnectionInterface> MockLibWebRTCPeerConnectionFactory::CreatePeerConnection(const webrtc::PeerConnectionInterface::RTCConfiguration& configuration, std::unique_ptr<cricket::PortAllocator> portAllocator, std::unique_ptr<rtc::RTCCertificateGeneratorInterface> generator, webrtc::PeerConnectionObserver* observer)
</ins><span class="cx"> {
</span><span class="cx"> if (m_numberOfRealPeerConnections) {
</span><del>- ASSERT(m_provider);
- auto connection = m_provider->createPeerConnection(*observer);
- if (!--m_numberOfRealPeerConnections)
- m_provider = nullptr;
</del><ins>+ auto connection = realPeerConnectionFactory()->CreatePeerConnection(configuration, WTFMove(portAllocator), WTFMove(generator), observer);
+ --m_numberOfRealPeerConnections;
</ins><span class="cx"> return connection;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -181,7 +193,7 @@
</span><span class="cx">
</span><span class="cx"> void MockLibWebRTCPeerConnection::SetLocalDescription(webrtc::SetSessionDescriptionObserver* observer, webrtc::SessionDescriptionInterface*)
</span><span class="cx"> {
</span><del>- callOnWebRTCSignalingThread([this, observer] {
</del><ins>+ LibWebRTCProvider::callOnWebRTCSignalingThread([this, observer] {
</ins><span class="cx"> observer->OnSuccess();
</span><span class="cx"> gotLocalDescription();
</span><span class="cx"> });
</span><span class="lines">@@ -189,7 +201,7 @@
</span><span class="cx">
</span><span class="cx"> void MockLibWebRTCPeerConnection::SetRemoteDescription(webrtc::SetSessionDescriptionObserver* observer, webrtc::SessionDescriptionInterface* sessionDescription)
</span><span class="cx"> {
</span><del>- callOnWebRTCSignalingThread([observer] {
</del><ins>+ LibWebRTCProvider::callOnWebRTCSignalingThread([observer] {
</ins><span class="cx"> observer->OnSuccess();
</span><span class="cx"> });
</span><span class="cx"> ASSERT(sessionDescription);
</span><span class="lines">@@ -224,7 +236,7 @@
</span><span class="cx">
</span><span class="cx"> void MockLibWebRTCPeerConnection::CreateOffer(webrtc::CreateSessionDescriptionObserver* observer, const webrtc::MediaConstraintsInterface*)
</span><span class="cx"> {
</span><del>- callOnWebRTCSignalingThread([this, observer] {
</del><ins>+ LibWebRTCProvider::callOnWebRTCSignalingThread([this, observer] {
</ins><span class="cx"> std::ostringstream sdp;
</span><span class="cx"> sdp <<
</span><span class="cx"> "v=0\r\n"
</span><span class="lines">@@ -283,7 +295,7 @@
</span><span class="cx">
</span><span class="cx"> void MockLibWebRTCPeerConnection::CreateAnswer(webrtc::CreateSessionDescriptionObserver* observer, const webrtc::MediaConstraintsInterface*)
</span><span class="cx"> {
</span><del>- callOnWebRTCSignalingThread([this, observer] {
</del><ins>+ LibWebRTCProvider::callOnWebRTCSignalingThread([this, observer] {
</ins><span class="cx"> std::ostringstream sdp;
</span><span class="cx"> sdp <<
</span><span class="cx"> "v=0\r\n"
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockLibWebRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.h (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.h 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.h 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -191,10 +191,10 @@
</span><span class="cx">
</span><span class="cx"> class MockLibWebRTCPeerConnectionFactory : public webrtc::PeerConnectionFactoryInterface {
</span><span class="cx"> public:
</span><del>- static rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> create(LibWebRTCProvider* provider, String&& testCase) { return new rtc::RefCountedObject<MockLibWebRTCPeerConnectionFactory>(provider, WTFMove(testCase)); }
</del><ins>+ static rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> create(String&& testCase) { return new rtc::RefCountedObject<MockLibWebRTCPeerConnectionFactory>(WTFMove(testCase)); }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- MockLibWebRTCPeerConnectionFactory(LibWebRTCProvider*, String&&);
</del><ins>+ MockLibWebRTCPeerConnectionFactory(String&&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> rtc::scoped_refptr<webrtc::PeerConnectionInterface> CreatePeerConnection(const webrtc::PeerConnectionInterface::RTCConfiguration&, const webrtc::MediaConstraintsInterface*, std::unique_ptr<cricket::PortAllocator>, std::unique_ptr<rtc::RTCCertificateGeneratorInterface>, webrtc::PeerConnectionObserver*) final { return nullptr; }
</span><span class="lines">@@ -220,7 +220,6 @@
</span><span class="cx"> void StopRtcEventLog() final { }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- LibWebRTCProvider* m_provider { nullptr };
</del><span class="cx"> String m_testCase;
</span><span class="cx"> unsigned m_numberOfRealPeerConnections { 0 };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-02-13 Youenn Fablet <youennf@gmail.com>
+
+ [WebRTC] Creating RTCPeerConnection with libwebrtc backend is crashing on rwt
+ https://bugs.webkit.org/show_bug.cgi?id=168250
+
+ Reviewed by Alex Christensen.
+
+ * WebProcess/Network/webrtc/LibWebRTCProvider.cpp:
+ (WebKit::LibWebRTCProvider::createPeerConnection):
+ * WebProcess/Network/webrtc/LibWebRTCProvider.h:
+ * WebProcess/Network/webrtc/LibWebRTCSocket.h:
+ * WebProcess/Network/webrtc/WebRTCMonitor.cpp:
+ (WebKit::WebRTCMonitor::StartUpdating):
+ (WebKit::WebRTCMonitor::networksChanged):
+ * WebProcess/Network/webrtc/WebRTCMonitor.h:
+ * WebProcess/Network/webrtc/WebRTCResolver.cpp:
+ (WebKit::WebRTCResolver::setResolvedAddress):
+ (WebKit::WebRTCResolver::resolvedAddressError):
+ * WebProcess/Network/webrtc/WebRTCSocket.cpp:
+ (WebKit::WebRTCSocket::signalOnNetworkThread):
+
</ins><span class="cx"> 2017-02-13 Megan Gardner <megan_gardner@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement Drag cancels
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCProvider.cpp (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCProvider.cpp 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCProvider.cpp 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if USE(LIBWEBRTC)
</span><span class="cx">
</span><span class="cx"> #include "WebProcess.h"
</span><del>-#include <WebCore/LibWebRTCUtils.h>
</del><span class="cx"> #include <webrtc/api/peerconnectionfactory.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -36,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> rtc::scoped_refptr<webrtc::PeerConnectionInterface> LibWebRTCProvider::createPeerConnection(webrtc::PeerConnectionObserver& observer)
</span><span class="cx"> {
</span><del>- return WebCore::createPeerConnection(observer, WebProcess::singleton().libWebRTCNetwork().monitor(), WebProcess::singleton().libWebRTCNetwork().socketFactory());
</del><ins>+ return WebCore::LibWebRTCProvider::createPeerConnection(observer, WebProcess::singleton().libWebRTCNetwork().monitor(), WebProcess::singleton().libWebRTCNetwork().socketFactory());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCSocketh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.h (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.h 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.h 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -27,8 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(LIBWEBRTC)
</span><span class="cx">
</span><del>-#include <WebCore/LibWebRTCMacros.h>
-#include <WebCore/LibWebRTCUtils.h>
</del><ins>+#include <WebCore/LibWebRTCProvider.h>
</ins><span class="cx"> #include <webrtc/base/asyncpacketsocket.h>
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCMonitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCMonitor.cpp (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCMonitor.cpp 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCMonitor.cpp 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> if (m_clientCount) {
</span><span class="cx"> // Need to signal new client that we already have the network list, let's do it asynchronously
</span><span class="cx"> if (m_receivedNetworkList) {
</span><del>- WebCore::callOnWebRTCNetworkThread([this] {
</del><ins>+ WebCore::LibWebRTCProvider::callOnWebRTCNetworkThread([this] {
</ins><span class="cx"> SignalNetworksChanged();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> void WebRTCMonitor::networksChanged(const Vector<RTCNetwork>& networks, const RTCNetwork::IPAddress& ipv4, const RTCNetwork::IPAddress& ipv6)
</span><span class="cx"> {
</span><span class="cx"> // No need to protect 'this' as it has the lifetime of LibWebRTC which has the lifetime of the web process.
</span><del>- WebCore::callOnWebRTCNetworkThread([this, networks, ipv4, ipv6] {
</del><ins>+ WebCore::LibWebRTCProvider::callOnWebRTCNetworkThread([this, networks, ipv4, ipv6] {
</ins><span class="cx"> std::vector<rtc::Network*> networkList(networks.size());
</span><span class="cx"> for (size_t index = 0; index < networks.size(); ++index)
</span><span class="cx"> networkList[index] = new rtc::Network(networks[index].value());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCMonitorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCMonitor.h (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCMonitor.h 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCMonitor.h 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #if USE(LIBWEBRTC)
</span><span class="cx">
</span><span class="cx"> #include "RTCNetwork.h"
</span><del>-#include <WebCore/LibWebRTCUtils.h>
</del><ins>+#include <WebCore/LibWebRTCProvider.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCResolver.cpp (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCResolver.cpp 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCResolver.cpp 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "LibWebRTCResolver.h"
</span><span class="cx"> #include "LibWebRTCSocketFactory.h"
</span><del>-#include <WebCore/LibWebRTCUtils.h>
</del><ins>+#include <WebCore/LibWebRTCProvider.h>
</ins><span class="cx"> #include <wtf/Function.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> for (auto& address : addresses)
</span><span class="cx"> rtcAddresses.uncheckedAppend(address.value);
</span><span class="cx">
</span><del>- WebCore::callOnWebRTCNetworkThread([&factory, identifier, rtcAddresses = WTFMove(rtcAddresses)]() {
</del><ins>+ WebCore::LibWebRTCProvider::callOnWebRTCNetworkThread([&factory, identifier, rtcAddresses = WTFMove(rtcAddresses)]() {
</ins><span class="cx"> auto* resolver = factory.resolver(identifier);
</span><span class="cx"> if (!resolver)
</span><span class="cx"> return;
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto identifier = m_identifier;
</span><span class="cx"> auto& factory = m_socketFactory;
</span><del>- WebCore::callOnWebRTCNetworkThread([&factory, identifier, error]() {
</del><ins>+ WebCore::LibWebRTCProvider::callOnWebRTCNetworkThread([&factory, identifier, error]() {
</ins><span class="cx"> auto* resolver = factory.resolver(identifier);
</span><span class="cx"> if (!resolver)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.cpp (212268 => 212269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.cpp 2017-02-14 01:46:01 UTC (rev 212268)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.cpp 2017-02-14 02:09:03 UTC (rev 212269)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> void WebRTCSocket::signalOnNetworkThread(LibWebRTCSocketFactory& factory, uint64_t identifier, Function<void(LibWebRTCSocket&)>&& callback)
</span><span class="cx"> {
</span><span class="cx"> // factory is staying valid during the process lifetime.
</span><del>- WebCore::callOnWebRTCNetworkThread([&factory, identifier, callback = WTFMove(callback)]() {
</del><ins>+ WebCore::LibWebRTCProvider::callOnWebRTCNetworkThread([&factory, identifier, callback = WTFMove(callback)]() {
</ins><span class="cx"> auto* socket = factory.socket(identifier);
</span><span class="cx"> if (!socket)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>