Diff
Modified: trunk/Source/WebCore/ChangeLog (194370 => 194371)
--- 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)
@@ -1,3 +1,27 @@
+2015-12-22 Eric Carlson <[email protected]>
+
+ [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):
+
2015-12-22 Commit Queue <[email protected]>
Unreviewed, rolling out r194362.
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (194370 => 194371)
--- 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)
@@ -315,7 +315,7 @@
{
MediaStreamTrackVector tracks;
for (auto& track : m_trackSet.values()) {
- if (track->source()->type() == filterType)
+ if (track->source().type() == filterType)
tracks.append(track);
}
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (194370 => 194371)
--- 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)
@@ -83,7 +83,7 @@
void applyConstraints(const Dictionary&);
void applyConstraints(const MediaConstraints&);
- RealtimeMediaSource* source() const { return m_private->source(); }
+ RealtimeMediaSource& source() const { return m_private->source(); }
MediaStreamTrackPrivate& privateTrack() { return m_private.get(); }
AudioSourceProvider* audioSourceProvider();
Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (194370 => 194371)
--- 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)
@@ -47,7 +47,7 @@
RefPtr<RTCDTMFSender> RTCDTMFSender::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
{
RefPtr<MediaStreamTrack> track = prpTrack;
- std::unique_ptr<RTCDTMFSenderHandler> handler = peerConnectionHandler->createDTMFSender(track->source());
+ std::unique_ptr<RTCDTMFSenderHandler> handler = peerConnectionHandler->createDTMFSender(&track->source());
if (!handler) {
ec = NOT_SUPPORTED_ERR;
return nullptr;
Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (194370 => 194371)
--- 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)
@@ -167,13 +167,13 @@
if (m_audioConstraints) {
for (auto& track : stream->getAudioTracks()) {
track->applyConstraints(*m_audioConstraints);
- track->source()->startProducingData();
+ track->source().startProducingData();
}
}
if (m_videoConstraints) {
for (auto& track : stream->getVideoTracks()) {
track->applyConstraints(*m_videoConstraints);
- track->source()->startProducingData();
+ track->source().startProducingData();
}
}
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (194370 => 194371)
--- 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)
@@ -217,7 +217,7 @@
if (!m_activeVideoTrack)
return nullptr;
- return m_activeVideoTrack->source()->platformLayer();
+ return m_activeVideoTrack->source().platformLayer();
}
void MediaStreamPrivate::paintCurrentFrameInContext(GraphicsContext& context, const FloatRect& rect)
@@ -241,7 +241,7 @@
if (!active() || !m_activeVideoTrack)
return nullptr;
- return m_activeVideoTrack->source()->currentFrameImage();
+ return m_activeVideoTrack->source().currentFrameImage();
}
void MediaStreamPrivate::updateActiveVideoTrack()
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (194370 => 194371)
--- 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)
@@ -50,7 +50,7 @@
MediaStreamTrackPrivate::MediaStreamTrackPrivate(const MediaStreamTrackPrivate& other)
: RefCounted()
- , m_source(other.source())
+ , m_source(&other.source())
, m_id(createCanonicalUUIDString())
, m_isEnabled(other.enabled())
, m_isEnded(other.ended())
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (194370 => 194371)
--- 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)
@@ -77,7 +77,7 @@
RefPtr<MediaStreamTrackPrivate> clone();
- RealtimeMediaSource* source() const { return m_source.get(); }
+ RealtimeMediaSource& source() const { return *m_source.get(); }
RealtimeMediaSource::Type type() const;
void endTrack();
