<!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>[208542] 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/208542">208542</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-10 09:26:22 -0800 (Thu, 10 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>MediaStreamTrack should use more Ref<> and less RefPtr<>
https://bugs.webkit.org/show_bug.cgi?id=164560
Patch by Youenn Fablet <youennf@gmail.com> on 2016-11-10
Reviewed by Eric Carlson.
No change of behavior.
Make MediaStreamTrack take a Ref<>& instead of a reference.
Using Ref<>&& instead of RefPtr<>&& in MediaStreamTrackPrivate.
Updating constness of some methods accordingly.
* Modules/mediastream/MediaEndpointPeerConnection.cpp:
(WebCore::MediaEndpointPeerConnection::createReceiver):
* Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::create):
(WebCore::MediaStreamTrack::MediaStreamTrack):
(WebCore::MediaStreamTrack::clone):
* Modules/mediastream/MediaStreamTrack.h:
* Modules/webaudio/MediaStreamAudioSource.cpp:
(WebCore::MediaStreamAudioSource::capabilities):
(WebCore::MediaStreamAudioSource::settings):
* Modules/webaudio/MediaStreamAudioSource.h:
* platform/mediastream/MediaEndpoint.cpp:
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::create):
* platform/mediastream/MediaStreamTrackPrivate.cpp:
(WebCore::MediaStreamTrackPrivate::create):
(WebCore::MediaStreamTrackPrivate::MediaStreamTrackPrivate):
(WebCore::MediaStreamTrackPrivate::clone):
* platform/mediastream/MediaStreamTrackPrivate.h:
(WebCore::MediaStreamTrackPrivate::setMuted):
(WebCore::MediaStreamTrackPrivate::source):
* platform/mediastream/RealtimeMediaSource.h:
* platform/mediastream/mac/AVMediaCaptureSource.h:
* platform/mediastream/mac/AVMediaCaptureSource.mm:
(WebCore::AVMediaCaptureSource::initializeSettings):
(WebCore::AVMediaCaptureSource::settings):
(WebCore::AVMediaCaptureSource::initializeCapabilities):
(WebCore::AVMediaCaptureSource::capabilities):
* platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h:
(WebCore::RealtimeMediaSourceOwr::capabilities):
(WebCore::RealtimeMediaSourceOwr::settings):
* platform/mock/MockRealtimeMediaSource.cpp:
(WebCore::MockRealtimeMediaSource::initializeCapabilities):
(WebCore::MockRealtimeMediaSource::capabilities):
(WebCore::MockRealtimeMediaSource::initializeSettings):
(WebCore::MockRealtimeMediaSource::settings):
* platform/mock/MockRealtimeMediaSource.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="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackh">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourcecpp">trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourceh">trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaEndpointcpp">trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourceh">trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceOwrh">trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourceh">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/ChangeLog 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2016-11-10 Youenn Fablet <youennf@gmail.com>
+
+ MediaStreamTrack should use more Ref<> and less RefPtr<>
+ https://bugs.webkit.org/show_bug.cgi?id=164560
+
+ Reviewed by Eric Carlson.
+
+ No change of behavior.
+
+ Make MediaStreamTrack take a Ref<>& instead of a reference.
+ Using Ref<>&& instead of RefPtr<>&& in MediaStreamTrackPrivate.
+ Updating constness of some methods accordingly.
+
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ (WebCore::MediaEndpointPeerConnection::createReceiver):
+ * Modules/mediastream/MediaStreamTrack.cpp:
+ (WebCore::MediaStreamTrack::create):
+ (WebCore::MediaStreamTrack::MediaStreamTrack):
+ (WebCore::MediaStreamTrack::clone):
+ * Modules/mediastream/MediaStreamTrack.h:
+ * Modules/webaudio/MediaStreamAudioSource.cpp:
+ (WebCore::MediaStreamAudioSource::capabilities):
+ (WebCore::MediaStreamAudioSource::settings):
+ * Modules/webaudio/MediaStreamAudioSource.h:
+ * platform/mediastream/MediaEndpoint.cpp:
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::create):
+ * platform/mediastream/MediaStreamTrackPrivate.cpp:
+ (WebCore::MediaStreamTrackPrivate::create):
+ (WebCore::MediaStreamTrackPrivate::MediaStreamTrackPrivate):
+ (WebCore::MediaStreamTrackPrivate::clone):
+ * platform/mediastream/MediaStreamTrackPrivate.h:
+ (WebCore::MediaStreamTrackPrivate::setMuted):
+ (WebCore::MediaStreamTrackPrivate::source):
+ * platform/mediastream/RealtimeMediaSource.h:
+ * platform/mediastream/mac/AVMediaCaptureSource.h:
+ * platform/mediastream/mac/AVMediaCaptureSource.mm:
+ (WebCore::AVMediaCaptureSource::initializeSettings):
+ (WebCore::AVMediaCaptureSource::settings):
+ (WebCore::AVMediaCaptureSource::initializeCapabilities):
+ (WebCore::AVMediaCaptureSource::capabilities):
+ * platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h:
+ (WebCore::RealtimeMediaSourceOwr::capabilities):
+ (WebCore::RealtimeMediaSourceOwr::settings):
+ * platform/mock/MockRealtimeMediaSource.cpp:
+ (WebCore::MockRealtimeMediaSource::initializeCapabilities):
+ (WebCore::MockRealtimeMediaSource::capabilities):
+ (WebCore::MockRealtimeMediaSource::initializeSettings):
+ (WebCore::MockRealtimeMediaSource::settings):
+ * platform/mock/MockRealtimeMediaSource.h:
+
</ins><span class="cx"> 2016-11-10 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win32] Crash in layout tests.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -699,8 +699,8 @@
</span><span class="cx">
</span><span class="cx"> // Create a muted remote source that will be unmuted once media starts arriving.
</span><span class="cx"> auto remoteSource = m_mediaEndpoint->createMutedRemoteSource(transceiverMid, sourceType);
</span><del>- auto remoteTrackPrivate = MediaStreamTrackPrivate::create(WTFMove(remoteSource), trackId);
- auto remoteTrack = MediaStreamTrack::create(*m_peerConnection.scriptExecutionContext(), *remoteTrackPrivate);
</del><ins>+ auto remoteTrackPrivate = MediaStreamTrackPrivate::create(WTFMove(remoteSource), String(trackId));
+ auto remoteTrack = MediaStreamTrack::create(*m_peerConnection.scriptExecutionContext(), WTFMove(remoteTrackPrivate));
</ins><span class="cx">
</span><span class="cx"> return RTCRtpReceiver::create(WTFMove(remoteTrack));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -48,14 +48,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext& context, MediaStreamTrackPrivate& privateTrack)
</del><ins>+Ref<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext& context, Ref<MediaStreamTrackPrivate>&& privateTrack)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new MediaStreamTrack(context, privateTrack));
</del><ins>+ return adoptRef(*new MediaStreamTrack(context, WTFMove(privateTrack)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStreamTrack::MediaStreamTrack(ScriptExecutionContext& context, MediaStreamTrackPrivate& privateTrack)
</del><ins>+MediaStreamTrack::MediaStreamTrack(ScriptExecutionContext& context, Ref<MediaStreamTrackPrivate>&& privateTrack)
</ins><span class="cx"> : ActiveDOMObject(&context)
</span><del>- , m_private(privateTrack)
</del><ins>+ , m_private(WTFMove(privateTrack))
</ins><span class="cx"> , m_weakPtrFactory(this)
</span><span class="cx"> {
</span><span class="cx"> suspendIfNeeded();
</span><span class="lines">@@ -123,9 +123,9 @@
</span><span class="cx"> return m_ended || m_private->ended();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<MediaStreamTrack> MediaStreamTrack::clone()
</del><ins>+Ref<MediaStreamTrack> MediaStreamTrack::clone()
</ins><span class="cx"> {
</span><del>- return MediaStreamTrack::create(*scriptExecutionContext(), *m_private->clone());
</del><ins>+ return MediaStreamTrack::create(*scriptExecutionContext(), m_private->clone());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaStreamTrack::stopProducingData()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> virtual void trackDidEnd() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static Ref<MediaStreamTrack> create(ScriptExecutionContext&, MediaStreamTrackPrivate&);
</del><ins>+ static Ref<MediaStreamTrack> create(ScriptExecutionContext&, Ref<MediaStreamTrackPrivate>&&);
</ins><span class="cx"> virtual ~MediaStreamTrack();
</span><span class="cx">
</span><span class="cx"> const AtomicString& kind() const;
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> bool ended() const;
</span><span class="cx">
</span><del>- RefPtr<MediaStreamTrack> clone();
</del><ins>+ Ref<MediaStreamTrack> clone();
</ins><span class="cx"> void stopProducingData();
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaTrackConstraints> getConstraints() const;
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> void applyConstraints(Ref<MediaConstraints>&&, DOMPromise<void>&&);
</span><span class="cx"> void applyConstraints(const MediaConstraints&);
</span><span class="cx">
</span><del>- RealtimeMediaSource& source() const { return m_private->source(); }
</del><ins>+ RealtimeMediaSource& source() { return m_private->source(); }
</ins><span class="cx"> MediaStreamTrackPrivate& privateTrack() { return m_private.get(); }
</span><span class="cx">
</span><span class="cx"> AudioSourceProvider* audioSourceProvider();
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> using RefCounted<MediaStreamTrack>::deref;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- MediaStreamTrack(ScriptExecutionContext&, MediaStreamTrackPrivate&);
</del><ins>+ MediaStreamTrack(ScriptExecutionContext&, Ref<MediaStreamTrackPrivate>&&);
</ins><span class="cx"> explicit MediaStreamTrack(MediaStreamTrack&);
</span><span class="cx">
</span><span class="cx"> void configureTrackRendering();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RealtimeMediaSourceCapabilities> MediaStreamAudioSource::capabilities()
</del><ins>+RefPtr<RealtimeMediaSourceCapabilities> MediaStreamAudioSource::capabilities() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement this.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=122430
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const RealtimeMediaSourceSettings& MediaStreamAudioSource::settings()
</del><ins>+const RealtimeMediaSourceSettings& MediaStreamAudioSource::settings() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement this.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=122430
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -41,15 +41,15 @@
</span><span class="cx"> class AudioBus;
</span><span class="cx"> class RealtimeMediaSourceCapabilities;
</span><span class="cx">
</span><del>-class MediaStreamAudioSource : public RealtimeMediaSource {
</del><ins>+class MediaStreamAudioSource final : public RealtimeMediaSource {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<MediaStreamAudioSource> create();
</span><span class="cx">
</span><span class="cx"> ~MediaStreamAudioSource() { }
</span><span class="cx">
</span><del>- RefPtr<RealtimeMediaSourceCapabilities> capabilities() override;
- const RealtimeMediaSourceSettings& settings() override;
-
</del><ins>+ RefPtr<RealtimeMediaSourceCapabilities> capabilities() const final;
+ const RealtimeMediaSourceSettings& settings() const final;
+
</ins><span class="cx"> const String& deviceId() const { return m_deviceId; }
</span><span class="cx"> void setDeviceId(const String& deviceId) { m_deviceId = deviceId; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -38,12 +38,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class EmptyRealtimeMediaSource : public RealtimeMediaSource {
</del><ins>+class EmptyRealtimeMediaSource final : public RealtimeMediaSource {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<EmptyRealtimeMediaSource> create() { return adoptRef(*new EmptyRealtimeMediaSource()); }
</span><span class="cx">
</span><del>- RefPtr<RealtimeMediaSourceCapabilities> capabilities() override { return nullptr; }
- const RealtimeMediaSourceSettings& settings() override { return m_sourceSettings; }
</del><ins>+ RefPtr<RealtimeMediaSourceCapabilities> capabilities() const final { return nullptr; }
+ const RealtimeMediaSourceSettings& settings() const final { return m_sourceSettings; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> EmptyRealtimeMediaSource()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -50,11 +50,15 @@
</span><span class="cx"> MediaStreamTrackPrivateVector tracks;
</span><span class="cx"> tracks.reserveCapacity(audioSources.size() + videoSources.size());
</span><span class="cx">
</span><del>- for (auto source : audioSources)
- tracks.append(MediaStreamTrackPrivate::create(WTFMove(source)));
</del><ins>+ for (auto source : audioSources) {
+ ASSERT(source);
+ tracks.append(MediaStreamTrackPrivate::create(source.releaseNonNull()));
+ }
</ins><span class="cx">
</span><del>- for (auto source : videoSources)
- tracks.append(MediaStreamTrackPrivate::create(WTFMove(source)));
</del><ins>+ for (auto source : videoSources) {
+ ASSERT(source);
+ tracks.append(MediaStreamTrackPrivate::create(source.releaseNonNull()));
+ }
</ins><span class="cx">
</span><span class="cx"> return MediaStreamPrivate::create(tracks);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -37,19 +37,18 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<MediaStreamTrackPrivate> MediaStreamTrackPrivate::create(RefPtr<RealtimeMediaSource>&& source)
</del><ins>+Ref<MediaStreamTrackPrivate> MediaStreamTrackPrivate::create(Ref<RealtimeMediaSource>&& source)
</ins><span class="cx"> {
</span><del>- return adoptRef(new MediaStreamTrackPrivate(WTFMove(source), createCanonicalUUIDString()));
</del><ins>+ return adoptRef(*new MediaStreamTrackPrivate(WTFMove(source), createCanonicalUUIDString()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<MediaStreamTrackPrivate> MediaStreamTrackPrivate::create(RefPtr<RealtimeMediaSource>&& source, const String& id)
</del><ins>+Ref<MediaStreamTrackPrivate> MediaStreamTrackPrivate::create(Ref<RealtimeMediaSource>&& source, String&& id)
</ins><span class="cx"> {
</span><del>- return adoptRef(new MediaStreamTrackPrivate(WTFMove(source), id));
</del><ins>+ return adoptRef(*new MediaStreamTrackPrivate(WTFMove(source), WTFMove(id)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaStreamTrackPrivate::MediaStreamTrackPrivate(const MediaStreamTrackPrivate& other)
</span><del>- : RefCounted()
- , m_source(&other.source())
</del><ins>+ : m_source(other.m_source.copyRef())
</ins><span class="cx"> , m_id(createCanonicalUUIDString())
</span><span class="cx"> , m_isEnabled(other.enabled())
</span><span class="cx"> , m_isEnded(other.ended())
</span><span class="lines">@@ -57,10 +56,9 @@
</span><span class="cx"> m_source->addObserver(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStreamTrackPrivate::MediaStreamTrackPrivate(RefPtr<RealtimeMediaSource>&& source, const String& id)
- : RefCounted()
- , m_source(source)
- , m_id(id)
</del><ins>+MediaStreamTrackPrivate::MediaStreamTrackPrivate(Ref<RealtimeMediaSource>&& source, String&& id)
+ : m_source(WTFMove(source))
+ , m_id(WTFMove(id))
</ins><span class="cx"> , m_isEnabled(true)
</span><span class="cx"> , m_isEnded(false)
</span><span class="cx"> {
</span><span class="lines">@@ -132,9 +130,9 @@
</span><span class="cx"> observer->trackEnded(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<MediaStreamTrackPrivate> MediaStreamTrackPrivate::clone()
</del><ins>+Ref<MediaStreamTrackPrivate> MediaStreamTrackPrivate::clone()
</ins><span class="cx"> {
</span><del>- return adoptRef(new MediaStreamTrackPrivate(*this));
</del><ins>+ return adoptRef(*new MediaStreamTrackPrivate(*this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RealtimeMediaSource::Type MediaStreamTrackPrivate::type() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -53,10 +53,10 @@
</span><span class="cx"> virtual void trackEnabledChanged(MediaStreamTrackPrivate&) = 0;
</span><span class="cx"> virtual void sampleBufferUpdated(MediaStreamTrackPrivate&, MediaSample&) { };
</span><span class="cx"> };
</span><del>-
- static RefPtr<MediaStreamTrackPrivate> create(RefPtr<RealtimeMediaSource>&&);
- static RefPtr<MediaStreamTrackPrivate> create(RefPtr<RealtimeMediaSource>&&, const String& id);
</del><span class="cx">
</span><ins>+ static Ref<MediaStreamTrackPrivate> create(Ref<RealtimeMediaSource>&&);
+ static Ref<MediaStreamTrackPrivate> create(Ref<RealtimeMediaSource>&&, String&& id);
+
</ins><span class="cx"> virtual ~MediaStreamTrackPrivate();
</span><span class="cx">
</span><span class="cx"> const String& id() const { return m_id; }
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> bool isProducingData() { return m_source->isProducingData(); }
</span><span class="cx">
</span><span class="cx"> bool muted() const;
</span><del>- void setMuted(bool muted) const { m_source->setMuted(muted); }
</del><ins>+ void setMuted(bool muted) { m_source->setMuted(muted); }
</ins><span class="cx">
</span><span class="cx"> bool readonly() const;
</span><span class="cx"> bool remote() const;
</span><span class="lines">@@ -77,9 +77,9 @@
</span><span class="cx"> bool enabled() const { return m_isEnabled; }
</span><span class="cx"> void setEnabled(bool);
</span><span class="cx">
</span><del>- RefPtr<MediaStreamTrackPrivate> clone();
</del><ins>+ Ref<MediaStreamTrackPrivate> clone();
</ins><span class="cx">
</span><del>- RealtimeMediaSource& source() const { return *m_source.get(); }
</del><ins>+ RealtimeMediaSource& source() { return m_source.get(); }
</ins><span class="cx"> RealtimeMediaSource::Type type() const;
</span><span class="cx">
</span><span class="cx"> void endTrack();
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaStreamTrackPrivate(const MediaStreamTrackPrivate&);
</span><del>- MediaStreamTrackPrivate(RefPtr<RealtimeMediaSource>&&, const String& id);
</del><ins>+ MediaStreamTrackPrivate(Ref<RealtimeMediaSource>&&, String&& id);
</ins><span class="cx">
</span><span class="cx"> // RealtimeMediaSourceObserver
</span><span class="cx"> void sourceStopped() final;
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> void sourceHasMoreMediaData(MediaSample&) final;
</span><span class="cx">
</span><span class="cx"> Vector<Observer*> m_observers;
</span><del>- RefPtr<RealtimeMediaSource> m_source;
</del><ins>+ Ref<RealtimeMediaSource> m_source;
</ins><span class="cx"> RefPtr<MediaConstraints> m_constraints;
</span><span class="cx">
</span><span class="cx"> String m_id;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx"> virtual unsigned fitnessScore() const { return m_fitnessScore; }
</span><span class="cx"> virtual void setFitnessScore(const unsigned fitnessScore) { m_fitnessScore = fitnessScore; }
</span><span class="cx">
</span><del>- virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() = 0;
- virtual const RealtimeMediaSourceSettings& settings() = 0;
</del><ins>+ virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const = 0;
+ virtual const RealtimeMediaSourceSettings& settings() const = 0;
</ins><span class="cx">
</span><span class="cx"> using SuccessHandler = std::function<void()>;
</span><span class="cx"> using FailureHandler = std::function<void(const String& badConstraint, const String& errorString)>;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -53,10 +53,10 @@
</span><span class="cx"> virtual void captureOutputDidOutputSampleBufferFromConnection(AVCaptureOutput*, CMSampleBufferRef, AVCaptureConnection*) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void captureSessionIsRunningDidChange(bool);
</span><del>-
</del><ins>+
</ins><span class="cx"> AVCaptureSession *session() const { return m_session.get(); }
</span><span class="cx">
</span><del>- const RealtimeMediaSourceSettings& settings() override;
</del><ins>+ const RealtimeMediaSourceSettings& settings() const override;
</ins><span class="cx">
</span><span class="cx"> void startProducingData() override;
</span><span class="cx"> void stopProducingData() override;
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> MediaConstraints* constraints() { return m_constraints.get(); }
</span><span class="cx">
</span><span class="cx"> RealtimeMediaSourceSupportedConstraints& supportedConstraints();
</span><del>- RefPtr<RealtimeMediaSourceCapabilities> capabilities() override;
</del><ins>+ RefPtr<RealtimeMediaSourceCapabilities> capabilities() const override;
</ins><span class="cx">
</span><span class="cx"> void setVideoSampleBufferDelegate(AVCaptureVideoDataOutput*);
</span><span class="cx"> void setAudioSampleBufferDelegate(AVCaptureAudioDataOutput*);
</span><span class="lines">@@ -87,6 +87,9 @@
</span><span class="cx"> void setupSession();
</span><span class="cx"> void reset() override;
</span><span class="cx">
</span><ins>+ void initializeSettings();
+ void initializeCapabilities();
+
</ins><span class="cx"> RealtimeMediaSourceSettings m_currentSettings;
</span><span class="cx"> RealtimeMediaSourceSupportedConstraints m_supportedConstraints;
</span><span class="cx"> RetainPtr<WebCoreAVMediaCaptureSourceObserver> m_objcObserver;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> [m_session.get() stopRunning];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const RealtimeMediaSourceSettings& AVMediaCaptureSource::settings()
</del><ins>+void AVMediaCaptureSource::initializeSettings()
</ins><span class="cx"> {
</span><span class="cx"> if (m_currentSettings.deviceId().isEmpty())
</span><span class="cx"> m_currentSettings.setSupportedConstraits(supportedConstraints());
</span><span class="lines">@@ -170,6 +170,11 @@
</span><span class="cx">
</span><span class="cx"> m_currentSettings.setDeviceId(id());
</span><span class="cx"> updateSettings(m_currentSettings);
</span><ins>+}
+
+const RealtimeMediaSourceSettings& AVMediaCaptureSource::settings() const
+{
+ const_cast<AVMediaCaptureSource&>(*this).initializeSettings();
</ins><span class="cx"> return m_currentSettings;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -184,14 +189,18 @@
</span><span class="cx"> return m_supportedConstraints;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RealtimeMediaSourceCapabilities> AVMediaCaptureSource::capabilities()
</del><ins>+void AVMediaCaptureSource::initializeCapabilities()
</ins><span class="cx"> {
</span><del>- if (!m_capabilities) {
- m_capabilities = RealtimeMediaSourceCapabilities::create(AVCaptureDeviceManager::singleton().supportedConstraints());
- m_capabilities->setDeviceId(id());
</del><ins>+ m_capabilities = RealtimeMediaSourceCapabilities::create(AVCaptureDeviceManager::singleton().supportedConstraints());
+ m_capabilities->setDeviceId(id());
</ins><span class="cx">
</span><del>- initializeCapabilities(*m_capabilities.get());
- }
</del><ins>+ initializeCapabilities(*m_capabilities.get());
+}
+
+RefPtr<RealtimeMediaSourceCapabilities> AVMediaCaptureSource::capabilities() const
+{
+ if (!m_capabilities)
+ const_cast<AVMediaCaptureSource&>(*this).initializeCapabilities();
</ins><span class="cx"> return m_capabilities;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceOwrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx"> setMuted(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() { return m_capabilities; }
- virtual const RealtimeMediaSourceSettings& settings() { return m_currentSettings; }
</del><ins>+ virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const { return m_capabilities; }
+ virtual const RealtimeMediaSourceSettings& settings() const { return m_currentSettings; }
</ins><span class="cx">
</span><span class="cx"> OwrMediaSource* mediaSource() const { return m_mediaSource; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -90,19 +90,21 @@
</span><span class="cx"> setPersistentID(mockVideoSourcePersistentID());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RealtimeMediaSourceCapabilities> MockRealtimeMediaSource::capabilities()
</del><ins>+void MockRealtimeMediaSource::initializeCapabilities()
</ins><span class="cx"> {
</span><del>- if (m_capabilities)
- return m_capabilities;
-
</del><span class="cx"> m_capabilities = RealtimeMediaSourceCapabilities::create(supportedConstraints());
</span><span class="cx"> m_capabilities->setDeviceId(id());
</span><span class="cx"> initializeCapabilities(*m_capabilities.get());
</span><ins>+}
</ins><span class="cx">
</span><ins>+RefPtr<RealtimeMediaSourceCapabilities> MockRealtimeMediaSource::capabilities() const
+{
+ if (!m_capabilities)
+ const_cast<MockRealtimeMediaSource&>(*this).initializeCapabilities();
</ins><span class="cx"> return m_capabilities;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const RealtimeMediaSourceSettings& MockRealtimeMediaSource::settings()
</del><ins>+void MockRealtimeMediaSource::initializeSettings()
</ins><span class="cx"> {
</span><span class="cx"> if (m_currentSettings.deviceId().isEmpty()) {
</span><span class="cx"> m_currentSettings.setSupportedConstraits(supportedConstraints());
</span><span class="lines">@@ -110,6 +112,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> updateSettings(m_currentSettings);
</span><ins>+}
+
+const RealtimeMediaSourceSettings& MockRealtimeMediaSource::settings() const
+{
+ const_cast<MockRealtimeMediaSource&>(*this).initializeSettings();
</ins><span class="cx"> return m_currentSettings;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h (208541 => 208542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h 2016-11-10 17:23:01 UTC (rev 208541)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h 2016-11-10 17:26:22 UTC (rev 208542)
</span><span class="lines">@@ -72,14 +72,15 @@
</span><span class="cx"> void startProducingData() override;
</span><span class="cx"> void stopProducingData() override;
</span><span class="cx">
</span><del>- RefPtr<RealtimeMediaSourceCapabilities> capabilities() override;
- const RealtimeMediaSourceSettings& settings() override;
</del><ins>+ RefPtr<RealtimeMediaSourceCapabilities> capabilities() const override;
+ const RealtimeMediaSourceSettings& settings() const override;
</ins><span class="cx">
</span><span class="cx"> MediaConstraints& constraints() { return *m_constraints.get(); }
</span><span class="cx"> RealtimeMediaSourceSupportedConstraints& supportedConstraints();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-
</del><ins>+ void initializeCapabilities();
+ void initializeSettings();
</ins><span class="cx"> bool isProducingData() const override { return m_isProducingData; }
</span><span class="cx">
</span><span class="cx"> RealtimeMediaSourceSettings m_currentSettings;
</span></span></pre>
</div>
</div>
</body>
</html>