<!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>[166003] 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/166003">166003</a></dd>
<dt>Author</dt> <dd>thiago.lacerda@openbossa.org</dd>
<dt>Date</dt> <dd>2014-03-20 14:19:03 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] Moving RTCConfiguration and RTCIceServer to Modules/mediastream
https://bugs.webkit.org/show_bug.cgi?id=130434
Reviewed by Eric Carlson.
Those classes are defined in WebRTC spec, so they should not be in platform layer.
Adding a platform implementation to be passed to handler classes.
* Modules/mediastream/RTCConfiguration.h: Copied from Source/WebCore/platform/mediastream/RTCConfiguration.h.
* Modules/mediastream/RTCIceServer.h: Copied from Source/WebCore/platform/mediastream/RTCIceServer.h.
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::RTCPeerConnection):
(WebCore::RTCPeerConnection::updateIce):
* WebCore.xcodeproj/project.pbxproj:
* platform/mediastream/RTCConfigurationPrivate.h: Added.
* platform/mediastream/RTCIceServerPrivate.h: Added.
* platform/mediastream/RTCPeerConnectionHandler.h:
* platform/mock/RTCPeerConnectionHandlerMock.cpp:
(WebCore::RTCPeerConnectionHandlerMock::initialize):
(WebCore::RTCPeerConnectionHandlerMock::updateIce):
* platform/mock/RTCPeerConnectionHandlerMock.h:</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="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerh">trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp">trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockh">trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCConfigurationh">trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceServerh">trunk/Source/WebCore/Modules/mediastream/RTCIceServer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCConfigurationPrivateh">trunk/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCIceServerPrivateh">trunk/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCConfigurationh">trunk/Source/WebCore/platform/mediastream/RTCConfiguration.h</a></li>
<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 (166002 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-20 21:17:51 UTC (rev 166002)
+++ trunk/Source/WebCore/ChangeLog 2014-03-20 21:19:03 UTC (rev 166003)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-03-20 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [WebRTC] Moving RTCConfiguration and RTCIceServer to Modules/mediastream
+ https://bugs.webkit.org/show_bug.cgi?id=130434
+
+ Reviewed by Eric Carlson.
+
+ Those classes are defined in WebRTC spec, so they should not be in platform layer.
+ Adding a platform implementation to be passed to handler classes.
+
+ * Modules/mediastream/RTCConfiguration.h: Copied from Source/WebCore/platform/mediastream/RTCConfiguration.h.
+ * Modules/mediastream/RTCIceServer.h: Copied from Source/WebCore/platform/mediastream/RTCIceServer.h.
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::RTCPeerConnection):
+ (WebCore::RTCPeerConnection::updateIce):
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/mediastream/RTCConfigurationPrivate.h: Added.
+ * platform/mediastream/RTCIceServerPrivate.h: Added.
+ * platform/mediastream/RTCPeerConnectionHandler.h:
+ * platform/mock/RTCPeerConnectionHandlerMock.cpp:
+ (WebCore::RTCPeerConnectionHandlerMock::initialize):
+ (WebCore::RTCPeerConnectionHandlerMock::updateIce):
+ * platform/mock/RTCPeerConnectionHandlerMock.h:
+
</ins><span class="cx"> 2014-03-20 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Unreviewed speculative build after my r165996.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCConfigurationhfromrev166002trunkSourceWebCoreplatformmediastreamRTCConfigurationh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h (from rev 166002, trunk/Source/WebCore/platform/mediastream/RTCConfiguration.h) (0 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h 2014-03-20 21:19:03 UTC (rev 166003)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+/*
+ * Copyright (C) 2012 Google 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.
+ * 3. Neither the name of Google Inc. nor the names of its contributors
+ * may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER 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 RTCConfiguration_h
+#define RTCConfiguration_h
+
+#if ENABLE(MEDIA_STREAM)
+
+#include "RTCConfigurationPrivate.h"
+#include "RTCIceServer.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class RTCConfiguration : public RefCounted<RTCConfiguration> {
+public:
+ static PassRefPtr<RTCConfiguration> create() { return adoptRef(new RTCConfiguration()); }
+ virtual ~RTCConfiguration() { }
+
+ void appendServer(PassRefPtr<RTCIceServer> server) { m_private->appendServer(server->privateServer()); }
+ size_t numberOfServers() { return m_private->numberOfServers(); }
+ PassRefPtr<RTCIceServer> server(size_t index)
+ {
+ RTCIceServerPrivate* server = m_private->server(index);
+ if (!server)
+ return nullptr;
+
+ return RTCIceServer::create(server);
+ }
+
+ const String& iceTransports() const { return m_private->iceTransports(); }
+ void setIceTransports(const String& iceTransports) { m_private->setIceTransports(iceTransports); }
+
+ const String& requestIdentity() const { return m_private->requestIdentity(); }
+ void setRequestIdentity(const String& requestIdentity) { m_private->setRequestIdentity(requestIdentity); }
+
+ Vector<RefPtr<RTCIceServer>> iceServers() const
+ {
+ Vector<RefPtr<RTCIceServer>> servers;
+ Vector<RefPtr<RTCIceServerPrivate>> privateServers = m_private->iceServers();
+
+ for (auto iter = privateServers.begin(); iter != privateServers.end(); ++iter)
+ servers.append(RTCIceServer::create(*iter));
+
+ return servers;
+ }
+
+ RTCConfigurationPrivate* privateConfiguration() { return m_private.get(); }
+
+private:
+ RTCConfiguration()
+ : m_private(RTCConfigurationPrivate::create())
+ {
+ }
+
+ RefPtr<RTCConfigurationPrivate> m_private;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
+
+#endif // RTCConfiguration_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceServerhfromrev166002trunkSourceWebCoreplatformmediastreamRTCIceServerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/mediastream/RTCIceServer.h (from rev 166002, trunk/Source/WebCore/platform/mediastream/RTCIceServer.h) (0 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceServer.h (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceServer.h 2014-03-20 21:19:03 UTC (rev 166003)
</span><span class="lines">@@ -0,0 +1,76 @@
</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 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 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 "RTCIceServerPrivate.h"
+#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));
+ }
+
+ static PassRefPtr<RTCIceServer> create(PassRefPtr<RTCIceServerPrivate> server)
+ {
+ return adoptRef(new RTCIceServer(server));
+ }
+
+ virtual ~RTCIceServer() { }
+
+ const Vector<String>& urls() { return m_private->urls(); }
+ const String& credential() { return m_private->credential(); }
+ const String& username() { return m_private->username(); }
+ RTCIceServerPrivate* privateServer() { return m_private.get(); }
+
+private:
+ RTCIceServer(const Vector<String>& urls, const String& credential, const String& username)
+ : m_private(RTCIceServerPrivate::create(urls, credential, username))
+ {
+ }
+
+ RTCIceServer(PassRefPtr<RTCIceServerPrivate> server)
+ : m_private(server)
+ {
+ }
+
+ RefPtr<RTCIceServerPrivate> m_private;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
+
+#endif // RTCIceServer_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (166002 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-03-20 21:17:51 UTC (rev 166002)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-03-20 21:19:03 UTC (rev 166003)
</span><span class="lines">@@ -193,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(m_configuration)) {
</del><ins>+ if (!m_peerHandler->initialize(m_configuration->privateConfiguration())) {
</ins><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool valid = m_peerHandler->updateIce(m_configuration);
</del><ins>+ bool valid = m_peerHandler->updateIce(m_configuration->privateConfiguration());
</ins><span class="cx"> if (!valid)
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (166002 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-20 21:17:51 UTC (rev 166002)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-20 21:19:03 UTC (rev 166003)
</span><span class="lines">@@ -259,7 +259,6 @@
</span><span class="cx"> 078E093817D16B2C00420AA1 /* MediaStreamSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9F17CF0AD400848E51 /* MediaStreamSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E093917D16B2C00420AA1 /* MediaStreamCreationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA017CF0AD400848E51 /* MediaStreamCreationClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E093A17D16E1C00420AA1 /* MediaConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9917CF0AD400848E51 /* MediaConstraints.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 078E093B17D16E1C00420AA1 /* RTCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA117CF0AD400848E51 /* RTCConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 078E093C17D16E1C00420AA1 /* RTCDataChannelHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA217CF0AD400848E51 /* RTCDataChannelHandler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E093D17D16E1C00420AA1 /* RTCDataChannelHandlerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA317CF0AD400848E51 /* RTCDataChannelHandlerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E093E17D16E1C00420AA1 /* RTCDTMFSenderHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA417CF0AD400848E51 /* RTCDTMFSenderHandler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -310,6 +309,10 @@
</span><span class="cx"> 07A6D1EC1491137700051D0C /* MediaFragmentURIParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 07A6D1EA1491137700051D0C /* MediaFragmentURIParser.h */; };
</span><span class="cx"> 07AA6B6B166D2C0700D45671 /* InbandTextTrackPrivateAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07AA6B6A166D019500D45671 /* InbandTextTrackPrivateAVFObjC.mm */; };
</span><span class="cx"> 07AA6B6C166D2C1300D45671 /* InbandTextTrackPrivateAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = 07AA6B69166D019500D45671 /* InbandTextTrackPrivateAVFObjC.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 07AB996918DA3C010018771E /* RTCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 07AB996518DA3C010018771E /* RTCConfiguration.h */; };
+ 07AB996B18DA3C010018771E /* RTCIceServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 07AB996718DA3C010018771E /* RTCIceServer.h */; };
+ 07AB996F18DA3C740018771E /* RTCConfigurationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07AB996D18DA3C740018771E /* RTCConfigurationPrivate.h */; };
+ 07AB997018DA3C740018771E /* RTCIceServerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07AB996E18DA3C740018771E /* RTCIceServerPrivate.h */; };
</ins><span class="cx"> 07B0113F1032242200FBDC33 /* AccessibilityMediaControls.h in Headers */ = {isa = PBXBuildFile; fileRef = 07B0113E1032242200FBDC33 /* AccessibilityMediaControls.h */; };
</span><span class="cx"> 07B442D6166C70B000556CAD /* InbandTextTrackPrivateAVF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07B442D4166C70B000556CAD /* InbandTextTrackPrivateAVF.cpp */; };
</span><span class="cx"> 07B442D7166C70B000556CAD /* InbandTextTrackPrivateAVF.h in Headers */ = {isa = PBXBuildFile; fileRef = 07B442D5166C70B000556CAD /* InbandTextTrackPrivateAVF.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -6961,7 +6964,6 @@
</span><span class="cx"> 07221B9E17CF0AD400848E51 /* MediaStreamSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamSource.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07221B9F17CF0AD400848E51 /* MediaStreamSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamSource.h; sourceTree = "<group>"; };
</span><span class="cx"> 07221BA017CF0AD400848E51 /* MediaStreamCreationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamCreationClient.h; sourceTree = "<group>"; };
</span><del>- 07221BA117CF0AD400848E51 /* RTCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCConfiguration.h; sourceTree = "<group>"; };
</del><span class="cx"> 07221BA217CF0AD400848E51 /* RTCDataChannelHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDataChannelHandler.h; sourceTree = "<group>"; };
</span><span class="cx"> 07221BA317CF0AD400848E51 /* RTCDataChannelHandlerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDataChannelHandlerClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 07221BA417CF0AD400848E51 /* RTCDTMFSenderHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDTMFSenderHandler.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -7088,6 +7090,12 @@
</span><span class="cx"> 07A6D1EA1491137700051D0C /* MediaFragmentURIParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaFragmentURIParser.h; sourceTree = "<group>"; };
</span><span class="cx"> 07AA6B69166D019500D45671 /* InbandTextTrackPrivateAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InbandTextTrackPrivateAVFObjC.h; path = objc/InbandTextTrackPrivateAVFObjC.h; sourceTree = "<group>"; };
</span><span class="cx"> 07AA6B6A166D019500D45671 /* InbandTextTrackPrivateAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = InbandTextTrackPrivateAVFObjC.mm; path = objc/InbandTextTrackPrivateAVFObjC.mm; sourceTree = "<group>"; };
</span><ins>+ 07AB996518DA3C010018771E /* RTCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCConfiguration.h; sourceTree = "<group>"; };
+ 07AB996618DA3C010018771E /* RTCConfiguration.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCConfiguration.idl; sourceTree = "<group>"; };
+ 07AB996718DA3C010018771E /* RTCIceServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceServer.h; sourceTree = "<group>"; };
+ 07AB996818DA3C010018771E /* RTCIceServer.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCIceServer.idl; sourceTree = "<group>"; };
+ 07AB996D18DA3C740018771E /* RTCConfigurationPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCConfigurationPrivate.h; sourceTree = "<group>"; };
+ 07AB996E18DA3C740018771E /* RTCIceServerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceServerPrivate.h; sourceTree = "<group>"; };
</ins><span class="cx"> 07B0113E1032242200FBDC33 /* AccessibilityMediaControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityMediaControls.h; sourceTree = "<group>"; };
</span><span class="cx"> 07B442D4166C70B000556CAD /* InbandTextTrackPrivateAVF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InbandTextTrackPrivateAVF.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07B442D5166C70B000556CAD /* InbandTextTrackPrivateAVF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InbandTextTrackPrivateAVF.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -14098,6 +14106,8 @@
</span><span class="cx"> 07221B6017CEC32700848E51 /* NavigatorUserMediaErrorCallback.idl */,
</span><span class="cx"> 07221B6117CEC32700848E51 /* NavigatorUserMediaSuccessCallback.h */,
</span><span class="cx"> 07221B6217CEC32700848E51 /* NavigatorUserMediaSuccessCallback.idl */,
</span><ins>+ 07AB996518DA3C010018771E /* RTCConfiguration.h */,
+ 07AB996618DA3C010018771E /* RTCConfiguration.idl */,
</ins><span class="cx"> 07221B6317CEC32700848E51 /* RTCDataChannel.cpp */,
</span><span class="cx"> 07221B6417CEC32700848E51 /* RTCDataChannel.h */,
</span><span class="cx"> 07221B6517CEC32700848E51 /* RTCDataChannel.idl */,
</span><span class="lines">@@ -14116,6 +14126,8 @@
</span><span class="cx"> 07221B7417CEC32700848E51 /* RTCIceCandidateEvent.cpp */,
</span><span class="cx"> 07221B7517CEC32700848E51 /* RTCIceCandidateEvent.h */,
</span><span class="cx"> 07221B7617CEC32700848E51 /* RTCIceCandidateEvent.idl */,
</span><ins>+ 07AB996718DA3C010018771E /* RTCIceServer.h */,
+ 07AB996818DA3C010018771E /* RTCIceServer.idl */,
</ins><span class="cx"> 07221B7717CEC32700848E51 /* RTCPeerConnection.cpp */,
</span><span class="cx"> 07221B7817CEC32700848E51 /* RTCPeerConnection.h */,
</span><span class="cx"> 07221B7917CEC32700848E51 /* RTCPeerConnection.idl */,
</span><span class="lines">@@ -14174,13 +14186,14 @@
</span><span class="cx"> 07FFDE66181AED420072D409 /* MediaStreamTrackPrivate.cpp */,
</span><span class="cx"> 07FFDE67181AED420072D409 /* MediaStreamTrackPrivate.h */,
</span><span class="cx"> 076306E217E22A43005A7C4E /* MediaStreamTrackSourcesRequestClient.h */,
</span><del>- 07221BA117CF0AD400848E51 /* RTCConfiguration.h */,
</del><ins>+ 07AB996D18DA3C740018771E /* RTCConfigurationPrivate.h */,
</ins><span class="cx"> 07221BA217CF0AD400848E51 /* RTCDataChannelHandler.h */,
</span><span class="cx"> 07221BA317CF0AD400848E51 /* RTCDataChannelHandlerClient.h */,
</span><span class="cx"> 07221BA417CF0AD400848E51 /* RTCDTMFSenderHandler.h */,
</span><span class="cx"> 07221BA517CF0AD400848E51 /* RTCDTMFSenderHandlerClient.h */,
</span><span class="cx"> 07221BA617CF0AD400848E51 /* RTCIceCandidateDescriptor.cpp */,
</span><span class="cx"> 07221BA717CF0AD400848E51 /* RTCIceCandidateDescriptor.h */,
</span><ins>+ 07AB996E18DA3C740018771E /* RTCIceServerPrivate.h */,
</ins><span class="cx"> 07221BA817CF0AD400848E51 /* RTCPeerConnectionHandler.cpp */,
</span><span class="cx"> 07221BA917CF0AD400848E51 /* RTCPeerConnectionHandler.h */,
</span><span class="cx"> 07221BAA17CF0AD400848E51 /* RTCPeerConnectionHandlerClient.h */,
</span><span class="lines">@@ -23526,6 +23539,7 @@
</span><span class="cx"> 85E711D40AC5D5350053270F /* DOMNotationInternal.h in Headers */,
</span><span class="cx"> 856C8AE40A912649005C687B /* DOMObject.h in Headers */,
</span><span class="cx"> BC53DA601143141A000D817E /* DOMObjectHashTableMap.h in Headers */,
</span><ins>+ 07AB997018DA3C740018771E /* RTCIceServerPrivate.h in Headers */,
</ins><span class="cx"> 85C7F5D00AAFB8D9004014DD /* DOMOverflowEvent.h in Headers */,
</span><span class="cx"> 85989DCF0ACC8BBD00A0BC51 /* DOMOverflowEventInternal.h in Headers */,
</span><span class="cx"> E1284BD61044A01E00EAEB52 /* DOMPageTransitionEvent.h in Headers */,
</span><span class="lines">@@ -25127,6 +25141,7 @@
</span><span class="cx"> 439046D812DA25E800AF80A2 /* RenderMathMLBlock.h in Headers */,
</span><span class="cx"> 439046DA12DA25E800AF80A2 /* RenderMathMLFenced.h in Headers */,
</span><span class="cx"> 439046DC12DA25E800AF80A2 /* RenderMathMLFraction.h in Headers */,
</span><ins>+ 07AB996F18DA3C740018771E /* RTCConfigurationPrivate.h in Headers */,
</ins><span class="cx"> 439046DE12DA25E800AF80A2 /* RenderMathMLMath.h in Headers */,
</span><span class="cx"> 439046E012DA25E800AF80A2 /* RenderMathMLOperator.h in Headers */,
</span><span class="cx"> 439046E212DA25E800AF80A2 /* RenderMathMLRoot.h in Headers */,
</span><span class="lines">@@ -25256,7 +25271,6 @@
</span><span class="cx"> A8CFF5E10A155A05000A4234 /* RootInlineBox.h in Headers */,
</span><span class="cx"> 49E911C90EF86D47009D0CAF /* RotateTransformOperation.h in Headers */,
</span><span class="cx"> A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */,
</span><del>- 078E093B17D16E1C00420AA1 /* RTCConfiguration.h in Headers */,
</del><span class="cx"> 078E091E17D14D1C00420AA1 /* RTCDataChannel.h in Headers */,
</span><span class="cx"> 078E091F17D14D1C00420AA1 /* RTCDataChannelEvent.h in Headers */,
</span><span class="cx"> 078E093C17D16E1C00420AA1 /* RTCDataChannelHandler.h in Headers */,
</span><span class="lines">@@ -25306,6 +25320,7 @@
</span><span class="cx"> 08A484780E5272C500C3FE76 /* ScriptElement.h in Headers */,
</span><span class="cx"> E11C9D9B0EB3681200E409DB /* ScriptExecutionContext.h in Headers */,
</span><span class="cx"> 41F066E40F64BCF600A07EAC /* ScriptGlobalObject.h in Headers */,
</span><ins>+ 07AB996B18DA3C010018771E /* RTCIceServer.h in Headers */,
</ins><span class="cx"> 9F3B947E12241758005304E7 /* ScriptHeapSnapshot.h in Headers */,
</span><span class="cx"> FD31603612B0267600C1A359 /* ScriptProcessorNode.h in Headers */,
</span><span class="cx"> 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */,
</span><span class="lines">@@ -25950,6 +25965,7 @@
</span><span class="cx"> 3FFFF9AE159D9B060020BBD5 /* ViewportStyleResolver.h in Headers */,
</span><span class="cx"> 8678D0BB1878E891003ABDE6 /* ViewState.h in Headers */,
</span><span class="cx"> 93309E20099E64920056E581 /* VisiblePosition.h in Headers */,
</span><ins>+ 07AB996918DA3C010018771E /* RTCConfiguration.h in Headers */,
</ins><span class="cx"> A883DF280F3D045D00F19BF6 /* VisibleSelection.h in Headers */,
</span><span class="cx"> 93309E1E099E64920056E581 /* VisibleUnits.h in Headers */,
</span><span class="cx"> 419BC2DF1685329900D64D6D /* VisitedLinkState.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCConfigurationh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/RTCConfiguration.h (166002 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCConfiguration.h 2014-03-20 21:17:51 UTC (rev 166002)
+++ trunk/Source/WebCore/platform/mediastream/RTCConfiguration.h 2014-03-20 21:19:03 UTC (rev 166003)
</span><span class="lines">@@ -1,85 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google 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.
- * 3. Neither the name of Google Inc. nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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 RTCConfiguration_h
-#define RTCConfiguration_h
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "RTCIceServer.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class RTCConfiguration : public RefCounted<RTCConfiguration> {
-public:
- static PassRefPtr<RTCConfiguration> create() { return adoptRef(new RTCConfiguration()); }
- virtual ~RTCConfiguration() { }
-
- void appendServer(PassRefPtr<RTCIceServer> server) { m_servers.append(server); }
- size_t numberOfServers() { return m_servers.size(); }
- RTCIceServer* server(size_t index) { return m_servers[index].get(); }
-
- const String& iceTransports() const { return m_iceTransports; }
- void setIceTransports(const String& iceTransports)
- {
- if (iceTransports == "none" || iceTransports == "relay" || iceTransports == "all")
- m_iceTransports = iceTransports;
- }
-
- const String& requestIdentity() const { return m_requestIdentity; }
- void setRequestIdentity(const String& requestIdentity)
- {
- if (requestIdentity == "yes" || requestIdentity == "no" || requestIdentity == "ifconfigured")
- m_requestIdentity = requestIdentity;
- }
-
- Vector<RefPtr<RTCIceServer>> iceServers() const { return m_servers; }
-
- private:
- RTCConfiguration()
- : m_iceTransports("all")
- , m_requestIdentity("ifconfigured")
- {
- }
-
- Vector<RefPtr<RTCIceServer>> m_servers;
- String m_iceTransports;
- String m_requestIdentity;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
-
-#endif // RTCConfiguration_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCConfigurationPrivatehfromrev166002trunkSourceWebCoreplatformmediastreamRTCIceServerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h (from rev 166002, trunk/Source/WebCore/platform/mediastream/RTCIceServer.h) (0 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h 2014-03-20 21:19:03 UTC (rev 166003)
</span><span class="lines">@@ -0,0 +1,80 @@
</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 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 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 RTCConfigurationPrivate_h
+#define RTCConfigurationPrivate_h
+
+#if ENABLE(MEDIA_STREAM)
+
+#include "RTCIceServerPrivate.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class RTCConfigurationPrivate : public RefCounted<RTCConfigurationPrivate> {
+public:
+ static PassRefPtr<RTCConfigurationPrivate> create() { return adoptRef(new RTCConfigurationPrivate()); }
+ virtual ~RTCConfigurationPrivate() { }
+
+ void appendServer(PassRefPtr<RTCIceServerPrivate> server) { m_privateServers.append(server); }
+ size_t numberOfServers() { return m_privateServers.size(); }
+ RTCIceServerPrivate* server(size_t index) { return m_privateServers[index].get(); }
+
+ const String& iceTransports() const { return m_iceTransports; }
+ void setIceTransports(const String& iceTransports)
+ {
+ if (iceTransports == "none" || iceTransports == "relay" || iceTransports == "all")
+ m_iceTransports = iceTransports;
+ }
+
+ const String& requestIdentity() const { return m_requestIdentity; }
+ void setRequestIdentity(const String& requestIdentity)
+ {
+ if (requestIdentity == "yes" || requestIdentity == "no" || requestIdentity == "ifconfigured")
+ m_requestIdentity = requestIdentity;
+ }
+
+ Vector<RefPtr<RTCIceServerPrivate>> iceServers() const { return m_privateServers; }
+
+private:
+ RTCConfigurationPrivate()
+ : m_iceTransports("all")
+ , m_requestIdentity("ifconfigured")
+ {
+ }
+
+ Vector<RefPtr<RTCIceServerPrivate>> m_privateServers;
+ String m_iceTransports;
+ String m_requestIdentity;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
+
+#endif // RTCConfigurationPrivate_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCIceServerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/RTCIceServer.h (166002 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCIceServer.h 2014-03-20 21:17:51 UTC (rev 166002)
+++ trunk/Source/WebCore/platform/mediastream/RTCIceServer.h 2014-03-20 21:19:03 UTC (rev 166003)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-/*
- * 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 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 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCIceServerPrivatehfromrev166002trunkSourceWebCoreplatformmediastreamRTCIceServerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h (from rev 166002, trunk/Source/WebCore/platform/mediastream/RTCIceServer.h) (0 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h 2014-03-20 21:19:03 UTC (rev 166003)
</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 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 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 RTCIceServerPrivate_h
+#define RTCIceServerPrivate_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 RTCIceServerPrivate : public RefCounted<RTCIceServerPrivate> {
+public:
+ static PassRefPtr<RTCIceServerPrivate> create(const Vector<String>& urls, const String& credential, const String& username)
+ {
+ return adoptRef(new RTCIceServerPrivate(urls, credential, username));
+ }
+ virtual ~RTCIceServerPrivate() { }
+
+ const Vector<String>& urls() { return m_urls; }
+ const String& credential() { return m_credential; }
+ const String& username() { return m_username; }
+
+private:
+ RTCIceServerPrivate(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 // RTCIceServerPrivate_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h (166002 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h 2014-03-20 21:17:51 UTC (rev 166002)
+++ trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h 2014-03-20 21:19:03 UTC (rev 166003)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class MediaStreamSource;
</span><del>-class RTCConfiguration;
</del><ins>+class RTCConfigurationPrivate;
</ins><span class="cx"> class RTCDTMFSenderHandler;
</span><span class="cx"> class RTCDataChannelHandler;
</span><span class="cx"> class RTCIceCandidateDescriptor;
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> static const AtomicString& incompatibleSessionDescriptionErrorName();
</span><span class="cx"> static const AtomicString& internalErrorName();
</span><span class="cx">
</span><del>- virtual bool initialize(PassRefPtr<RTCConfiguration>) = 0;
</del><ins>+ virtual bool initialize(PassRefPtr<RTCConfigurationPrivate>) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void createOffer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferOptions>) = 0;
</span><span class="cx"> virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferAnswerOptions>) = 0;
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> virtual void setRemoteDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) = 0;
</span><span class="cx"> virtual PassRefPtr<RTCSessionDescriptionDescriptor> localDescription() = 0;
</span><span class="cx"> virtual PassRefPtr<RTCSessionDescriptionDescriptor> remoteDescription() = 0;
</span><del>- virtual bool updateIce(PassRefPtr<RTCConfiguration>) = 0;
</del><ins>+ virtual bool updateIce(PassRefPtr<RTCConfigurationPrivate>) = 0;
</ins><span class="cx"> virtual bool addIceCandidate(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCIceCandidateDescriptor>) = 0;
</span><span class="cx"> virtual bool addStream(PassRefPtr<MediaStreamPrivate>) = 0;
</span><span class="cx"> virtual void removeStream(PassRefPtr<MediaStreamPrivate>) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp (166002 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2014-03-20 21:17:51 UTC (rev 166002)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2014-03-20 21:19:03 UTC (rev 166003)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RTCPeerConnectionHandlerMock::initialize(PassRefPtr<RTCConfiguration>)
</del><ins>+bool RTCPeerConnectionHandlerMock::initialize(PassRefPtr<RTCConfigurationPrivate>)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<IceConnectionNotifier> notifier = adoptRef(new IceConnectionNotifier(m_client, RTCPeerConnectionHandlerClient::IceConnectionStateCompleted, RTCPeerConnectionHandlerClient::IceGatheringStateComplete));
</span><span class="cx"> m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> return m_remoteSessionDescription;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RTCPeerConnectionHandlerMock::updateIce(PassRefPtr<RTCConfiguration>)
</del><ins>+bool RTCPeerConnectionHandlerMock::updateIce(PassRefPtr<RTCConfigurationPrivate>)
</ins><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h (166002 => 166003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h 2014-03-20 21:17:51 UTC (rev 166002)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h 2014-03-20 21:19:03 UTC (rev 166003)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~RTCPeerConnectionHandlerMock() { }
</span><span class="cx">
</span><del>- virtual bool initialize(PassRefPtr<RTCConfiguration>) override;
</del><ins>+ virtual bool initialize(PassRefPtr<RTCConfigurationPrivate>) override;
</ins><span class="cx">
</span><span class="cx"> virtual void createOffer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferOptions>) override;
</span><span class="cx"> virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferAnswerOptions>) override;
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> virtual void setRemoteDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) override;
</span><span class="cx"> virtual PassRefPtr<RTCSessionDescriptionDescriptor> localDescription() override;
</span><span class="cx"> virtual PassRefPtr<RTCSessionDescriptionDescriptor> remoteDescription() override;
</span><del>- virtual bool updateIce(PassRefPtr<RTCConfiguration>) override;
</del><ins>+ virtual bool updateIce(PassRefPtr<RTCConfigurationPrivate>) override;
</ins><span class="cx"> virtual bool addIceCandidate(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCIceCandidateDescriptor>) override;
</span><span class="cx"> virtual bool addStream(PassRefPtr<MediaStreamPrivate>) override;
</span><span class="cx"> virtual void removeStream(PassRefPtr<MediaStreamPrivate>) override;
</span></span></pre>
</div>
</div>
</body>
</html>