<!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>[208687] 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/208687">208687</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-14 09:46:10 -0800 (Mon, 14 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>MediaStreamPrivate::create should take vectors of Ref
https://bugs.webkit.org/show_bug.cgi?id=164670
Patch by Youenn Fablet <youenn@apple.com> on 2016-11-14
Reviewed by Sam Weinig.
No change of behavior.
* Modules/webaudio/MediaStreamAudioDestinationNode.cpp:
(WebCore::MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode):
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::create):
* platform/mediastream/MediaStreamPrivate.h:
* platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp:
(WebCore::RealtimeMediaSourceCenterMac::createMediaStream):
* platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp:
(WebCore::RealtimeMediaSourceCenterOwr::mediaSourcesAvailable):
* platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::MockRealtimeMediaSourceCenter::createMediaStream):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioMediaStreamAudioDestinationNodecpp">trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeMediaSourceCenterMaccpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceCenterOwrcpp">trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourceCentercpp">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208686 => 208687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-14 17:40:41 UTC (rev 208686)
+++ trunk/Source/WebCore/ChangeLog 2016-11-14 17:46:10 UTC (rev 208687)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-11-14 Youenn Fablet <youenn@apple.com>
+
+ MediaStreamPrivate::create should take vectors of Ref
+ https://bugs.webkit.org/show_bug.cgi?id=164670
+
+ Reviewed by Sam Weinig.
+
+ No change of behavior.
+
+ * Modules/webaudio/MediaStreamAudioDestinationNode.cpp:
+ (WebCore::MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode):
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::create):
+ * platform/mediastream/MediaStreamPrivate.h:
+ * platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp:
+ (WebCore::RealtimeMediaSourceCenterMac::createMediaStream):
+ * platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp:
+ (WebCore::RealtimeMediaSourceCenterOwr::mediaSourcesAvailable):
+ * platform/mock/MockRealtimeMediaSourceCenter.cpp:
+ (WebCore::MockRealtimeMediaSourceCenter::createMediaStream):
+
</ins><span class="cx"> 2016-11-14 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] Expose STATE_SINGLE_LINE and STATE_MULTI_LINE for ARIA searchbox role
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioMediaStreamAudioDestinationNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp (208686 => 208687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp 2016-11-14 17:40:41 UTC (rev 208686)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp 2016-11-14 17:46:10 UTC (rev 208687)
</span><span class="lines">@@ -49,8 +49,9 @@
</span><span class="cx"> setNodeType(NodeTypeMediaStreamAudioDestination);
</span><span class="cx">
</span><span class="cx"> m_source = MediaStreamAudioSource::create();
</span><del>- Vector<RefPtr<RealtimeMediaSource>> audioSources(1, m_source);
- m_stream = MediaStream::create(*context.scriptExecutionContext(), MediaStreamPrivate::create(WTFMove(audioSources), Vector<RefPtr<RealtimeMediaSource>>()));
</del><ins>+ Vector<Ref<RealtimeMediaSource>> audioSources;
+ audioSources.append(*m_source);
+ m_stream = MediaStream::create(*context.scriptExecutionContext(), MediaStreamPrivate::create(audioSources, { }));
</ins><span class="cx">
</span><span class="cx"> m_source->setAudioFormat(numberOfChannels, context.sampleRate());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (208686 => 208687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2016-11-14 17:40:41 UTC (rev 208686)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2016-11-14 17:46:10 UTC (rev 208687)
</span><span class="lines">@@ -45,27 +45,23 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<MediaStreamPrivate> MediaStreamPrivate::create(const Vector<RefPtr<RealtimeMediaSource>>& audioSources, const Vector<RefPtr<RealtimeMediaSource>>& videoSources)
</del><ins>+Ref<MediaStreamPrivate> MediaStreamPrivate::create(const Vector<Ref<RealtimeMediaSource>>& audioSources, const Vector<Ref<RealtimeMediaSource>>& videoSources)
</ins><span class="cx"> {
</span><span class="cx"> MediaStreamTrackPrivateVector tracks;
</span><del>- tracks.reserveCapacity(audioSources.size() + videoSources.size());
</del><ins>+ tracks.reserveInitialCapacity(audioSources.size() + videoSources.size());
</ins><span class="cx">
</span><del>- for (auto source : audioSources) {
- ASSERT(source);
- tracks.append(MediaStreamTrackPrivate::create(source.releaseNonNull()));
- }
</del><ins>+ for (auto& source : audioSources)
+ tracks.uncheckedAppend(MediaStreamTrackPrivate::create(source.copyRef()));
</ins><span class="cx">
</span><del>- for (auto source : videoSources) {
- ASSERT(source);
- tracks.append(MediaStreamTrackPrivate::create(source.releaseNonNull()));
- }
</del><ins>+ for (auto& source : videoSources)
+ tracks.uncheckedAppend(MediaStreamTrackPrivate::create(source.copyRef()));
</ins><span class="cx">
</span><span class="cx"> return MediaStreamPrivate::create(tracks);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<MediaStreamPrivate> MediaStreamPrivate::create(const MediaStreamTrackPrivateVector& tracks)
</del><ins>+Ref<MediaStreamPrivate> MediaStreamPrivate::create(const MediaStreamTrackPrivateVector& tracks)
</ins><span class="cx"> {
</span><del>- return adoptRef(new MediaStreamPrivate(createCanonicalUUIDString(), tracks));
</del><ins>+ return adoptRef(*new MediaStreamPrivate(createCanonicalUUIDString(), tracks));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaStreamPrivate::MediaStreamPrivate(const String& id, const MediaStreamTrackPrivateVector& tracks)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (208686 => 208687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2016-11-14 17:40:41 UTC (rev 208686)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2016-11-14 17:46:10 UTC (rev 208687)
</span><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx"> virtual void didRemoveTrack(MediaStreamTrackPrivate&) { }
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static RefPtr<MediaStreamPrivate> create(const Vector<RefPtr<RealtimeMediaSource>>& audioSources, const Vector<RefPtr<RealtimeMediaSource>>& videoSources);
- static RefPtr<MediaStreamPrivate> create(const MediaStreamTrackPrivateVector&);
</del><ins>+ static Ref<MediaStreamPrivate> create(const Vector<Ref<RealtimeMediaSource>>& audioSources, const Vector<Ref<RealtimeMediaSource>>& videoSources);
+ static Ref<MediaStreamPrivate> create(const MediaStreamTrackPrivateVector&);
</ins><span class="cx">
</span><span class="cx"> virtual ~MediaStreamPrivate();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeMediaSourceCenterMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp (208686 => 208687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2016-11-14 17:40:41 UTC (rev 208686)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2016-11-14 17:46:10 UTC (rev 208687)
</span><span class="lines">@@ -93,8 +93,8 @@
</span><span class="cx">
</span><span class="cx"> void RealtimeMediaSourceCenterMac::createMediaStream(NewMediaStreamHandler completionHandler, const String& audioDeviceID, const String& videoDeviceID, const MediaConstraints* audioConstraints, const MediaConstraints* videoConstraints)
</span><span class="cx"> {
</span><del>- Vector<RefPtr<RealtimeMediaSource>> audioSources;
- Vector<RefPtr<RealtimeMediaSource>> videoSources;
</del><ins>+ Vector<Ref<RealtimeMediaSource>> audioSources;
+ Vector<Ref<RealtimeMediaSource>> videoSources;
</ins><span class="cx"> String invalidConstraint;
</span><span class="cx">
</span><span class="cx"> if (!audioDeviceID.isEmpty()) {
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (audioSource)
</span><del>- audioSources.append(WTFMove(audioSource));
</del><ins>+ audioSources.append(audioSource.releaseNonNull());
</ins><span class="cx"> }
</span><span class="cx"> if (!videoDeviceID.isEmpty()) {
</span><span class="cx"> auto videoSource = AVCaptureDeviceManager::singleton().sourceWithUID(videoDeviceID, RealtimeMediaSource::Video, videoConstraints, invalidConstraint);
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> LOG(Media, "RealtimeMediaSourceCenterMac::createMediaStream(%p), video constraints failed to apply: %s", this, invalidConstraint.utf8().data());
</span><span class="cx"> #endif
</span><span class="cx"> if (videoSource)
</span><del>- videoSources.append(WTFMove(videoSource));
</del><ins>+ videoSources.append(videoSource.releaseNonNull());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (videoSources.isEmpty() && audioSources.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceCenterOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp (208686 => 208687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 2016-11-14 17:40:41 UTC (rev 208686)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 2016-11-14 17:46:10 UTC (rev 208687)
</span><span class="lines">@@ -120,8 +120,8 @@
</span><span class="cx">
</span><span class="cx"> void RealtimeMediaSourceCenterOwr::mediaSourcesAvailable(GList* sources)
</span><span class="cx"> {
</span><del>- Vector<RefPtr<RealtimeMediaSource>> audioSources;
- Vector<RefPtr<RealtimeMediaSource>> videoSources;
</del><ins>+ Vector<Ref<RealtimeMediaSource>> audioSources;
+ Vector<Ref<RealtimeMediaSource>> videoSources;
</ins><span class="cx">
</span><span class="cx"> for (auto item = sources; item; item = item->next) {
</span><span class="cx"> OwrMediaSource* source = OWR_MEDIA_SOURCE(item->data);
</span><span class="lines">@@ -149,16 +149,16 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<RealtimeMediaSourceOwr> mediaSource = adoptRef(new RealtimeMediaSourceOwr(source, id, mediaSourceType, sourceName));
</del><ins>+ auto mediaSource = adoptRef(*new RealtimeMediaSourceOwr(source, id, mediaSourceType, sourceName));
</ins><span class="cx">
</span><span class="cx"> RealtimeMediaSourceOwrMap::iterator sourceIterator = m_sourceMap.find(id);
</span><span class="cx"> if (sourceIterator == m_sourceMap.end())
</span><del>- m_sourceMap.add(id, mediaSource);
</del><ins>+ m_sourceMap.add(id, mediaSource.copyRef());
</ins><span class="cx">
</span><span class="cx"> if (mediaType & OWR_MEDIA_TYPE_AUDIO)
</span><del>- audioSources.append(mediaSource);
</del><ins>+ audioSources.append(WTFMove(mediaSource));
</ins><span class="cx"> else if (mediaType & OWR_MEDIA_TYPE_VIDEO)
</span><del>- videoSources.append(mediaSource);
</del><ins>+ videoSources.append(WTFMove(mediaSource));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (videoSources.isEmpty() && audioSources.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeMediaSourceCentercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp (208686 => 208687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp 2016-11-14 17:40:41 UTC (rev 208686)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp 2016-11-14 17:46:10 UTC (rev 208687)
</span><span class="lines">@@ -100,19 +100,19 @@
</span><span class="cx">
</span><span class="cx"> void MockRealtimeMediaSourceCenter::createMediaStream(NewMediaStreamHandler completionHandler, const String& audioDeviceID, const String& videoDeviceID, const MediaConstraints* audioConstraints, const MediaConstraints* videoConstraints)
</span><span class="cx"> {
</span><del>- Vector<RefPtr<RealtimeMediaSource>> audioSources;
- Vector<RefPtr<RealtimeMediaSource>> videoSources;
</del><ins>+ Vector<Ref<RealtimeMediaSource>> audioSources;
+ Vector<Ref<RealtimeMediaSource>> videoSources;
</ins><span class="cx">
</span><span class="cx"> if (audioDeviceID == MockRealtimeMediaSource::mockAudioSourcePersistentID()) {
</span><span class="cx"> auto source = MockRealtimeAudioSource::create(MockRealtimeMediaSource::mockAudioSourceName(), audioConstraints);
</span><span class="cx"> if (source)
</span><del>- audioSources.append(source.leakRef());
</del><ins>+ audioSources.append(source.releaseNonNull());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (videoDeviceID == MockRealtimeMediaSource::mockVideoSourcePersistentID()) {
</span><span class="cx"> auto source = MockRealtimeVideoSource::create(MockRealtimeMediaSource::mockVideoSourceName(), videoConstraints);
</span><span class="cx"> if (source)
</span><del>- videoSources.append(source.leakRef());
</del><ins>+ videoSources.append(source.releaseNonNull());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (videoSources.isEmpty() && audioSources.isEmpty())
</span></span></pre>
</div>
</div>
</body>
</html>