<!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>[159769] 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/159769">159769</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-25 15:21:47 -0800 (Mon, 25 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Use std::unique_ptr instead of OwnPtr/PassOwnPtr
https://bugs.webkit.org/show_bug.cgi?id=124858
Patch by Sergio Correia <sergio.correia@openbossa.org> on 2013-11-25
Reviewed by Eric Carlson.
Another step of the OwnPtr/PassOwnPtr => std::unique_ptr conversion,
now targeting mediastream-related code.
No new tests, covered by existing ones.
* Modules/mediastream/RTCDTMFSender.cpp:
* Modules/mediastream/RTCDTMFSender.h:
* Modules/mediastream/RTCDataChannel.cpp:
* Modules/mediastream/RTCDataChannel.h:
* Modules/mediastream/RTCPeerConnection.cpp:
* Modules/mediastream/RTCPeerConnection.h:
* platform/mediastream/MediaStreamSource.cpp:
* platform/mediastream/RTCPeerConnectionHandler.cpp:
* platform/mediastream/RTCPeerConnectionHandler.h:
* platform/mediastream/RTCPeerConnectionHandlerClient.h:
* platform/mock/RTCNotifiersMock.cpp:
* platform/mock/RTCPeerConnectionHandlerMock.cpp:
* platform/mock/RTCPeerConnectionHandlerMock.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelh">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h</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="#trunkSourceWebCoreplatformmediastreamMediaStreamSourcecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlercpp">trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerh">trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerClienth">trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCNotifiersMockcpp">trunk/Source/WebCore/platform/mock/RTCNotifiersMock.cpp</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/ChangeLog 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-11-25 Sergio Correia <sergio.correia@openbossa.org>
+
+ [MediaStream] Use std::unique_ptr instead of OwnPtr/PassOwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=124858
+
+ Reviewed by Eric Carlson.
+
+ Another step of the OwnPtr/PassOwnPtr => std::unique_ptr conversion,
+ now targeting mediastream-related code.
+
+ No new tests, covered by existing ones.
+
+ * Modules/mediastream/RTCDTMFSender.cpp:
+ * Modules/mediastream/RTCDTMFSender.h:
+ * Modules/mediastream/RTCDataChannel.cpp:
+ * Modules/mediastream/RTCDataChannel.h:
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ * Modules/mediastream/RTCPeerConnection.h:
+ * platform/mediastream/MediaStreamSource.cpp:
+ * platform/mediastream/RTCPeerConnectionHandler.cpp:
+ * platform/mediastream/RTCPeerConnectionHandler.h:
+ * platform/mediastream/RTCPeerConnectionHandlerClient.h:
+ * platform/mock/RTCNotifiersMock.cpp:
+ * platform/mock/RTCPeerConnectionHandlerMock.cpp:
+ * platform/mock/RTCPeerConnectionHandlerMock.h:
+
</ins><span class="cx"> 2013-11-25 Nick Diego Yamane <nick.yamane@openbossa.org>
</span><span class="cx">
</span><span class="cx"> MediaStreamRegistry should store MediaStreams instead of MediaStreamPrivates
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -47,23 +47,23 @@
</span><span class="cx"> PassRefPtr<RTCDTMFSender> RTCDTMFSender::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<MediaStreamTrack> track = prpTrack;
</span><del>- OwnPtr<RTCDTMFSenderHandler> handler = peerConnectionHandler->createDTMFSender(track->source());
</del><ins>+ std::unique_ptr<RTCDTMFSenderHandler> handler = peerConnectionHandler->createDTMFSender(track->source());
</ins><span class="cx"> if (!handler) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<RTCDTMFSender> dtmfSender = adoptRef(new RTCDTMFSender(context, track, handler.release()));
</del><ins>+ RefPtr<RTCDTMFSender> dtmfSender = adoptRef(new RTCDTMFSender(context, track, std::move(handler)));
</ins><span class="cx"> dtmfSender->suspendIfNeeded();
</span><span class="cx"> return dtmfSender.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RTCDTMFSender::RTCDTMFSender(ScriptExecutionContext* context, PassRefPtr<MediaStreamTrack> track, PassOwnPtr<RTCDTMFSenderHandler> handler)
</del><ins>+RTCDTMFSender::RTCDTMFSender(ScriptExecutionContext* context, PassRefPtr<MediaStreamTrack> track, std::unique_ptr<RTCDTMFSenderHandler> handler)
</ins><span class="cx"> : ActiveDOMObject(context)
</span><span class="cx"> , m_track(track)
</span><span class="cx"> , m_duration(defaultToneDurationMs)
</span><span class="cx"> , m_interToneGap(defaultInterToneGapMs)
</span><del>- , m_handler(handler)
</del><ins>+ , m_handler(std::move(handler))
</ins><span class="cx"> , m_stopped(false)
</span><span class="cx"> , m_scheduledEventTimer(this, &RTCDTMFSender::scheduledEventTimerFired)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> using RefCounted<RTCDTMFSender>::deref;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RTCDTMFSender(ScriptExecutionContext*, PassRefPtr<MediaStreamTrack>, PassOwnPtr<RTCDTMFSenderHandler>);
</del><ins>+ RTCDTMFSender(ScriptExecutionContext*, PassRefPtr<MediaStreamTrack>, std::unique_ptr<RTCDTMFSenderHandler>);
</ins><span class="cx">
</span><span class="cx"> void scheduleDispatchEvent(PassRefPtr<Event>);
</span><span class="cx"> void scheduledEventTimerFired(Timer<RTCDTMFSender>*);
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> long m_duration;
</span><span class="cx"> long m_interToneGap;
</span><span class="cx">
</span><del>- OwnPtr<RTCDTMFSenderHandler> m_handler;
</del><ins>+ std::unique_ptr<RTCDTMFSenderHandler> m_handler;
</ins><span class="cx">
</span><span class="cx"> bool m_stopped;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -64,23 +64,23 @@
</span><span class="cx"> options.get("maxRetransmitTime", initData.maxRetransmitTime);
</span><span class="cx"> options.get("protocol", initData.protocol);
</span><span class="cx">
</span><del>- OwnPtr<RTCDataChannelHandler> handler = peerConnectionHandler->createDataChannel(label, initData);
</del><ins>+ std::unique_ptr<RTCDataChannelHandler> handler = peerConnectionHandler->createDataChannel(label, initData);
</ins><span class="cx"> if (!handler) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>- return adoptRef(new RTCDataChannel(context, handler.release()));
</del><ins>+ return adoptRef(new RTCDataChannel(context, std::move(handler)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, PassOwnPtr<RTCDataChannelHandler> handler)
</del><ins>+PassRefPtr<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, std::unique_ptr<RTCDataChannelHandler> handler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(handler);
</span><del>- return adoptRef(new RTCDataChannel(context, handler));
</del><ins>+ return adoptRef(new RTCDataChannel(context, std::move(handler)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RTCDataChannel::RTCDataChannel(ScriptExecutionContext* context, PassOwnPtr<RTCDataChannelHandler> handler)
</del><ins>+RTCDataChannel::RTCDataChannel(ScriptExecutionContext* context, std::unique_ptr<RTCDataChannelHandler> handler)
</ins><span class="cx"> : m_scriptExecutionContext(context)
</span><del>- , m_handler(handler)
</del><ins>+ , m_handler(std::move(handler))
</ins><span class="cx"> , m_stopped(false)
</span><span class="cx"> , m_readyState(ReadyStateConnecting)
</span><span class="cx"> , m_binaryType(BinaryTypeArrayBuffer)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> class RTCDataChannel FINAL : public RefCounted<RTCDataChannel>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDataChannelHandlerClient {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<RTCDataChannel> create(ScriptExecutionContext*, PassOwnPtr<RTCDataChannelHandler>);
</del><ins>+ static PassRefPtr<RTCDataChannel> create(ScriptExecutionContext*, std::unique_ptr<RTCDataChannelHandler>);
</ins><span class="cx"> static PassRefPtr<RTCDataChannel> create(ScriptExecutionContext*, RTCPeerConnectionHandler*, const String& , const Dictionary&, ExceptionCode&);
</span><span class="cx"> ~RTCDataChannel();
</span><span class="cx">
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> using RefCounted<RTCDataChannel>::deref;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RTCDataChannel(ScriptExecutionContext*, PassOwnPtr<RTCDataChannelHandler>);
</del><ins>+ RTCDataChannel(ScriptExecutionContext*, std::unique_ptr<RTCDataChannelHandler>);
</ins><span class="cx">
</span><span class="cx"> void scheduleDispatchEvent(PassRefPtr<Event>);
</span><span class="cx"> void scheduledEventTimerFired(Timer<RTCDataChannel>*);
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> virtual void didReceiveRawData(const char*, size_t) OVERRIDE;
</span><span class="cx"> virtual void didDetectError() OVERRIDE;
</span><span class="cx">
</span><del>- OwnPtr<RTCDataChannelHandler> m_handler;
</del><ins>+ std::unique_ptr<RTCDataChannelHandler> m_handler;
</ins><span class="cx">
</span><span class="cx"> bool m_stopped;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -574,14 +574,14 @@
</span><span class="cx"> scheduleDispatchEvent(MediaStreamEvent::create(eventNames().removestreamEvent, false, false, stream.release()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RTCPeerConnection::didAddRemoteDataChannel(PassOwnPtr<RTCDataChannelHandler> handler)
</del><ins>+void RTCPeerConnection::didAddRemoteDataChannel(std::unique_ptr<RTCDataChannelHandler> handler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(scriptExecutionContext()->isContextThread());
</span><span class="cx">
</span><span class="cx"> if (m_signalingState == SignalingStateClosed)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<RTCDataChannel> channel = RTCDataChannel::create(scriptExecutionContext(), handler);
</del><ins>+ RefPtr<RTCDataChannel> channel = RTCDataChannel::create(scriptExecutionContext(), std::move(handler));
</ins><span class="cx"> m_dataChannels.append(channel);
</span><span class="cx">
</span><span class="cx"> scheduleDispatchEvent(RTCDataChannelEvent::create(eventNames().datachannelEvent, false, false, channel.release()));
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> virtual void didChangeIceConnectionState(IceConnectionState) OVERRIDE;
</span><span class="cx"> virtual void didAddRemoteStream(PassRefPtr<MediaStreamPrivate>) OVERRIDE;
</span><span class="cx"> virtual void didRemoveRemoteStream(MediaStreamPrivate*) OVERRIDE;
</span><del>- virtual void didAddRemoteDataChannel(PassOwnPtr<RTCDataChannelHandler>) OVERRIDE;
</del><ins>+ virtual void didAddRemoteDataChannel(std::unique_ptr<RTCDataChannelHandler>) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> // EventTarget
</span><span class="cx"> virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return RTCPeerConnectionEventTargetInterfaceType; }
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<RTCDataChannel>> m_dataChannels;
</span><span class="cx">
</span><del>- OwnPtr<RTCPeerConnectionHandler> m_peerHandler;
</del><ins>+ std::unique_ptr<RTCPeerConnectionHandler> m_peerHandler;
</ins><span class="cx">
</span><span class="cx"> Timer<RTCPeerConnection> m_scheduledEventTimer;
</span><span class="cx"> Vector<RefPtr<Event>> m_scheduledEvents;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -40,8 +40,6 @@
</span><span class="cx"> #include "MediaStreamSourceCapabilities.h"
</span><span class="cx"> #include "UUID.h"
</span><span class="cx">
</span><del>-#include <wtf/PassOwnPtr.h>
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> MediaStreamSource::MediaStreamSource(const String& id, Type type, const String& name)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -34,12 +34,10 @@
</span><span class="cx">
</span><span class="cx"> #include "RTCPeerConnectionHandler.h"
</span><span class="cx">
</span><del>-#include <wtf/PassOwnPtr.h>
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> class RTCPeerConnectionHandlerClient;
</span><span class="cx">
</span><del>-static PassOwnPtr<RTCPeerConnectionHandler> createHandler(RTCPeerConnectionHandlerClient*)
</del><ins>+static std::unique_ptr<RTCPeerConnectionHandler> createHandler(RTCPeerConnectionHandlerClient*)
</ins><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><span class="cx"> #include "MediaStreamPrivate.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -68,7 +67,7 @@
</span><span class="cx"> int id;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef PassOwnPtr<RTCPeerConnectionHandler> (*CreatePeerConnectionHandler)(RTCPeerConnectionHandlerClient*);
</del><ins>+typedef std::unique_ptr<RTCPeerConnectionHandler> (*CreatePeerConnectionHandler)(RTCPeerConnectionHandlerClient*);
</ins><span class="cx">
</span><span class="cx"> class RTCPeerConnectionHandler {
</span><span class="cx"> public:
</span><span class="lines">@@ -88,12 +87,9 @@
</span><span class="cx"> virtual bool addStream(PassRefPtr<MediaStreamPrivate>, PassRefPtr<MediaConstraints>) = 0;
</span><span class="cx"> virtual void removeStream(PassRefPtr<MediaStreamPrivate>) = 0;
</span><span class="cx"> virtual void getStats(PassRefPtr<RTCStatsRequest>) = 0;
</span><del>- virtual PassOwnPtr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) = 0;
- virtual PassOwnPtr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) = 0;
</del><ins>+ virtual std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) = 0;
+ virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) = 0;
</ins><span class="cx"> virtual void stop() = 0;
</span><del>-
-protected:
- RTCPeerConnectionHandler() { }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -78,7 +77,7 @@
</span><span class="cx"> virtual void didChangeIceConnectionState(IceConnectionState) = 0;
</span><span class="cx"> virtual void didAddRemoteStream(PassRefPtr<MediaStreamPrivate>) = 0;
</span><span class="cx"> virtual void didRemoveRemoteStream(MediaStreamPrivate*) = 0;
</span><del>- virtual void didAddRemoteDataChannel(PassOwnPtr<RTCDataChannelHandler>) = 0;
</del><ins>+ virtual void didAddRemoteDataChannel(std::unique_ptr<RTCDataChannelHandler>) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCNotifiersMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCNotifiersMock.cpp (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCNotifiersMock.cpp 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/platform/mock/RTCNotifiersMock.cpp 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> void RemoteDataChannelNotifier::fire()
</span><span class="cx"> {
</span><del>- m_client->didAddRemoteDataChannel(adoptPtr(new RTCDataChannelHandlerMock("RTCDataChannelHandlerMock", RTCDataChannelInit())));
</del><ins>+ m_client->didAddRemoteDataChannel(std::make_unique<RTCDataChannelHandlerMock>("RTCDataChannelHandlerMock", RTCDataChannelInit()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DataChannelStateNotifier::DataChannelStateNotifier(RTCDataChannelHandlerClient* client, RTCDataChannelHandlerClient::ReadyState state)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -40,11 +40,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassOwnPtr<RTCPeerConnectionHandler> RTCPeerConnectionHandlerMock::create(RTCPeerConnectionHandlerClient* client)
-{
- return adoptPtr(new RTCPeerConnectionHandlerMock(client));
-}
-
</del><span class="cx"> RTCPeerConnectionHandlerMock::RTCPeerConnectionHandlerMock(RTCPeerConnectionHandlerClient* client)
</span><span class="cx"> : m_client(client)
</span><span class="cx"> {
</span><span class="lines">@@ -153,19 +148,19 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<RTCDataChannelHandler> RTCPeerConnectionHandlerMock::createDataChannel(const String& label, const RTCDataChannelInit& init)
</del><ins>+std::unique_ptr<RTCDataChannelHandler> RTCPeerConnectionHandlerMock::createDataChannel(const String& label, const RTCDataChannelInit& init)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<RemoteDataChannelNotifier> notifier = adoptRef(new RemoteDataChannelNotifier(m_client));
</span><span class="cx"> m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
</span><del>- return adoptPtr(new RTCDataChannelHandlerMock(label, init));
</del><ins>+ return std::make_unique<RTCDataChannelHandlerMock>(label, init);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<RTCDTMFSenderHandler> RTCPeerConnectionHandlerMock::createDTMFSender(PassRefPtr<MediaStreamSource>)
</del><ins>+std::unique_ptr<RTCDTMFSenderHandler> RTCPeerConnectionHandlerMock::createDTMFSender(PassRefPtr<MediaStreamSource>)
</ins><span class="cx"> {
</span><span class="cx"> // Requires a mock implementation of RTCDTMFSenderHandler.
</span><span class="cx"> // This must be implemented once the mock implementation of RTCDataChannelHandler is ready.
</span><span class="cx"> notImplemented();
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnectionHandlerMock::stop()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h (159768 => 159769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h 2013-11-25 23:08:46 UTC (rev 159768)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h 2013-11-25 23:21:47 UTC (rev 159769)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx">
</span><span class="cx"> class RTCPeerConnectionHandlerMock FINAL : public RTCPeerConnectionHandler, public TimerEventBasedMock {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<RTCPeerConnectionHandler> create(RTCPeerConnectionHandlerClient*);
</del><span class="cx"> virtual ~RTCPeerConnectionHandlerMock() { }
</span><span class="cx">
</span><span class="cx"> virtual bool initialize(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>) OVERRIDE;
</span><span class="lines">@@ -52,12 +51,12 @@
</span><span class="cx"> virtual bool addStream(PassRefPtr<MediaStreamPrivate>, PassRefPtr<MediaConstraints>) OVERRIDE;
</span><span class="cx"> virtual void removeStream(PassRefPtr<MediaStreamPrivate>) OVERRIDE;
</span><span class="cx"> virtual void getStats(PassRefPtr<RTCStatsRequest>) OVERRIDE;
</span><del>- virtual PassOwnPtr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) OVERRIDE;
- virtual PassOwnPtr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) OVERRIDE;
</del><ins>+ virtual std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) OVERRIDE;
+ virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) OVERRIDE;
</ins><span class="cx"> virtual void stop() OVERRIDE;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- RTCPeerConnectionHandlerMock(RTCPeerConnectionHandlerClient*);
</del><ins>+ explicit RTCPeerConnectionHandlerMock(RTCPeerConnectionHandlerClient*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RTCPeerConnectionHandlerClient* m_client;
</span></span></pre>
</div>
</div>
</body>
</html>