<!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>[207818] 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/207818">207818</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-25 08:02:39 -0700 (Tue, 25 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>MediaEndpointConfiguration does not need to be refcounted
https://bugs.webkit.org/show_bug.cgi?id=163888
Patch by Youenn Fablet <youenn@apple.com> on 2016-10-25
Reviewed by Eric Carlson.
No change of behavior.
Updating MediaEndpoint to take a MediaEndpointConfiguration&& instead of a RefPtr<MediaEndpointConfiguration>&&.
This allows ensuring that the configuration is not null and removes the need to ref-count it.
Removing ref-counting from MediaEndpointConfiguration and its related IceServer that is now a struct.
Updated MediaEndpointOwr and mock implementations accordingly.
* Modules/mediastream/MediaEndpointPeerConnection.cpp:
(WebCore::MediaEndpointPeerConnection::setConfiguration):
* platform/mediastream/MediaEndpoint.cpp:
* platform/mediastream/MediaEndpoint.h:
* platform/mediastream/MediaEndpointConfiguration.cpp:
(WebCore::MediaEndpointConfiguration::MediaEndpointConfiguration):
* platform/mediastream/MediaEndpointConfiguration.h:
(WebCore::MediaEndpointConfiguration::iceServers):
* platform/mediastream/openwebrtc/MediaEndpointOwr.cpp:
(WebCore::MediaEndpointOwr::setConfiguration):
(WebCore::MediaEndpointOwr::ensureTransportAgentAndTransceivers):
* platform/mediastream/openwebrtc/MediaEndpointOwr.h:
* platform/mock/MockMediaEndpoint.cpp:
* platform/mock/MockMediaEndpoint.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaEndpointcpp">trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaEndpointh">trunk/Source/WebCore/platform/mediastream/MediaEndpoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaEndpointConfigurationcpp">trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaEndpointConfigurationh">trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcMediaEndpointOwrcpp">trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcMediaEndpointOwrh">trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockMediaEndpointcpp">trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockMediaEndpointh">trunk/Source/WebCore/platform/mock/MockMediaEndpoint.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207817 => 207818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-25 14:16:15 UTC (rev 207817)
+++ trunk/Source/WebCore/ChangeLog 2016-10-25 15:02:39 UTC (rev 207818)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2016-10-25 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><ins>+ MediaEndpointConfiguration does not need to be refcounted
+ https://bugs.webkit.org/show_bug.cgi?id=163888
+
+ Reviewed by Eric Carlson.
+
+ No change of behavior.
+
+ Updating MediaEndpoint to take a MediaEndpointConfiguration&& instead of a RefPtr<MediaEndpointConfiguration>&&.
+ This allows ensuring that the configuration is not null and removes the need to ref-count it.
+
+ Removing ref-counting from MediaEndpointConfiguration and its related IceServer that is now a struct.
+ Updated MediaEndpointOwr and mock implementations accordingly.
+
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ (WebCore::MediaEndpointPeerConnection::setConfiguration):
+ * platform/mediastream/MediaEndpoint.cpp:
+ * platform/mediastream/MediaEndpoint.h:
+ * platform/mediastream/MediaEndpointConfiguration.cpp:
+ (WebCore::MediaEndpointConfiguration::MediaEndpointConfiguration):
+ * platform/mediastream/MediaEndpointConfiguration.h:
+ (WebCore::MediaEndpointConfiguration::iceServers):
+ * platform/mediastream/openwebrtc/MediaEndpointOwr.cpp:
+ (WebCore::MediaEndpointOwr::setConfiguration):
+ (WebCore::MediaEndpointOwr::ensureTransportAgentAndTransceivers):
+ * platform/mediastream/openwebrtc/MediaEndpointOwr.h:
+ * platform/mock/MockMediaEndpoint.cpp:
+ * platform/mock/MockMediaEndpoint.h:
+
+2016-10-25 Youenn Fablet <youenn@apple.com>
+
</ins><span class="cx"> CachedResourceLoader should set headers of the HTTP request prior checking for the cache
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163103
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (207817 => 207818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-10-25 14:16:15 UTC (rev 207817)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-10-25 15:02:39 UTC (rev 207818)
</span><span class="lines">@@ -614,11 +614,19 @@
</span><span class="cx">
</span><span class="cx"> void MediaEndpointPeerConnection::setConfiguration(RTCConfiguration& configuration)
</span><span class="cx"> {
</span><del>- Vector<RefPtr<IceServerInfo>> iceServers;
- for (auto& server : configuration.iceServers())
- iceServers.append(IceServerInfo::create(server->urls(), server->credential(), server->username()));
</del><ins>+ Vector<MediaEndpointConfiguration::IceServerInfo> iceServers;
+ if (configuration.iceServers().size()) {
+ iceServers.reserveInitialCapacity(configuration.iceServers().size());
+ for (auto& server : configuration.iceServers()) {
+ Vector<URL> urls;
+ urls.reserveInitialCapacity(server->urls().size());
+ for (auto& url : server->urls())
+ urls.uncheckedAppend(URL(URL(), url));
+ iceServers.uncheckedAppend(MediaEndpointConfiguration::IceServerInfo { WTFMove(urls), server->credential(), server->username() });
+ }
+ }
</ins><span class="cx">
</span><del>- m_mediaEndpoint->setConfiguration(MediaEndpointConfiguration::create(iceServers, configuration.iceTransportPolicy(), configuration.bundlePolicy()));
</del><ins>+ m_mediaEndpoint->setConfiguration({ WTFMove(iceServers), configuration.iceTransportPolicy(), configuration.bundlePolicy() });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaEndpointPeerConnection::addIceCandidate(RTCIceCandidate& rtcCandidate, PeerConnection::VoidPromise&& promise)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp (207817 => 207818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp 2016-10-25 14:16:15 UTC (rev 207817)
+++ trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp 2016-10-25 15:02:39 UTC (rev 207818)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> public:
</span><span class="cx"> EmptyMediaEndpoint(MediaEndpointClient&) { }
</span><span class="cx">
</span><del>- void setConfiguration(RefPtr<MediaEndpointConfiguration>&&) override { }
</del><ins>+ void setConfiguration(MediaEndpointConfiguration&&) override { }
</ins><span class="cx">
</span><span class="cx"> void generateDtlsInfo() override { }
</span><span class="cx"> MediaPayloadVector getDefaultAudioPayloads() override { return MediaPayloadVector(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaEndpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpoint.h (207817 => 207818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaEndpoint.h 2016-10-25 14:16:15 UTC (rev 207817)
+++ trunk/Source/WebCore/platform/mediastream/MediaEndpoint.h 2016-10-25 15:02:39 UTC (rev 207818)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> using IceTransportState = PeerConnectionStates::IceTransportState;
</span><span class="cx">
</span><del>- virtual void setConfiguration(RefPtr<MediaEndpointConfiguration>&&) = 0;
</del><ins>+ virtual void setConfiguration(MediaEndpointConfiguration&&) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void generateDtlsInfo() = 0;
</span><span class="cx"> virtual MediaPayloadVector getDefaultAudioPayloads() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaEndpointConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.cpp (207817 => 207818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.cpp 2016-10-25 14:16:15 UTC (rev 207817)
+++ trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.cpp 2016-10-25 15:02:39 UTC (rev 207818)
</span><span class="lines">@@ -35,19 +35,17 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-IceServerInfo::IceServerInfo(const Vector<String>& urls, const String& credential, const String& username)
- : m_credential(credential)
- , m_username(username)
</del><ins>+MediaEndpointConfiguration::MediaEndpointConfiguration(Vector<IceServerInfo>&& iceServers, IceTransportPolicy iceTransportPolicy, BundlePolicy bundlePolicy)
+ : iceServers(WTFMove(iceServers))
+ , iceTransportPolicy(iceTransportPolicy)
+ , bundlePolicy(bundlePolicy)
</ins><span class="cx"> {
</span><del>- m_urls.reserveCapacity(urls.size());
- for (auto& url : urls)
- m_urls.append(URL(URL(), url));
</del><span class="cx"> }
</span><span class="cx">
</span><del>-MediaEndpointConfiguration::MediaEndpointConfiguration(Vector<RefPtr<IceServerInfo>>& iceServers, IceTransportPolicy iceTransportPolicy, BundlePolicy bundlePolicy)
- : m_iceServers(iceServers)
- , m_iceTransportPolicy(iceTransportPolicy)
- , m_bundlePolicy(bundlePolicy)
</del><ins>+MediaEndpointConfiguration::IceServerInfo::IceServerInfo(Vector<URL>&& urls, const String& credential, const String& username)
+ : urls(WTFMove(urls))
+ , credential(credential)
+ , username(username)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaEndpointConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h (207817 => 207818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h 2016-10-25 14:16:15 UTC (rev 207817)
+++ trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h 2016-10-25 15:02:39 UTC (rev 207818)
</span><span class="lines">@@ -28,64 +28,37 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MediaEndpointConfiguration_h
-#define MediaEndpointConfiguration_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="cx"> #include "PeerConnectionStates.h"
</span><span class="cx"> #include "URL.h"
</span><del>-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class IceServerInfo : public RefCounted<IceServerInfo> {
-public:
- static RefPtr<IceServerInfo> create(const Vector<String>& urls, const String& credential, const String& username)
- {
- return adoptRef(new IceServerInfo(urls, credential, username));
- }
- virtual ~IceServerInfo() { }
</del><ins>+struct MediaEndpointConfiguration {
+ // FIXME: We might be able to remove these constructors once all compilers can handle without it (see https://bugs.webkit.org/show_bug.cgi?id=163255#c15)
+ struct IceServerInfo {
+ Vector<URL> urls;
+ String credential;
+ String username;
</ins><span class="cx">
</span><del>- const Vector<URL>& urls() const { return m_urls; }
- const String& credential() const { return m_credential; }
- const String& username() const { return m_username; }
</del><ins>+ IceServerInfo(Vector<URL>&&, const String&, const String&);
+ };
</ins><span class="cx">
</span><del>-private:
- IceServerInfo(const Vector<String>& urls, const String& credential, const String& username);
-
- Vector<URL> m_urls;
- String m_credential;
- String m_username;
-};
-
-class MediaEndpointConfiguration : public RefCounted<MediaEndpointConfiguration> {
-public:
</del><span class="cx"> using IceTransportPolicy = PeerConnectionStates::IceTransportPolicy;
</span><span class="cx"> using BundlePolicy = PeerConnectionStates::BundlePolicy;
</span><span class="cx">
</span><del>- static RefPtr<MediaEndpointConfiguration> create(Vector<RefPtr<IceServerInfo>>& iceServers, IceTransportPolicy iceTransportPolicy, BundlePolicy bundlePolicy)
- {
- return adoptRef(new MediaEndpointConfiguration(iceServers, iceTransportPolicy, bundlePolicy));
- }
</del><ins>+ MediaEndpointConfiguration(Vector<IceServerInfo>&&, IceTransportPolicy, BundlePolicy);
</ins><span class="cx">
</span><del>- const Vector<RefPtr<IceServerInfo>>& iceServers() const { return m_iceServers; }
- IceTransportPolicy iceTransportPolicy() const { return m_iceTransportPolicy; }
- BundlePolicy bundlePolicy() const { return m_bundlePolicy; }
-
-private:
- MediaEndpointConfiguration(Vector<RefPtr<IceServerInfo>>&, IceTransportPolicy, BundlePolicy);
-
- Vector<RefPtr<IceServerInfo>> m_iceServers;
- IceTransportPolicy m_iceTransportPolicy;
- BundlePolicy m_bundlePolicy;
</del><ins>+ Vector<IceServerInfo> iceServers;
+ IceTransportPolicy iceTransportPolicy;
+ BundlePolicy bundlePolicy;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // MediaEndpointConfiguration_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcMediaEndpointOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp (207817 => 207818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp 2016-10-25 14:16:15 UTC (rev 207817)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp 2016-10-25 15:02:39 UTC (rev 207818)
</span><span class="lines">@@ -89,9 +89,9 @@
</span><span class="cx"> g_regex_unref(m_helperServerRegEx);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaEndpointOwr::setConfiguration(RefPtr<MediaEndpointConfiguration>&& configuration)
</del><ins>+void MediaEndpointOwr::setConfiguration(MediaEndpointConfiguration&& configuration)
</ins><span class="cx"> {
</span><del>- m_configuration = configuration;
</del><ins>+ m_configuration = WTFMove(configuration);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void cryptoDataCallback(gchar* privateKey, gchar* certificate, gchar* fingerprint, gchar* fingerprintFunction, gpointer data)
</span><span class="lines">@@ -552,8 +552,9 @@
</span><span class="cx"> if (!m_transportAgent) {
</span><span class="cx"> m_transportAgent = owr_transport_agent_new(false);
</span><span class="cx">
</span><del>- for (auto& server : m_configuration->iceServers()) {
- for (auto& webkitUrl : server->urls()) {
</del><ins>+ ASSERT(m_configuration);
+ for (auto& server : m_configuration->iceServers) {
+ for (auto& webkitUrl : server.urls) {
</ins><span class="cx"> HelperServerUrl url;
</span><span class="cx"> // WebKit's URL class can't handle ICE helper server urls properly
</span><span class="cx"> parseHelperServerUrl(*m_helperServerRegEx, webkitUrl, url);
</span><span class="lines">@@ -570,7 +571,7 @@
</span><span class="cx">
</span><span class="cx"> owr_transport_agent_add_helper_server(m_transportAgent, serverType,
</span><span class="cx"> url.host.ascii().data(), port,
</span><del>- server->username().ascii().data(), server->credential().ascii().data());
</del><ins>+ server.username.ascii().data(), server.credential.ascii().data());
</ins><span class="cx"> } else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcMediaEndpointOwrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.h (207817 => 207818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.h 2016-10-25 14:16:15 UTC (rev 207817)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.h 2016-10-25 15:02:39 UTC (rev 207818)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> MediaEndpointOwr(MediaEndpointClient&);
</span><span class="cx"> ~MediaEndpointOwr();
</span><span class="cx">
</span><del>- void setConfiguration(RefPtr<MediaEndpointConfiguration>&&) override;
</del><ins>+ void setConfiguration(MediaEndpointConfiguration&&) override;
</ins><span class="cx">
</span><span class="cx"> void generateDtlsInfo() override;
</span><span class="cx"> MediaPayloadVector getDefaultAudioPayloads() override;
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> void ensureTransportAgentAndTransceivers(bool isInitiator, const Vector<TransceiverConfig>&);
</span><span class="cx"> void internalAddRemoteCandidate(OwrSession*, IceCandidate&, const String& ufrag, const String& password);
</span><span class="cx">
</span><del>- RefPtr<MediaEndpointConfiguration> m_configuration;
</del><ins>+ Optional<MediaEndpointConfiguration> m_configuration;
</ins><span class="cx"> GRegex* m_helperServerRegEx;
</span><span class="cx">
</span><span class="cx"> OwrTransportAgent* m_transportAgent;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp (207817 => 207818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp 2016-10-25 14:16:15 UTC (rev 207817)
+++ trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp 2016-10-25 15:02:39 UTC (rev 207818)
</span><span class="lines">@@ -63,11 +63,6 @@
</span><span class="cx"> stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MockMediaEndpoint::setConfiguration(RefPtr<MediaEndpointConfiguration>&& configuration)
-{
- UNUSED_PARAM(configuration);
-}
-
</del><span class="cx"> void MockMediaEndpoint::generateDtlsInfo()
</span><span class="cx"> {
</span><span class="cx"> callOnMainThread([this]() {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockMediaEndpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockMediaEndpoint.h (207817 => 207818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockMediaEndpoint.h 2016-10-25 14:16:15 UTC (rev 207817)
+++ trunk/Source/WebCore/platform/mock/MockMediaEndpoint.h 2016-10-25 15:02:39 UTC (rev 207818)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MockMediaEndpoint : public MediaEndpoint {
</del><ins>+class MockMediaEndpoint final : public MediaEndpoint {
</ins><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT static std::unique_ptr<MediaEndpoint> create(MediaEndpointClient&);
</span><span class="cx">
</span><span class="lines">@@ -45,25 +45,25 @@
</span><span class="cx"> MockMediaEndpoint(MediaEndpointClient&);
</span><span class="cx"> ~MockMediaEndpoint();
</span><span class="cx">
</span><del>- void setConfiguration(RefPtr<MediaEndpointConfiguration>&&) override;
</del><ins>+ void setConfiguration(MediaEndpointConfiguration&&) final { };
</ins><span class="cx">
</span><del>- void generateDtlsInfo() override;
- MediaPayloadVector getDefaultAudioPayloads() override;
- MediaPayloadVector getDefaultVideoPayloads() override;
- MediaPayloadVector filterPayloads(const MediaPayloadVector& remotePayloads, const MediaPayloadVector& defaultPayloads) override;
</del><ins>+ void generateDtlsInfo() final;
+ MediaPayloadVector getDefaultAudioPayloads() final;
+ MediaPayloadVector getDefaultVideoPayloads() final;
+ MediaPayloadVector filterPayloads(const MediaPayloadVector& remotePayloads, const MediaPayloadVector& defaultPayloads) final;
</ins><span class="cx">
</span><del>- UpdateResult updateReceiveConfiguration(MediaEndpointSessionConfiguration*, bool isInitiator) override;
- UpdateResult updateSendConfiguration(MediaEndpointSessionConfiguration*, const RealtimeMediaSourceMap&, bool isInitiator) override;
</del><ins>+ UpdateResult updateReceiveConfiguration(MediaEndpointSessionConfiguration*, bool isInitiator) final;
+ UpdateResult updateSendConfiguration(MediaEndpointSessionConfiguration*, const RealtimeMediaSourceMap&, bool isInitiator) final;
</ins><span class="cx">
</span><del>- void addRemoteCandidate(IceCandidate&, const String& mid, const String& ufrag, const String& password) override;
</del><ins>+ void addRemoteCandidate(IceCandidate&, const String& mid, const String& ufrag, const String& password) final;
</ins><span class="cx">
</span><del>- Ref<RealtimeMediaSource> createMutedRemoteSource(const String& mid, RealtimeMediaSource::Type) override;
- void replaceSendSource(RealtimeMediaSource&, const String& mid) override;
- void replaceMutedRemoteSourceMid(const String& oldMid, const String& newMid) override;
</del><ins>+ Ref<RealtimeMediaSource> createMutedRemoteSource(const String& mid, RealtimeMediaSource::Type) final;
+ void replaceSendSource(RealtimeMediaSource&, const String& mid) final;
+ void replaceMutedRemoteSourceMid(const String& oldMid, const String& newMid) final;
</ins><span class="cx">
</span><del>- void stop() override;
</del><ins>+ void stop() final;
</ins><span class="cx">
</span><del>- void emulatePlatformEvent(const String& action) override;
</del><ins>+ void emulatePlatformEvent(const String& action) final;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void updateConfigurationMids(const MediaEndpointSessionConfiguration&);
</span></span></pre>
</div>
</div>
</body>
</html>