<!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>[214317] 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/214317">214317</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-23 14:07:40 -0700 (Thu, 23 Mar 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Clean RTCPeerConnection.idl after bug 169978
https://bugs.webkit.org/show_bug.cgi?id=169989

Patch by Youenn Fablet &lt;youenn@apple.com&gt; on 2017-03-23
Reviewed by Eric Carlson.

No change of behavior.
Moving addTransceiver to overloaded method to union type to match spec.
Refactoring RTCRtpSender to take a String&amp;&amp;.

* Modules/mediastream/MediaEndpointPeerConnection.cpp:
(WebCore::MediaEndpointPeerConnection::setRemoteDescriptionTask):
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::addTransceiver):
(WebCore::RTCPeerConnection::completeAddTransceiver):
* Modules/mediastream/RTCPeerConnection.h:
* Modules/mediastream/RTCPeerConnection.idl: Cosmetic changes except for addTransceiver.
* Modules/mediastream/RTCRtpSender.cpp:
(WebCore::RTCRtpSender::create):
(WebCore::RTCRtpSender::RTCRtpSender):
* Modules/mediastream/RTCRtpSender.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="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpSenderh">trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214316 => 214317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-23 20:57:06 UTC (rev 214316)
+++ trunk/Source/WebCore/ChangeLog        2017-03-23 21:07:40 UTC (rev 214317)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2017-03-23  Youenn Fablet  &lt;youenn@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Clean RTCPeerConnection.idl after bug 169978
+        https://bugs.webkit.org/show_bug.cgi?id=169989
+
+        Reviewed by Eric Carlson.
+
+        No change of behavior.
+        Moving addTransceiver to overloaded method to union type to match spec.
+        Refactoring RTCRtpSender to take a String&amp;&amp;.
+
+        * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+        (WebCore::MediaEndpointPeerConnection::setRemoteDescriptionTask):
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::addTransceiver):
+        (WebCore::RTCPeerConnection::completeAddTransceiver):
+        * Modules/mediastream/RTCPeerConnection.h:
+        * Modules/mediastream/RTCPeerConnection.idl: Cosmetic changes except for addTransceiver.
+        * Modules/mediastream/RTCRtpSender.cpp:
+        (WebCore::RTCRtpSender::create):
+        (WebCore::RTCRtpSender::RTCRtpSender):
+        * Modules/mediastream/RTCRtpSender.h:
+
+2017-03-23  Youenn Fablet  &lt;youenn@apple.com&gt;
+
</ins><span class="cx">         Add logging in case libwebrtc.dylib cannot be opened
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=170017
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (214316 => 214317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp        2017-03-23 20:57:06 UTC (rev 214316)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp        2017-03-23 21:07:40 UTC (rev 214317)
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx">             }
</span><span class="cx"> 
</span><span class="cx">             if (!transceiver) {
</span><del>-                auto sender = RTCRtpSender::create(mediaDescription.type, Vector&lt;String&gt;(), m_peerConnection.senderClient());
</del><ins>+                auto sender = RTCRtpSender::create(String(mediaDescription.type), Vector&lt;String&gt;(), m_peerConnection.senderClient());
</ins><span class="cx">                 auto receiver = createReceiver(mediaDescription.mid, mediaDescription.type, mediaDescription.mediaStreamTrackId);
</span><span class="cx"> 
</span><span class="cx">                 auto newTransceiver = RTCRtpTransceiver::create(WTFMove(sender), WTFMove(receiver));
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (214316 => 214317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp        2017-03-23 20:57:06 UTC (rev 214316)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp        2017-03-23 21:07:40 UTC (rev 214317)
</span><span class="lines">@@ -175,50 +175,37 @@
</span><span class="cx">     return { };
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-ExceptionOr&lt;Ref&lt;RTCRtpTransceiver&gt;&gt; RTCPeerConnection::addTransceiver(Ref&lt;MediaStreamTrack&gt;&amp;&amp; track, const RTCRtpTransceiverInit&amp; init)
</del><ins>+ExceptionOr&lt;Ref&lt;RTCRtpTransceiver&gt;&gt; RTCPeerConnection::addTransceiver(AddTransceiverTrackOrKind&amp;&amp; withTrack, const RTCRtpTransceiverInit&amp; init)
</ins><span class="cx"> {
</span><del>-    if (m_signalingState == RTCSignalingState::Closed)
-        return Exception { INVALID_STATE_ERR };
</del><ins>+    if (WTF::holds_alternative&lt;String&gt;(withTrack)) {
+        const String&amp; kind = WTF::get&lt;String&gt;(withTrack);
+        if (kind != &quot;audio&quot; &amp;&amp; kind != &quot;video&quot;)
+            return Exception { TypeError };
</ins><span class="cx"> 
</span><del>-    String transceiverMid = RTCRtpTransceiver::getNextMid();
</del><ins>+        auto sender = RTCRtpSender::create(String(kind), Vector&lt;String&gt;(), *this);
+        return completeAddTransceiver(WTFMove(sender), init, createCanonicalUUIDString(), kind);
+    }
+
+    Ref&lt;MediaStreamTrack&gt; track = WTF::get&lt;RefPtr&lt;MediaStreamTrack&gt;&gt;(withTrack).releaseNonNull();
+    const String&amp; trackId = track-&gt;id();
</ins><span class="cx">     const String&amp; trackKind = track-&gt;kind();
</span><del>-    const String&amp; trackId = track-&gt;id();
</del><span class="cx"> 
</span><span class="cx">     auto sender = RTCRtpSender::create(WTFMove(track), Vector&lt;String&gt;(), *this);
</span><del>-    auto receiver = m_backend-&gt;createReceiver(transceiverMid, trackKind, trackId);
-    auto transceiver = RTCRtpTransceiver::create(WTFMove(sender), WTFMove(receiver));
-    transceiver-&gt;setProvisionalMid(transceiverMid);
-
-    completeAddTransceiver(transceiver, init);
-    return WTFMove(transceiver);
</del><ins>+    return completeAddTransceiver(WTFMove(sender), init, trackId, trackKind);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-ExceptionOr&lt;Ref&lt;RTCRtpTransceiver&gt;&gt; RTCPeerConnection::addTransceiver(const String&amp; kind, const RTCRtpTransceiverInit&amp; init)
</del><ins>+Ref&lt;RTCRtpTransceiver&gt; RTCPeerConnection::completeAddTransceiver(Ref&lt;RTCRtpSender&gt;&amp;&amp; sender, const RTCRtpTransceiverInit&amp; init, const String&amp; trackId, const String&amp; trackKind)
</ins><span class="cx"> {
</span><del>-    if (m_signalingState == RTCSignalingState::Closed)
-        return Exception { INVALID_STATE_ERR };
-
-    if (kind != &quot;audio&quot; &amp;&amp; kind != &quot;video&quot;)
-        return Exception { TypeError };
-
</del><span class="cx">     String transceiverMid = RTCRtpTransceiver::getNextMid();
</span><del>-    String trackId = createCanonicalUUIDString();
</del><ins>+    auto transceiver = RTCRtpTransceiver::create(WTFMove(sender), m_backend-&gt;createReceiver(transceiverMid, trackKind, trackId));
</ins><span class="cx"> 
</span><del>-    auto sender = RTCRtpSender::create(kind, Vector&lt;String&gt;(), *this);
-    auto receiver = m_backend-&gt;createReceiver(transceiverMid, kind, trackId);
-    auto transceiver = RTCRtpTransceiver::create(WTFMove(sender), WTFMove(receiver));
</del><span class="cx">     transceiver-&gt;setProvisionalMid(transceiverMid);
</span><ins>+    transceiver-&gt;setDirection(init.direction);
</ins><span class="cx"> 
</span><del>-    completeAddTransceiver(transceiver, init);
-    return WTFMove(transceiver);
-}
</del><ins>+    m_transceiverSet-&gt;append(transceiver.copyRef());
+    m_backend-&gt;markAsNeedingNegotiation();
</ins><span class="cx"> 
</span><del>-void RTCPeerConnection::completeAddTransceiver(RTCRtpTransceiver&amp; transceiver, const RTCRtpTransceiverInit&amp; init)
-{
-    transceiver.setDirection(init.direction);
-
-    m_transceiverSet-&gt;append(transceiver);
-    m_backend-&gt;markAsNeedingNegotiation();
</del><ins>+    return transceiver;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RTCPeerConnection::queuedCreateOffer(RTCOfferOptions&amp;&amp; options, SessionDescriptionPromise&amp;&amp; promise)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (214316 => 214317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h        2017-03-23 20:57:06 UTC (rev 214316)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h        2017-03-23 21:07:40 UTC (rev 214317)
</span><span class="lines">@@ -104,8 +104,8 @@
</span><span class="cx">     ExceptionOr&lt;Ref&lt;RTCRtpSender&gt;&gt; addTrack(Ref&lt;MediaStreamTrack&gt;&amp;&amp;, const Vector&lt;std::reference_wrapper&lt;MediaStream&gt;&gt;&amp;);
</span><span class="cx">     ExceptionOr&lt;void&gt; removeTrack(RTCRtpSender&amp;);
</span><span class="cx"> 
</span><del>-    ExceptionOr&lt;Ref&lt;RTCRtpTransceiver&gt;&gt; addTransceiver(Ref&lt;MediaStreamTrack&gt;&amp;&amp;, const RTCRtpTransceiverInit&amp;);
-    ExceptionOr&lt;Ref&lt;RTCRtpTransceiver&gt;&gt; addTransceiver(const String&amp; kind, const RTCRtpTransceiverInit&amp;);
</del><ins>+    using AddTransceiverTrackOrKind = Variant&lt;RefPtr&lt;MediaStreamTrack&gt;, String&gt;;
+    ExceptionOr&lt;Ref&lt;RTCRtpTransceiver&gt;&gt; addTransceiver(AddTransceiverTrackOrKind&amp;&amp;, const RTCRtpTransceiverInit&amp;);
</ins><span class="cx"> 
</span><span class="cx">     // 6.1 Peer-to-peer data API
</span><span class="cx">     ExceptionOr&lt;Ref&lt;RTCDataChannel&gt;&gt; createDataChannel(ScriptExecutionContext&amp;, String&amp;&amp;, RTCDataChannelInit&amp;&amp;);
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> private:
</span><span class="cx">     RTCPeerConnection(ScriptExecutionContext&amp;);
</span><span class="cx"> 
</span><del>-    void completeAddTransceiver(RTCRtpTransceiver&amp;, const RTCRtpTransceiverInit&amp;);
</del><ins>+    Ref&lt;RTCRtpTransceiver&gt; completeAddTransceiver(Ref&lt;RTCRtpSender&gt;&amp;&amp;, const RTCRtpTransceiverInit&amp;, const String&amp; trackId, const String&amp; trackKind);
</ins><span class="cx"> 
</span><span class="cx">     RTCController&amp; rtcController();
</span><span class="cx">     void registerToController();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (214316 => 214317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl        2017-03-23 20:57:06 UTC (rev 214316)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl        2017-03-23 21:07:40 UTC (rev 214317)
</span><span class="lines">@@ -65,8 +65,7 @@
</span><span class="cx">     ExportMacro=WEBCORE_EXPORT,
</span><span class="cx">     JSBuiltinConstructor
</span><span class="cx"> ] interface RTCPeerConnection : EventTarget {
</span><del>-    // FIXME 169644: update Constructor to take optional RTCConfiguration
-    // Private initializer
</del><ins>+    // JS built-in constructor handles the optional RTCConfiguration
</ins><span class="cx">     [PrivateIdentifier, CallWith=Document, MayThrowException] void initializeWith(RTCConfiguration configuration);
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -76,24 +75,16 @@
</span><span class="cx">     [JSBuiltin] Promise&lt;RTCSessionDescriptionInit&gt; createAnswer(optional RTCAnswerOptions answerOptions);
</span><span class="cx"> 
</span><span class="cx">     [JSBuiltin] Promise&lt;void&gt; setLocalDescription(RTCSessionDescriptionInit description);
</span><del>-    // FIXME 169644: change to nullable
-    readonly attribute RTCSessionDescription localDescription;
-    // FIXME 169644: change to nullable
-    readonly attribute RTCSessionDescription currentLocalDescription;
-    // FIXME 169644: change to nullable
-    readonly attribute RTCSessionDescription pendingLocalDescription;
</del><ins>+    readonly attribute RTCSessionDescription? localDescription;
+    readonly attribute RTCSessionDescription? currentLocalDescription;
+    readonly attribute RTCSessionDescription? pendingLocalDescription;
</ins><span class="cx"> 
</span><del>-    // FIXME 169644: change to RTCSessionDescriptionInit
-    [JSBuiltin] Promise&lt;void&gt; setRemoteDescription(RTCSessionDescription description);
-    // FIXME 169644: change to nullable
-    readonly attribute RTCSessionDescription remoteDescription;
-    // FIXME 169644: change to nullable
-    readonly attribute RTCSessionDescription currentRemoteDescription;
-    // FIXME 169644: change to nullable
-    readonly attribute RTCSessionDescription pendingRemoteDescription;
</del><ins>+    [JSBuiltin] Promise&lt;void&gt; setRemoteDescription(RTCSessionDescriptionInit description);
+    readonly attribute RTCSessionDescription? remoteDescription;
+    readonly attribute RTCSessionDescription? currentRemoteDescription;
+    readonly attribute RTCSessionDescription? pendingRemoteDescription;
</ins><span class="cx"> 
</span><del>-    // FIXME 169644: update parameter to (RTCIceCandidateInit or RTCIceCandidate)
-    [JSBuiltin] Promise&lt;void&gt; addIceCandidate(RTCIceCandidate candidate);
</del><ins>+    [JSBuiltin] Promise&lt;void&gt; addIceCandidate((RTCIceCandidateInit or RTCIceCandidate) candidate);
</ins><span class="cx"> 
</span><span class="cx">     readonly attribute RTCSignalingState signalingState;
</span><span class="cx">     readonly attribute RTCIceGatheringState iceGatheringState;
</span><span class="lines">@@ -136,8 +127,7 @@
</span><span class="cx">     [PrivateIdentifier, PublicIdentifier, MayThrowException] RTCRtpSender addTrack(MediaStreamTrack track, MediaStream... streams);
</span><span class="cx">     [PrivateIdentifier, PublicIdentifier, MayThrowException] void removeTrack(RTCRtpSender sender);
</span><span class="cx"> 
</span><del>-    [MayThrowException] RTCRtpTransceiver addTransceiver(MediaStreamTrack track, optional RTCRtpTransceiverInit init);
-    [MayThrowException] RTCRtpTransceiver addTransceiver(DOMString kind, optional RTCRtpTransceiverInit init);
</del><ins>+    [MayThrowException] RTCRtpTransceiver addTransceiver((MediaStreamTrack or DOMString) track, optional RTCRtpTransceiverInit init);
</ins><span class="cx"> 
</span><span class="cx">     attribute EventHandler ontrack;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp (214316 => 214317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp        2017-03-23 20:57:06 UTC (rev 214316)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp        2017-03-23 21:07:40 UTC (rev 214317)
</span><span class="lines">@@ -39,19 +39,19 @@
</span><span class="cx"> 
</span><span class="cx"> Ref&lt;RTCRtpSender&gt; RTCRtpSender::create(Ref&lt;MediaStreamTrack&gt;&amp;&amp; track, Vector&lt;String&gt;&amp;&amp; mediaStreamIds, RTCRtpSenderClient&amp; client)
</span><span class="cx"> {
</span><del>-    auto sender = adoptRef(*new RTCRtpSender(track-&gt;kind(), WTFMove(mediaStreamIds), client));
</del><ins>+    auto sender = adoptRef(*new RTCRtpSender(String(track-&gt;kind()), WTFMove(mediaStreamIds), client));
</ins><span class="cx">     sender-&gt;setTrack(WTFMove(track));
</span><span class="cx">     return sender;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Ref&lt;RTCRtpSender&gt; RTCRtpSender::create(const String&amp; trackKind, Vector&lt;String&gt;&amp;&amp; mediaStreamIds, RTCRtpSenderClient&amp; client)
</del><ins>+Ref&lt;RTCRtpSender&gt; RTCRtpSender::create(String&amp;&amp; trackKind, Vector&lt;String&gt;&amp;&amp; mediaStreamIds, RTCRtpSenderClient&amp; client)
</ins><span class="cx"> {
</span><del>-    return adoptRef(*new RTCRtpSender(trackKind, WTFMove(mediaStreamIds), client));
</del><ins>+    return adoptRef(*new RTCRtpSender(WTFMove(trackKind), WTFMove(mediaStreamIds), client));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-RTCRtpSender::RTCRtpSender(const String&amp; trackKind, Vector&lt;String&gt;&amp;&amp; mediaStreamIds, RTCRtpSenderClient&amp; client)
</del><ins>+RTCRtpSender::RTCRtpSender(String&amp;&amp; trackKind, Vector&lt;String&gt;&amp;&amp; mediaStreamIds, RTCRtpSenderClient&amp; client)
</ins><span class="cx">     : RTCRtpSenderReceiverBase()
</span><del>-    , m_trackKind(trackKind)
</del><ins>+    , m_trackKind(WTFMove(trackKind))
</ins><span class="cx">     , m_mediaStreamIds(WTFMove(mediaStreamIds))
</span><span class="cx">     , m_client(&amp;client)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h (214316 => 214317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h        2017-03-23 20:57:06 UTC (rev 214316)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.h        2017-03-23 21:07:40 UTC (rev 214317)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> class RTCRtpSender : public RTCRtpSenderReceiverBase {
</span><span class="cx"> public:
</span><span class="cx">     static Ref&lt;RTCRtpSender&gt; create(Ref&lt;MediaStreamTrack&gt;&amp;&amp;, Vector&lt;String&gt;&amp;&amp; mediaStreamIds, RTCRtpSenderClient&amp;);
</span><del>-    static Ref&lt;RTCRtpSender&gt; create(const String&amp; trackKind, Vector&lt;String&gt;&amp;&amp; mediaStreamIds, RTCRtpSenderClient&amp;);
</del><ins>+    static Ref&lt;RTCRtpSender&gt; create(String&amp;&amp; trackKind, Vector&lt;String&gt;&amp;&amp; mediaStreamIds, RTCRtpSenderClient&amp;);
</ins><span class="cx"> 
</span><span class="cx">     const String&amp; trackId() const { return m_trackId; }
</span><span class="cx">     const String&amp; trackKind() const { return m_trackKind; }
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">     ExceptionOr&lt;void&gt; replaceTrack(Ref&lt;MediaStreamTrack&gt;&amp;&amp;, DOMPromise&lt;void&gt;&amp;&amp;);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    RTCRtpSender(const String&amp; trackKind, Vector&lt;String&gt;&amp;&amp; mediaStreamIds, RTCRtpSenderClient&amp;);
</del><ins>+    RTCRtpSender(String&amp;&amp; trackKind, Vector&lt;String&gt;&amp;&amp; mediaStreamIds, RTCRtpSenderClient&amp;);
</ins><span class="cx"> 
</span><span class="cx">     String m_trackId;
</span><span class="cx">     String m_trackKind;
</span></span></pre>
</div>
</div>

</body>
</html>