Diff
Modified: trunk/LayoutTests/ChangeLog (165254 => 165255)
--- trunk/LayoutTests/ChangeLog 2014-03-07 10:42:56 UTC (rev 165254)
+++ trunk/LayoutTests/ChangeLog 2014-03-07 11:46:53 UTC (rev 165255)
@@ -1,3 +1,13 @@
+2014-03-07 Thiago de Barros Lacerda <[email protected]>
+
+ [WebRTC] Adding getConfiguration method to RTCPeerConnection
+ https://bugs.webkit.org/show_bug.cgi?id=129845
+
+ Reviewed by Eric Carlson.
+
+ * fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt: Added.
+ * fast/mediastream/RTCPeerConnection-getConfiguration.html: Added.
+
2014-03-06 Thiago de Barros Lacerda <[email protected]>
[WebRTC] Updating RTCPeerConnection.idl
Added: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt (0 => 165255)
--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt 2014-03-07 11:46:53 UTC (rev 165255)
@@ -0,0 +1,58 @@
+Tests RTCPeerConnection getConfiguration.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS iceServers.length is 1
+PASS configuration.iceTransports is "all"
+PASS configuration.requestIdentity is "ifconfigured"
+PASS iceServers[i].username is ""
+PASS iceServers[i].credential is ""
+PASS urls[j] is "stun:foo.com"
+PASS iceServers.length is 2
+PASS configuration.iceTransports is "all"
+PASS configuration.requestIdentity is "ifconfigured"
+PASS iceServers[i].username is "user"
+PASS iceServers[i].credential is "x"
+PASS urls[j] is "turn:foo.com"
+PASS iceServers[i].username is "user2"
+PASS iceServers[i].credential is "x"
+PASS urls[j] is "stun:bar.com"
+PASS iceServers.length is 2
+PASS configuration.iceTransports is "all"
+PASS configuration.requestIdentity is "ifconfigured"
+PASS iceServers[i].username is "user"
+PASS iceServers[i].credential is "x"
+PASS urls[j] is "turn:foo.com"
+PASS iceServers[i].username is "user2"
+PASS iceServers[i].credential is "x"
+PASS urls[j] is "stun:bar.com"
+PASS urls[j] is "turn:foo.com"
+PASS urls[j] is "turn:foo2.com"
+PASS iceServers.length is 1
+PASS configuration.iceTransports is "relay"
+PASS configuration.requestIdentity is "no"
+PASS iceServers[i].username is ""
+PASS iceServers[i].credential is ""
+PASS urls[j] is "stun:foo.com"
+PASS iceServers.length is 2
+PASS configuration.iceTransports is "none"
+PASS configuration.requestIdentity is "yes"
+PASS iceServers[i].username is "user"
+PASS iceServers[i].credential is "x"
+PASS urls[j] is "turn:foo.com"
+PASS iceServers[i].username is "user2"
+PASS iceServers[i].credential is "x"
+PASS urls[j] is "stun:bar.com"
+PASS urls[j] is "turn:foo.com"
+PASS urls[j] is "turn:foo2.com"
+PASS iceServers.length is 1
+PASS configuration.iceTransports is "all"
+PASS configuration.requestIdentity is "ifconfigured"
+PASS iceServers[i].username is ""
+PASS iceServers[i].credential is ""
+PASS urls[j] is "stun:foo.com"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration.html (0 => 165255)
--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration.html 2014-03-07 11:46:53 UTC (rev 165255)
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+ <head>
+ <script src=""
+ </head>
+ <body>
+ <script>
+ description("Tests RTCPeerConnection getConfiguration.");
+
+ var pc = null;
+ var configuration = null;
+ var iceServers = null;
+ var urls = null;
+
+ function checkConfiguration(serversList, iceTransports, requestIdentity)
+ {
+ iceServers = configuration.iceServers
+ shouldBe('iceServers.length', serversList.length.toString());
+ shouldBeEqualToString('configuration.iceTransports', iceTransports);
+ shouldBeEqualToString('configuration.requestIdentity', requestIdentity);
+ for (i = 0; i < iceServers.length; ++i) {
+ shouldBeEqualToString('iceServers[i].username', serversList[i].username);
+ shouldBeEqualToString('iceServers[i].credential', serversList[i].credential);
+
+ urls = iceServers[i].urls;
+ for (j = 0; j < urls.length; ++j)
+ shouldBeEqualToString('urls[j]', serversList[i].urls[j]);
+ }
+ }
+
+ pc = new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]});
+ var servers = [{urls:['stun:foo.com'], username:'', credential:''}];
+ configuration = pc.getConfiguration();
+ checkConfiguration(servers, 'all', 'ifconfigured');
+
+ pc = new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:'stun:bar.com', username:'user2', credential:'x'}]});
+ servers = [{urls:['turn:foo.com'], username:'user', credential:'x'}, {urls:['stun:bar.com'], username:'user2', credential:'x'}];
+ configuration = pc.getConfiguration();
+ checkConfiguration(servers, 'all', 'ifconfigured');
+
+ pc = new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}]});
+ servers = [{urls:['turn:foo.com'], username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}];
+ configuration = pc.getConfiguration();
+ checkConfiguration(servers, 'all', 'ifconfigured');
+
+ pc = new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'relay', requestIdentity:'no'});
+ var servers = [{urls:['stun:foo.com'], username:'', credential:''}];
+ configuration = pc.getConfiguration();
+ checkConfiguration(servers, 'relay', 'no');
+
+ pc = new webkitRTCPeerConnection({iceServers:[{urls:'turn:foo.com', username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}], iceTransports:'none', requestIdentity:'yes'});
+ servers = [{urls:['turn:foo.com'], username:'user', credential:'x'},{urls:['stun:bar.com', 'turn:foo.com', 'turn:foo2.com'], username:'user2', credential:'x'}];
+ configuration = pc.getConfiguration();
+ checkConfiguration(servers, 'none', 'yes');
+
+ pc = new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}], iceTransports:'foo', requestIdentity:'bar'});
+ var servers = [{urls:['stun:foo.com'], username:'', credential:''}];
+ configuration = pc.getConfiguration();
+ checkConfiguration(servers, 'all', 'ifconfigured');
+
+ finishJSTest();
+
+ window.jsTestIsAsync = true;
+ window.successfullyParsed = true;
+ </script>
+ <script src=""
+ </body>
+</html>
Modified: trunk/Source/WebCore/CMakeLists.txt (165254 => 165255)
--- trunk/Source/WebCore/CMakeLists.txt 2014-03-07 10:42:56 UTC (rev 165254)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-03-07 11:46:53 UTC (rev 165255)
@@ -217,6 +217,7 @@
Modules/mediastream/NavigatorUserMediaError.idl
Modules/mediastream/NavigatorUserMediaErrorCallback.idl
Modules/mediastream/NavigatorUserMediaSuccessCallback.idl
+ Modules/mediastream/RTCConfiguration.idl
Modules/mediastream/RTCDTMFSender.idl
Modules/mediastream/RTCDTMFToneChangeEvent.idl
Modules/mediastream/RTCDataChannel.idl
@@ -224,6 +225,7 @@
Modules/mediastream/RTCPeerConnectionErrorCallback.idl
Modules/mediastream/RTCIceCandidate.idl
Modules/mediastream/RTCIceCandidateEvent.idl
+ Modules/mediastream/RTCIceServer.idl
Modules/mediastream/RTCPeerConnection.idl
Modules/mediastream/RTCSessionDescription.idl
Modules/mediastream/RTCSessionDescriptionCallback.idl
Modified: trunk/Source/WebCore/ChangeLog (165254 => 165255)
--- trunk/Source/WebCore/ChangeLog 2014-03-07 10:42:56 UTC (rev 165254)
+++ trunk/Source/WebCore/ChangeLog 2014-03-07 11:46:53 UTC (rev 165255)
@@ -1,3 +1,24 @@
+2014-03-07 Thiago de Barros Lacerda <[email protected]>
+
+ [WebRTC] Adding getConfiguration method to RTCPeerConnection
+ https://bugs.webkit.org/show_bug.cgi?id=129845
+
+ Reviewed by Eric Carlson.
+
+ Test: fast/mediastream/RTCPeerConnection-getConfiguration.html
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * GNUmakefile.list.am:
+ * Modules/mediastream/RTCConfiguration.idl: Added.
+ * Modules/mediastream/RTCIceServer.idl: Added.
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::RTCPeerConnection):
+ (WebCore::RTCPeerConnection::updateIce):
+ (WebCore::RTCPeerConnection::getConfiguration):
+ * Modules/mediastream/RTCPeerConnection.h:
+ * Modules/mediastream/RTCPeerConnection.idl:
+
2014-03-07 Jinwoo Song <[email protected]>
Optimize collectionLast() and collectionTraverseBackward() in LiveNodeList
Modified: trunk/Source/WebCore/DerivedSources.make (165254 => 165255)
--- trunk/Source/WebCore/DerivedSources.make 2014-03-07 10:42:56 UTC (rev 165254)
+++ trunk/Source/WebCore/DerivedSources.make 2014-03-07 11:46:53 UTC (rev 165255)
@@ -125,12 +125,14 @@
$(WebCore)/Modules/mediastream/NavigatorUserMediaError.idl \
$(WebCore)/Modules/mediastream/NavigatorUserMediaErrorCallback.idl \
$(WebCore)/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl \
+ $(WebCore)/Modules/mediastream/RTCConfiguration.idl \
$(WebCore)/Modules/mediastream/RTCDTMFSender.idl \
$(WebCore)/Modules/mediastream/RTCDTMFToneChangeEvent.idl \
$(WebCore)/Modules/mediastream/RTCDataChannel.idl \
$(WebCore)/Modules/mediastream/RTCDataChannelEvent.idl \
$(WebCore)/Modules/mediastream/RTCIceCandidate.idl \
$(WebCore)/Modules/mediastream/RTCIceCandidateEvent.idl \
+ $(WebCore)/Modules/mediastream/RTCIceServer.idl \
$(WebCore)/Modules/mediastream/RTCPeerConnection.idl \
$(WebCore)/Modules/mediastream/RTCPeerConnectionErrorCallback.idl \
$(WebCore)/Modules/mediastream/RTCSessionDescription.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (165254 => 165255)
--- trunk/Source/WebCore/GNUmakefile.list.am 2014-03-07 10:42:56 UTC (rev 165254)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-03-07 11:46:53 UTC (rev 165255)
@@ -602,6 +602,8 @@
DerivedSources/WebCore/JSRequestAnimationFrameCallback.h \
DerivedSources/WebCore/JSRGBColor.cpp \
DerivedSources/WebCore/JSRGBColor.h \
+ DerivedSources/WebCore/JSRTCConfiguration.cpp \
+ DerivedSources/WebCore/JSRTCConfiguration.h \
DerivedSources/WebCore/JSRTCDTMFSender.cpp \
DerivedSources/WebCore/JSRTCDTMFSender.h \
DerivedSources/WebCore/JSRTCDTMFToneChangeEvent.cpp \
@@ -616,6 +618,8 @@
DerivedSources/WebCore/JSRTCIceCandidate.h \
DerivedSources/WebCore/JSRTCIceCandidateEvent.cpp \
DerivedSources/WebCore/JSRTCIceCandidateEvent.h \
+ DerivedSources/WebCore/JSRTCIceServer.cpp \
+ DerivedSources/WebCore/JSRTCIceServer.h \
DerivedSources/WebCore/JSRTCPeerConnection.cpp \
DerivedSources/WebCore/JSRTCPeerConnection.h \
DerivedSources/WebCore/JSRTCSessionDescription.cpp \
@@ -1223,6 +1227,7 @@
$(WebCore)/Modules/mediastream/NavigatorUserMediaError.idl \
$(WebCore)/Modules/mediastream/NavigatorUserMediaErrorCallback.idl \
$(WebCore)/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl \
+ $(WebCore)/Modules/mediastream/RTCConfiguration.idl \
$(WebCore)/Modules/mediastream/RTCDTMFSender.idl \
$(WebCore)/Modules/mediastream/RTCDTMFToneChangeEvent.idl \
$(WebCore)/Modules/mediastream/RTCDataChannel.idl \
@@ -1230,6 +1235,7 @@
$(WebCore)/Modules/mediastream/RTCPeerConnectionErrorCallback.idl \
$(WebCore)/Modules/mediastream/RTCIceCandidate.idl \
$(WebCore)/Modules/mediastream/RTCIceCandidateEvent.idl \
+ $(WebCore)/Modules/mediastream/RTCIceServer.idl \
$(WebCore)/Modules/mediastream/RTCPeerConnection.idl \
$(WebCore)/Modules/mediastream/RTCSessionDescription.idl \
$(WebCore)/Modules/mediastream/RTCSessionDescriptionCallback.idl \
Added: trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl (0 => 165255)
--- trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl 2014-03-07 11:46:53 UTC (rev 165255)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2014 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 COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * 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.
+ */
+
+enum RTCIceTransportsEnum { "none", "relay", "all" };
+enum RTCIdentityOptionEnum { "yes", "no", "ifconfigured" };
+
+[
+ Conditional=MEDIA_STREAM,
+ ImplementationLacksVTable,
+ NoInterfaceObject,
+] interface RTCConfiguration {
+ readonly attribute RTCIceServer[] iceServers;
+ readonly attribute RTCIceTransportsEnum iceTransports;
+ readonly attribute RTCIdentityOptionEnum requestIdentity;
+};
Added: trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl (0 => 165255)
--- trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl 2014-03-07 11:46:53 UTC (rev 165255)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 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 COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * 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.
+ */
+
+[
+ Conditional=MEDIA_STREAM,
+ ImplementationLacksVTable,
+ NoInterfaceObject,
+] interface RTCIceServer {
+ readonly attribute DOMString[] urls;
+ readonly attribute DOMString username;
+ readonly attribute DOMString credential;
+};
+
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (165254 => 165255)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-03-07 10:42:56 UTC (rev 165254)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-03-07 11:46:53 UTC (rev 165255)
@@ -175,6 +175,7 @@
, m_iceGatheringState(IceGatheringStateNew)
, m_iceConnectionState(IceConnectionStateNew)
, m_scheduledEventTimer(this, &RTCPeerConnection::scheduledEventTimerFired)
+ , m_configuration(configuration)
, m_stopped(false)
{
Document& document = toDocument(context);
@@ -192,7 +193,7 @@
document.frame()->loader().client().dispatchWillStartUsingPeerConnectionHandler(m_peerHandler.get());
- if (!m_peerHandler->initialize(configuration)) {
+ if (!m_peerHandler->initialize(m_configuration)) {
ec = NOT_SUPPORTED_ERR;
return;
}
@@ -361,11 +362,11 @@
return;
}
- RefPtr<RTCConfiguration> configuration = parseConfiguration(rtcConfiguration, ec);
+ m_configuration = parseConfiguration(rtcConfiguration, ec);
if (ec)
return;
- bool valid = m_peerHandler->updateIce(configuration);
+ bool valid = m_peerHandler->updateIce(m_configuration);
if (!valid)
ec = SYNTAX_ERR;
}
@@ -496,6 +497,11 @@
m_peerHandler->removeStream(stream->privateStream());
}
+RTCConfiguration* RTCPeerConnection::getConfiguration() const
+{
+ return m_configuration.get();
+}
+
MediaStreamVector RTCPeerConnection::getLocalStreams() const
{
return m_localStreams;
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (165254 => 165255)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2014-03-07 10:42:56 UTC (rev 165254)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2014-03-07 11:46:53 UTC (rev 165255)
@@ -83,6 +83,8 @@
String iceConnectionState() const;
+ RTCConfiguration* getConfiguration() const;
+
MediaStreamVector getLocalStreams() const;
MediaStreamVector getRemoteStreams() const;
@@ -165,6 +167,8 @@
Timer<RTCPeerConnection> m_scheduledEventTimer;
Vector<RefPtr<Event>> m_scheduledEvents;
+ RefPtr<RTCConfiguration> m_configuration;
+
bool m_stopped;
};
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (165254 => 165255)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2014-03-07 10:42:56 UTC (rev 165254)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2014-03-07 11:46:53 UTC (rev 165255)
@@ -62,6 +62,8 @@
sequence<MediaStream> getRemoteStreams();
MediaStream getStreamById(DOMString streamId);
+ RTCConfiguration getConfiguration();
+
[StrictTypeChecking, RaisesException] void addStream(MediaStream stream);
[StrictTypeChecking, RaisesException] void removeStream(MediaStream stream);
