<!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>[214042] 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/214042">214042</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-16 08:21:11 -0700 (Thu, 16 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>MediaStreamTrack remote() no longer exists
https://bugs.webkit.org/show_bug.cgi?id=169734
Patch by Youenn Fablet <youenn@apple.com> on 2017-03-16
Reviewed by Alex Christensen.
Removing MediaStreamTrack remote.
Removing RealtimeMediaSource::remote as isCaptureSource which is closer to its use in MediaStreamPrivate to
detect whether sources are capture sources or not.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::mediaState):
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::hasCaptureVideoSource):
(WebCore::MediaStreamPrivate::hasCaptureAudioSource):
(WebCore::MediaStreamPrivate::hasLocalVideoSource): Deleted.
(WebCore::MediaStreamPrivate::hasLocalAudioSource): Deleted.
* platform/mediastream/MediaStreamPrivate.h:
* Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::stopProducingData):
(WebCore::MediaStreamTrack::remote): Deleted.
* Modules/mediastream/MediaStreamTrack.h:
* Modules/mediastream/MediaStreamTrack.idl:
* Modules/webaudio/MediaStreamAudioSource.h:
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::hasLocalVideoSource):
(WebCore::MediaStreamPrivate::hasLocalAudioSource):
* platform/mediastream/MediaStreamTrackPrivate.cpp:
(WebCore::MediaStreamTrackPrivate::isCaptureTrack):
(WebCore::MediaStreamTrackPrivate::remote): Deleted.
* platform/mediastream/MediaStreamTrackPrivate.h:
* platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::reset):
* platform/mediastream/RealtimeMediaSource.h:
(WebCore::RealtimeMediaSource::isCaptureSource):
(WebCore::RealtimeMediaSource::remote): Deleted.
(WebCore::RealtimeMediaSource::setRemote): Deleted.
* platform/mediastream/mac/AVMediaCaptureSource.h:
* platform/mock/MockRealtimeAudioSource.h:
* platform/mock/MockRealtimeVideoSource.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.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="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackidl">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourceh">trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h</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="#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="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</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="#trunkSourceWebCoreplatformmockMockRealtimeAudioSourceh">trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeVideoSourceh">trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/ChangeLog 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2017-03-16 Youenn Fablet <youenn@apple.com>
+
+ MediaStreamTrack remote() no longer exists
+ https://bugs.webkit.org/show_bug.cgi?id=169734
+
+ Reviewed by Alex Christensen.
+
+ Removing MediaStreamTrack remote.
+ Removing RealtimeMediaSource::remote as isCaptureSource which is closer to its use in MediaStreamPrivate to
+ detect whether sources are capture sources or not.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::mediaState):
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::hasCaptureVideoSource):
+ (WebCore::MediaStreamPrivate::hasCaptureAudioSource):
+ (WebCore::MediaStreamPrivate::hasLocalVideoSource): Deleted.
+ (WebCore::MediaStreamPrivate::hasLocalAudioSource): Deleted.
+ * platform/mediastream/MediaStreamPrivate.h:
+ * Modules/mediastream/MediaStreamTrack.cpp:
+ (WebCore::MediaStreamTrack::stopProducingData):
+ (WebCore::MediaStreamTrack::remote): Deleted.
+ * Modules/mediastream/MediaStreamTrack.h:
+ * Modules/mediastream/MediaStreamTrack.idl:
+ * Modules/webaudio/MediaStreamAudioSource.h:
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::hasLocalVideoSource):
+ (WebCore::MediaStreamPrivate::hasLocalAudioSource):
+ * platform/mediastream/MediaStreamTrackPrivate.cpp:
+ (WebCore::MediaStreamTrackPrivate::isCaptureTrack):
+ (WebCore::MediaStreamTrackPrivate::remote): Deleted.
+ * platform/mediastream/MediaStreamTrackPrivate.h:
+ * platform/mediastream/RealtimeMediaSource.cpp:
+ (WebCore::RealtimeMediaSource::reset):
+ * platform/mediastream/RealtimeMediaSource.h:
+ (WebCore::RealtimeMediaSource::isCaptureSource):
+ (WebCore::RealtimeMediaSource::remote): Deleted.
+ (WebCore::RealtimeMediaSource::setRemote): Deleted.
+ * platform/mediastream/mac/AVMediaCaptureSource.h:
+ * platform/mock/MockRealtimeAudioSource.h:
+ * platform/mock/MockRealtimeVideoSource.h:
+
</ins><span class="cx"> 2017-03-16 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Crash on debug removing a positioned child
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -314,13 +314,13 @@
</span><span class="cx">
</span><span class="cx"> if (m_private->hasAudio()) {
</span><span class="cx"> state |= HasAudioOrVideo;
</span><del>- if (m_private->hasLocalAudioSource() && m_private->isProducingData())
</del><ins>+ if (m_private->hasCaptureAudioSource() && m_private->isProducingData())
</ins><span class="cx"> state |= HasActiveAudioCaptureDevice;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_private->hasVideo()) {
</span><span class="cx"> state |= HasAudioOrVideo;
</span><del>- if (m_private->hasLocalVideoSource() && m_private->isProducingData())
</del><ins>+ if (m_private->hasCaptureVideoSource() && m_private->isProducingData())
</ins><span class="cx"> state |= HasActiveVideoCaptureDevice;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -103,11 +103,6 @@
</span><span class="cx"> return m_private->readonly();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaStreamTrack::remote() const
-{
- return m_private->remote();
-}
-
</del><span class="cx"> auto MediaStreamTrack::readyState() const -> State
</span><span class="cx"> {
</span><span class="cx"> return ended() ? State::Ended : State::Live;
</span><span class="lines">@@ -125,25 +120,13 @@
</span><span class="cx">
</span><span class="cx"> void MediaStreamTrack::stopProducingData()
</span><span class="cx"> {
</span><del>- // NOTE: this method is called when the "stop" method is called from JS, using
- // the "ImplementedAs" IDL attribute. This is done because ActiveDOMObject requires
- // a "stop" method.
</del><ins>+ // NOTE: this method is called when the "stop" method is called from JS, using the "ImplementedAs" IDL attribute.
+ // This is done because ActiveDOMObject requires a "stop" method.
</ins><span class="cx">
</span><del>- // http://w3c.github.io/mediacapture-main/#widl-MediaStreamTrack-stop-void
- // 4.3.3.2 Methods
- // When a MediaStreamTrack object's stop() method is invoked, the User Agent must run following steps:
- // 1. Let track be the current MediaStreamTrack object.
- // 2. If track is sourced by a non-local source, then abort these steps.
- if (remote() || ended())
</del><ins>+ if (ended())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- // 3. Notify track's source that track is ended so that the source may be stopped, unless other
- // MediaStreamTrack objects depend on it.
- // 4. Set track's readyState attribute to ended.
-
- // Set m_ended to true before telling the private to stop so we do not fire an 'ended' event.
</del><span class="cx"> m_ended = true;
</span><del>-
</del><span class="cx"> m_private->endTrack();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx">
</span><span class="cx"> bool muted() const;
</span><span class="cx"> bool readonly() const;
</span><del>- bool remote() const;
</del><span class="cx">
</span><span class="cx"> enum class State { New, Live, Ended };
</span><span class="cx"> State readyState() const;
</span><span class="lines">@@ -75,6 +74,8 @@
</span><span class="cx"> Ref<MediaStreamTrack> clone();
</span><span class="cx"> void stopProducingData();
</span><span class="cx">
</span><ins>+ bool isCaptureTrack() const;
+
</ins><span class="cx"> struct TrackSettings {
</span><span class="cx"> std::optional<int> width;
</span><span class="cx"> std::optional<int> height;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> attribute EventHandler onmute;
</span><span class="cx"> attribute EventHandler onunmute;
</span><span class="cx"> readonly attribute boolean _readonly;
</span><del>- readonly attribute boolean remote;
</del><span class="cx"> readonly attribute MediaStreamTrackState readyState;
</span><span class="cx"> attribute EventHandler onended;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> MediaStreamAudioSource();
</span><span class="cx">
</span><span class="cx"> AudioSourceProvider* audioSourceProvider() override;
</span><ins>+ bool isCaptureSource() const final { return true; }
</ins><span class="cx">
</span><span class="cx"> String m_deviceId;
</span><span class="cx"> Lock m_audioConsumersLock;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -199,19 +199,19 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaStreamPrivate::hasLocalVideoSource() const
</del><ins>+bool MediaStreamPrivate::hasCaptureVideoSource() const
</ins><span class="cx"> {
</span><span class="cx"> for (auto& track : m_trackSet.values()) {
</span><del>- if (track->type() == RealtimeMediaSource::Type::Video && !track->remote())
</del><ins>+ if (track->type() == RealtimeMediaSource::Type::Video && track->isCaptureTrack())
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaStreamPrivate::hasLocalAudioSource() const
</del><ins>+bool MediaStreamPrivate::hasCaptureAudioSource() const
</ins><span class="cx"> {
</span><span class="cx"> for (auto& track : m_trackSet.values()) {
</span><del>- if (track->type() == RealtimeMediaSource::Type::Audio && !track->remote())
</del><ins>+ if (track->type() == RealtimeMediaSource::Type::Audio && track->isCaptureTrack())
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -97,8 +97,8 @@
</span><span class="cx"> bool hasAudio() const;
</span><span class="cx"> bool muted() const;
</span><span class="cx">
</span><del>- bool hasLocalVideoSource() const;
- bool hasLocalAudioSource() const;
</del><ins>+ bool hasCaptureVideoSource() const;
+ bool hasCaptureAudioSource() const;
</ins><span class="cx">
</span><span class="cx"> FloatSize intrinsicSize() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -85,9 +85,9 @@
</span><span class="cx"> return m_source->readonly();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaStreamTrackPrivate::remote() const
</del><ins>+bool MediaStreamTrackPrivate::isCaptureTrack() const
</ins><span class="cx"> {
</span><del>- return m_source->remote();
</del><ins>+ return m_source->isCaptureSource();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaStreamTrackPrivate::setEnabled(bool enabled)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> void setMuted(bool muted) { m_source->setMuted(muted); }
</span><span class="cx">
</span><span class="cx"> bool readonly() const;
</span><del>- bool remote() const;
</del><ins>+ bool isCaptureTrack() const;
</ins><span class="cx">
</span><span class="cx"> bool enabled() const { return m_isEnabled; }
</span><span class="cx"> void setEnabled(bool);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> m_stopped = false;
</span><span class="cx"> m_muted = false;
</span><span class="cx"> m_readonly = false;
</span><del>- m_remote = false;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RealtimeMediaSource::addObserver(RealtimeMediaSource::Observer& observer)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -134,8 +134,7 @@
</span><span class="cx"> virtual bool readonly() const;
</span><span class="cx"> virtual void setReadonly(bool readonly) { m_readonly = readonly; }
</span><span class="cx">
</span><del>- virtual bool remote() const { return m_remote; }
- virtual void setRemote(bool remote) { m_remote = remote; }
</del><ins>+ virtual bool isCaptureSource() const { return false; }
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void addObserver(Observer&);
</span><span class="cx"> WEBCORE_EXPORT void removeObserver(Observer&);
</span><span class="lines">@@ -226,7 +225,6 @@
</span><span class="cx"> bool m_echoCancellation { false };
</span><span class="cx"> bool m_stopped { false };
</span><span class="cx"> bool m_readonly { false };
</span><del>- bool m_remote { false };
</del><span class="cx"> bool m_pendingSettingsDidChangeNotification { false };
</span><span class="cx"> bool m_suppressNotifications { true };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -96,6 +96,8 @@
</span><span class="cx"> void beginConfiguration() final;
</span><span class="cx"> void commitConfiguration() final;
</span><span class="cx">
</span><ins>+ bool isCaptureSource() const final { return true; }
+
</ins><span class="cx"> void initializeSettings();
</span><span class="cx"> void initializeCapabilities();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeAudioSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.h (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.h 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.h 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -73,6 +73,8 @@
</span><span class="cx">
</span><span class="cx"> void tick();
</span><span class="cx">
</span><ins>+ bool isCaptureSource() const final { return true; }
+
</ins><span class="cx"> RunLoop::Timer<MockRealtimeAudioSource> m_timer;
</span><span class="cx"> double m_startTime { NAN };
</span><span class="cx"> double m_lastRenderTime { NAN };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeVideoSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.h (214041 => 214042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.h 2017-03-16 13:52:46 UTC (rev 214041)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.h 2017-03-16 15:21:11 UTC (rev 214042)
</span><span class="lines">@@ -78,6 +78,8 @@
</span><span class="cx"> bool applyFacingMode(RealtimeMediaSourceSettings::VideoFacingMode) override { return true; }
</span><span class="cx"> bool applyAspectRatio(double) override { return true; }
</span><span class="cx">
</span><ins>+ bool isCaptureSource() const final { return true; }
+
</ins><span class="cx"> void generateFrame();
</span><span class="cx">
</span><span class="cx"> float m_baseFontSize { 0 };
</span></span></pre>
</div>
</div>
</body>
</html>