<!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>[165255] 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/165255">165255</a></dd>
<dt>Author</dt> <dd>thiago.lacerda@openbossa.org</dd>
<dt>Date</dt> <dd>2014-03-07 03:46:53 -0800 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] Adding getConfiguration method to RTCPeerConnection
https://bugs.webkit.org/show_bug.cgi?id=129845
Reviewed by Eric Carlson.
Source/WebCore:
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:
LayoutTests:
* fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt: Added.
* fast/mediastream/RTCPeerConnection-getConfiguration.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectiongetConfigurationexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectiongetConfigurationhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration.html</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCConfigurationidl">trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceServeridl">trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165254 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-07 10:42:56 UTC (rev 165254)
+++ trunk/LayoutTests/ChangeLog 2014-03-07 11:46:53 UTC (rev 165255)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-07 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [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.
+
</ins><span class="cx"> 2014-03-06 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Updating RTCPeerConnection.idl
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectiongetConfigurationexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt (0 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+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
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectiongetConfigurationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration.html (0 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+ <head>
+ <script src="../../resources/js-test-pre.js"></script>
+ </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="../../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (165254 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -217,6 +217,7 @@
</span><span class="cx"> Modules/mediastream/NavigatorUserMediaError.idl
</span><span class="cx"> Modules/mediastream/NavigatorUserMediaErrorCallback.idl
</span><span class="cx"> Modules/mediastream/NavigatorUserMediaSuccessCallback.idl
</span><ins>+ Modules/mediastream/RTCConfiguration.idl
</ins><span class="cx"> Modules/mediastream/RTCDTMFSender.idl
</span><span class="cx"> Modules/mediastream/RTCDTMFToneChangeEvent.idl
</span><span class="cx"> Modules/mediastream/RTCDataChannel.idl
</span><span class="lines">@@ -224,6 +225,7 @@
</span><span class="cx"> Modules/mediastream/RTCPeerConnectionErrorCallback.idl
</span><span class="cx"> Modules/mediastream/RTCIceCandidate.idl
</span><span class="cx"> Modules/mediastream/RTCIceCandidateEvent.idl
</span><ins>+ Modules/mediastream/RTCIceServer.idl
</ins><span class="cx"> Modules/mediastream/RTCPeerConnection.idl
</span><span class="cx"> Modules/mediastream/RTCSessionDescription.idl
</span><span class="cx"> Modules/mediastream/RTCSessionDescriptionCallback.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165254 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-03-07 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [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:
+
</ins><span class="cx"> 2014-03-07 Jinwoo Song <jinwoo7.song@samsung.com>
</span><span class="cx">
</span><span class="cx"> Optimize collectionLast() and collectionTraverseBackward() in LiveNodeList
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (165254 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -125,12 +125,14 @@
</span><span class="cx"> $(WebCore)/Modules/mediastream/NavigatorUserMediaError.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/NavigatorUserMediaErrorCallback.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl \
</span><ins>+ $(WebCore)/Modules/mediastream/RTCConfiguration.idl \
</ins><span class="cx"> $(WebCore)/Modules/mediastream/RTCDTMFSender.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCDTMFToneChangeEvent.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCDataChannel.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCDataChannelEvent.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCIceCandidate.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCIceCandidateEvent.idl \
</span><ins>+ $(WebCore)/Modules/mediastream/RTCIceServer.idl \
</ins><span class="cx"> $(WebCore)/Modules/mediastream/RTCPeerConnection.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCPeerConnectionErrorCallback.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCSessionDescription.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (165254 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -602,6 +602,8 @@
</span><span class="cx"> DerivedSources/WebCore/JSRequestAnimationFrameCallback.h \
</span><span class="cx"> DerivedSources/WebCore/JSRGBColor.cpp \
</span><span class="cx"> DerivedSources/WebCore/JSRGBColor.h \
</span><ins>+ DerivedSources/WebCore/JSRTCConfiguration.cpp \
+ DerivedSources/WebCore/JSRTCConfiguration.h \
</ins><span class="cx"> DerivedSources/WebCore/JSRTCDTMFSender.cpp \
</span><span class="cx"> DerivedSources/WebCore/JSRTCDTMFSender.h \
</span><span class="cx"> DerivedSources/WebCore/JSRTCDTMFToneChangeEvent.cpp \
</span><span class="lines">@@ -616,6 +618,8 @@
</span><span class="cx"> DerivedSources/WebCore/JSRTCIceCandidate.h \
</span><span class="cx"> DerivedSources/WebCore/JSRTCIceCandidateEvent.cpp \
</span><span class="cx"> DerivedSources/WebCore/JSRTCIceCandidateEvent.h \
</span><ins>+ DerivedSources/WebCore/JSRTCIceServer.cpp \
+ DerivedSources/WebCore/JSRTCIceServer.h \
</ins><span class="cx"> DerivedSources/WebCore/JSRTCPeerConnection.cpp \
</span><span class="cx"> DerivedSources/WebCore/JSRTCPeerConnection.h \
</span><span class="cx"> DerivedSources/WebCore/JSRTCSessionDescription.cpp \
</span><span class="lines">@@ -1223,6 +1227,7 @@
</span><span class="cx"> $(WebCore)/Modules/mediastream/NavigatorUserMediaError.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/NavigatorUserMediaErrorCallback.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl \
</span><ins>+ $(WebCore)/Modules/mediastream/RTCConfiguration.idl \
</ins><span class="cx"> $(WebCore)/Modules/mediastream/RTCDTMFSender.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCDTMFToneChangeEvent.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCDataChannel.idl \
</span><span class="lines">@@ -1230,6 +1235,7 @@
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCPeerConnectionErrorCallback.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCIceCandidate.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCIceCandidateEvent.idl \
</span><ins>+ $(WebCore)/Modules/mediastream/RTCIceServer.idl \
</ins><span class="cx"> $(WebCore)/Modules/mediastream/RTCPeerConnection.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCSessionDescription.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCSessionDescriptionCallback.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCConfigurationidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl (0 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * 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;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceServeridl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl (0 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+/*
+ * 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;
+};
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (165254 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -175,6 +175,7 @@
</span><span class="cx"> , m_iceGatheringState(IceGatheringStateNew)
</span><span class="cx"> , m_iceConnectionState(IceConnectionStateNew)
</span><span class="cx"> , m_scheduledEventTimer(this, &RTCPeerConnection::scheduledEventTimerFired)
</span><ins>+ , m_configuration(configuration)
</ins><span class="cx"> , m_stopped(false)
</span><span class="cx"> {
</span><span class="cx"> Document& document = toDocument(context);
</span><span class="lines">@@ -192,7 +193,7 @@
</span><span class="cx">
</span><span class="cx"> document.frame()->loader().client().dispatchWillStartUsingPeerConnectionHandler(m_peerHandler.get());
</span><span class="cx">
</span><del>- if (!m_peerHandler->initialize(configuration)) {
</del><ins>+ if (!m_peerHandler->initialize(m_configuration)) {
</ins><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -361,11 +362,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<RTCConfiguration> configuration = parseConfiguration(rtcConfiguration, ec);
</del><ins>+ m_configuration = parseConfiguration(rtcConfiguration, ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool valid = m_peerHandler->updateIce(configuration);
</del><ins>+ bool valid = m_peerHandler->updateIce(m_configuration);
</ins><span class="cx"> if (!valid)
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> }
</span><span class="lines">@@ -496,6 +497,11 @@
</span><span class="cx"> m_peerHandler->removeStream(stream->privateStream());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RTCConfiguration* RTCPeerConnection::getConfiguration() const
+{
+ return m_configuration.get();
+}
+
</ins><span class="cx"> MediaStreamVector RTCPeerConnection::getLocalStreams() const
</span><span class="cx"> {
</span><span class="cx"> return m_localStreams;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (165254 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -83,6 +83,8 @@
</span><span class="cx">
</span><span class="cx"> String iceConnectionState() const;
</span><span class="cx">
</span><ins>+ RTCConfiguration* getConfiguration() const;
+
</ins><span class="cx"> MediaStreamVector getLocalStreams() const;
</span><span class="cx">
</span><span class="cx"> MediaStreamVector getRemoteStreams() const;
</span><span class="lines">@@ -165,6 +167,8 @@
</span><span class="cx"> Timer<RTCPeerConnection> m_scheduledEventTimer;
</span><span class="cx"> Vector<RefPtr<Event>> m_scheduledEvents;
</span><span class="cx">
</span><ins>+ RefPtr<RTCConfiguration> m_configuration;
+
</ins><span class="cx"> bool m_stopped;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (165254 => 165255)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -62,6 +62,8 @@
</span><span class="cx"> sequence<MediaStream> getRemoteStreams();
</span><span class="cx"> MediaStream getStreamById(DOMString streamId);
</span><span class="cx">
</span><ins>+ RTCConfiguration getConfiguration();
+
</ins><span class="cx"> [StrictTypeChecking, RaisesException] void addStream(MediaStream stream);
</span><span class="cx"> [StrictTypeChecking, RaisesException] void removeStream(MediaStream stream);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>