<!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>[194371] 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/194371">194371</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-22 13:45:49 -0800 (Tue, 22 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] MediaStreamTrackPrivate.source should be a reference
https://bugs.webkit.org/show_bug.cgi?id=152509
Reviewed by Tim Horton.
No new tests, no functional change.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::trackVectorForType):
* Modules/mediastream/MediaStreamTrack.h:
* Modules/mediastream/RTCDTMFSender.cpp:
(WebCore::RTCDTMFSender::create):
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::didCreateStream):
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::platformLayer):
(WebCore::MediaStreamPrivate::currentFrameImage):
* platform/mediastream/MediaStreamTrackPrivate.cpp:
(WebCore::MediaStreamTrackPrivate::MediaStreamTrackPrivate):
* platform/mediastream/MediaStreamTrackPrivate.h:
(WebCore::MediaStreamTrackPrivate::source):</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="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackh">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194370 => 194371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-22 20:37:33 UTC (rev 194370)
+++ trunk/Source/WebCore/ChangeLog 2015-12-22 21:45:49 UTC (rev 194371)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-12-22 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] MediaStreamTrackPrivate.source should be a reference
+ https://bugs.webkit.org/show_bug.cgi?id=152509
+
+ Reviewed by Tim Horton.
+
+ No new tests, no functional change.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::trackVectorForType):
+ * Modules/mediastream/MediaStreamTrack.h:
+ * Modules/mediastream/RTCDTMFSender.cpp:
+ (WebCore::RTCDTMFSender::create):
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::didCreateStream):
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::platformLayer):
+ (WebCore::MediaStreamPrivate::currentFrameImage):
+ * platform/mediastream/MediaStreamTrackPrivate.cpp:
+ (WebCore::MediaStreamTrackPrivate::MediaStreamTrackPrivate):
+ * platform/mediastream/MediaStreamTrackPrivate.h:
+ (WebCore::MediaStreamTrackPrivate::source):
+
</ins><span class="cx"> 2015-12-22 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r194362.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (194370 => 194371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-12-22 20:37:33 UTC (rev 194370)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-12-22 21:45:49 UTC (rev 194371)
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> {
</span><span class="cx"> MediaStreamTrackVector tracks;
</span><span class="cx"> for (auto& track : m_trackSet.values()) {
</span><del>- if (track->source()->type() == filterType)
</del><ins>+ if (track->source().type() == filterType)
</ins><span class="cx"> tracks.append(track);
</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 (194370 => 194371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-12-22 20:37:33 UTC (rev 194370)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-12-22 21:45:49 UTC (rev 194371)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> void applyConstraints(const Dictionary&);
</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() const { 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></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (194370 => 194371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2015-12-22 20:37:33 UTC (rev 194370)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2015-12-22 21:45:49 UTC (rev 194371)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> RefPtr<RTCDTMFSender> RTCDTMFSender::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<MediaStreamTrack> track = prpTrack;
</span><del>- std::unique_ptr<RTCDTMFSenderHandler> handler = peerConnectionHandler->createDTMFSender(track->source());
</del><ins>+ std::unique_ptr<RTCDTMFSenderHandler> handler = peerConnectionHandler->createDTMFSender(&track->source());
</ins><span class="cx"> if (!handler) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (194370 => 194371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-12-22 20:37:33 UTC (rev 194370)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-12-22 21:45:49 UTC (rev 194371)
</span><span class="lines">@@ -167,13 +167,13 @@
</span><span class="cx"> if (m_audioConstraints) {
</span><span class="cx"> for (auto& track : stream->getAudioTracks()) {
</span><span class="cx"> track->applyConstraints(*m_audioConstraints);
</span><del>- track->source()->startProducingData();
</del><ins>+ track->source().startProducingData();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (m_videoConstraints) {
</span><span class="cx"> for (auto& track : stream->getVideoTracks()) {
</span><span class="cx"> track->applyConstraints(*m_videoConstraints);
</span><del>- track->source()->startProducingData();
</del><ins>+ track->source().startProducingData();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (194370 => 194371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2015-12-22 20:37:33 UTC (rev 194370)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2015-12-22 21:45:49 UTC (rev 194371)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> if (!m_activeVideoTrack)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return m_activeVideoTrack->source()->platformLayer();
</del><ins>+ return m_activeVideoTrack->source().platformLayer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaStreamPrivate::paintCurrentFrameInContext(GraphicsContext& context, const FloatRect& rect)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> if (!active() || !m_activeVideoTrack)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return m_activeVideoTrack->source()->currentFrameImage();
</del><ins>+ return m_activeVideoTrack->source().currentFrameImage();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaStreamPrivate::updateActiveVideoTrack()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (194370 => 194371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2015-12-22 20:37:33 UTC (rev 194370)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2015-12-22 21:45:49 UTC (rev 194371)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> MediaStreamTrackPrivate::MediaStreamTrackPrivate(const MediaStreamTrackPrivate& other)
</span><span class="cx"> : RefCounted()
</span><del>- , m_source(other.source())
</del><ins>+ , m_source(&other.source())
</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></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (194370 => 194371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2015-12-22 20:37:33 UTC (rev 194370)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2015-12-22 21:45:49 UTC (rev 194371)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaStreamTrackPrivate> clone();
</span><span class="cx">
</span><del>- RealtimeMediaSource* source() const { return m_source.get(); }
</del><ins>+ RealtimeMediaSource& source() const { return *m_source.get(); }
</ins><span class="cx"> RealtimeMediaSource::Type type() const;
</span><span class="cx">
</span><span class="cx"> void endTrack();
</span></span></pre>
</div>
</div>
</body>
</html>