Title: [158620] trunk/Source/WebCore
- Revision
- 158620
- Author
- [email protected]
- Date
- 2013-11-04 17:26:49 -0800 (Mon, 04 Nov 2013)
Log Message
Fixing MediaStreamDescriptor addSource and addTrack methods
https://bugs.webkit.org/show_bug.cgi?id=123755
Patch by Thiago de Barros Lacerda <[email protected]> on 2013-11-04
Reviewed by Eric Carlson.
We must store the track and source that is passed as parameter in a RefPtr,
otherwise we will refer to a null pointer.
No new tests needed.
* platform/mediastream/MediaStreamDescriptor.cpp:
(WebCore::MediaStreamDescriptor::addSource):
(WebCore::MediaStreamDescriptor::addTrack):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158619 => 158620)
--- trunk/Source/WebCore/ChangeLog 2013-11-05 01:23:33 UTC (rev 158619)
+++ trunk/Source/WebCore/ChangeLog 2013-11-05 01:26:49 UTC (rev 158620)
@@ -1,3 +1,19 @@
+2013-11-04 Thiago de Barros Lacerda <[email protected]>
+
+ Fixing MediaStreamDescriptor addSource and addTrack methods
+ https://bugs.webkit.org/show_bug.cgi?id=123755
+
+ Reviewed by Eric Carlson.
+
+ We must store the track and source that is passed as parameter in a RefPtr,
+ otherwise we will refer to a null pointer.
+
+ No new tests needed.
+
+ * platform/mediastream/MediaStreamDescriptor.cpp:
+ (WebCore::MediaStreamDescriptor::addSource):
+ (WebCore::MediaStreamDescriptor::addTrack):
+
2013-11-04 Tim Horton <[email protected]>
Remove PlatformCALayer::playerLayer
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.cpp (158619 => 158620)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.cpp 2013-11-05 01:23:33 UTC (rev 158619)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.cpp 2013-11-05 01:26:49 UTC (rev 158620)
@@ -52,8 +52,9 @@
return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audioPrivateTracks, videoPrivateTracks));
}
-void MediaStreamDescriptor::addSource(PassRefPtr<MediaStreamSource> source)
+void MediaStreamDescriptor::addSource(PassRefPtr<MediaStreamSource> prpSource)
{
+ RefPtr<MediaStreamSource> source = prpSource;
switch (source->type()) {
case MediaStreamSource::Audio:
if (m_audioStreamSources.find(source) == notFound)
@@ -171,8 +172,9 @@
m_ended = true;
}
-void MediaStreamDescriptor::addTrack(PassRefPtr<MediaStreamTrackPrivate> track)
+void MediaStreamDescriptor::addTrack(PassRefPtr<MediaStreamTrackPrivate> prpTrack)
{
+ RefPtr<MediaStreamTrackPrivate> track = prpTrack;
if (track->ended())
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
