<!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>[165247] trunk/Source/WebCore</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/165247">165247</a></dd>
<dt>Author</dt> <dd>thiago.lacerda@openbossa.org</dd>
<dt>Date</dt> <dd>2014-03-06 21:41:16 -0800 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] Updating RTCIceServer to match spec
https://bugs.webkit.org/show_bug.cgi?id=129844
Reviewed by Eric Carlson.
Move RTCIceServer from RTCConfiguration to its own file.
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::validateIceServerURL):
(WebCore::processIceServer):
* platform/mediastream/RTCConfiguration.h:
(WebCore::RTCConfiguration::iceServers):
* platform/mediastream/RTCIceServer.h: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCConfigurationh">trunk/Source/WebCore/platform/mediastream/RTCConfiguration.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCIceServerh">trunk/Source/WebCore/platform/mediastream/RTCIceServer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165246 => 165247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-07 05:06:04 UTC (rev 165246)
+++ trunk/Source/WebCore/ChangeLog 2014-03-07 05:41:16 UTC (rev 165247)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-06 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [WebRTC] Updating RTCIceServer to match spec
+ https://bugs.webkit.org/show_bug.cgi?id=129844
+
+ Reviewed by Eric Carlson.
+
+ Move RTCIceServer from RTCConfiguration to its own file.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::validateIceServerURL):
+ (WebCore::processIceServer):
+ * platform/mediastream/RTCConfiguration.h:
+ (WebCore::RTCConfiguration::iceServers):
+ * platform/mediastream/RTCIceServer.h: Added.
+
</ins><span class="cx"> 2014-03-06 Hyowon Kim <hw1008.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Move EvasGL classes from WebKit to WebCore namespace.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (165246 => 165247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-03-07 05:06:04 UTC (rev 165246)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-03-07 05:41:16 UTC (rev 165247)
</span><span class="lines">@@ -66,13 +66,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static bool appendIceServer(const String& iceURL, const String& credential, const String& username, RTCConfiguration* rtcConfiguration)
</del><ins>+static bool validateIceServerURL(const String& iceURL)
</ins><span class="cx"> {
</span><span class="cx"> URL url(URL(), iceURL);
</span><span class="cx"> if (url.isEmpty() || !url.isValid() || !(url.protocolIs("turn") || url.protocolIs("stun")))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- rtcConfiguration->appendServer(RTCIceServer::create(url, credential, username));
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -92,19 +91,23 @@
</span><span class="cx"> // So we convert to a string always, which converts a sequence to a string in the format: "foo, bar, ..",
</span><span class="cx"> // then checking for a comma in the string assures that a string was a sequence and then we convert
</span><span class="cx"> // it to a sequence safely.
</span><ins>+ if (urlString.isEmpty())
+ return INVALID_ACCESS_ERR;
+
</ins><span class="cx"> if (urlString.find(',') != notFound && iceServer.get("urls", urlsList) && urlsList.size()) {
</span><span class="cx"> for (auto iter = urlsList.begin(); iter != urlsList.end(); ++iter) {
</span><del>- if (!appendIceServer((*iter), credential, username, rtcConfiguration))
</del><ins>+ if (!validateIceServerURL(*iter))
</ins><span class="cx"> return INVALID_ACCESS_ERR;
</span><span class="cx"> }
</span><ins>+ } else {
+ if (!validateIceServerURL(urlString))
+ return INVALID_ACCESS_ERR;
</ins><span class="cx">
</span><del>- return 0;
</del><ins>+ urlsList.append(urlString);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!urlString.isEmpty() && appendIceServer(urlString, credential, username, rtcConfiguration))
- return 0;
-
- return INVALID_ACCESS_ERR;
</del><ins>+ rtcConfiguration->appendServer(RTCIceServer::create(urlsList, credential, username));
+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<RTCConfiguration> RTCPeerConnection::parseConfiguration(const Dictionary& configuration, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCConfiguration.h (165246 => 165247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCConfiguration.h 2014-03-07 05:06:04 UTC (rev 165246)
+++ trunk/Source/WebCore/platform/mediastream/RTCConfiguration.h 2014-03-07 05:41:16 UTC (rev 165247)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><del>-#include "URL.h"
</del><ins>+#include "RTCIceServer.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -41,31 +41,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class RTCIceServer : public RefCounted<RTCIceServer> {
-public:
- static PassRefPtr<RTCIceServer> create(const URL& uri, const String& credential, const String& username)
- {
- return adoptRef(new RTCIceServer(uri, credential, username));
- }
- virtual ~RTCIceServer() { }
-
- const URL& uri() { return m_uri; }
- const String& credential() { return m_credential; }
- const String& username() { return m_username; }
-
-private:
- RTCIceServer(const URL& uri, const String& credential, const String& username)
- : m_uri(uri)
- , m_credential(credential)
- , m_username(username)
- {
- }
-
- URL m_uri;
- String m_credential;
- String m_username;
-};
-
</del><span class="cx"> class RTCConfiguration : public RefCounted<RTCConfiguration> {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<RTCConfiguration> create() { return adoptRef(new RTCConfiguration()); }
</span><span class="lines">@@ -74,12 +49,14 @@
</span><span class="cx"> void appendServer(PassRefPtr<RTCIceServer> server) { m_servers.append(server); }
</span><span class="cx"> size_t numberOfServers() { return m_servers.size(); }
</span><span class="cx"> RTCIceServer* server(size_t index) { return m_servers[index].get(); }
</span><ins>+
</ins><span class="cx"> const String& iceTransports() const { return m_iceTransports; }
</span><span class="cx"> void setIceTransports(const String& iceTransports)
</span><span class="cx"> {
</span><span class="cx"> if (iceTransports == "none" || iceTransports == "relay" || iceTransports == "all")
</span><span class="cx"> m_iceTransports = iceTransports;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> const String& requestIdentity() const { return m_requestIdentity; }
</span><span class="cx"> void setRequestIdentity(const String& requestIdentity)
</span><span class="cx"> {
</span><span class="lines">@@ -87,6 +64,8 @@
</span><span class="cx"> m_requestIdentity = requestIdentity;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Vector<RefPtr<RTCIceServer>> iceServers() const { return m_servers; }
+
</ins><span class="cx"> private:
</span><span class="cx"> RTCConfiguration()
</span><span class="cx"> : m_iceTransports("all")
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCIceServerh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/mediastream/RTCIceServer.h (0 => 165247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCIceServer.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RTCIceServer.h 2014-03-07 05:41:16 UTC (rev 165247)
</span><span class="lines">@@ -0,0 +1,67 @@
</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.
+ */
+
+#ifndef RTCIceServer_h
+#define RTCIceServer_h
+
+#if ENABLE(MEDIA_STREAM)
+
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class RTCIceServer : public RefCounted<RTCIceServer> {
+public:
+ static PassRefPtr<RTCIceServer> create(const Vector<String>& urls, const String& credential, const String& username)
+ {
+ return adoptRef(new RTCIceServer(urls, credential, username));
+ }
+ virtual ~RTCIceServer() { }
+
+ const Vector<String>& urls() { return m_urls; }
+ const String& credential() { return m_credential; }
+ const String& username() { return m_username; }
+
+private:
+ RTCIceServer(const Vector<String>& urls, const String& credential, const String& username)
+ : m_urls(urls)
+ , m_credential(credential)
+ , m_username(username)
+ {
+ }
+
+ Vector<String> m_urls;
+ String m_credential;
+ String m_username;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
+
+#endif // RTCIceServer_h
</ins></span></pre>
</div>
</div>
</body>
</html>