Title: [217915] trunk
- Revision
- 217915
- Author
- [email protected]
- Date
- 2017-06-07 20:12:47 -0700 (Wed, 07 Jun 2017)
Log Message
RTCTrackEvent.track should be found in RTCTrackEvent.streams[0]
https://bugs.webkit.org/show_bug.cgi?id=173074
Patch by Youenn Fablet <[email protected]> on 2017-06-07
Reviewed by Eric Carlson.
Source/WebCore:
Covered by updated test.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::addTrackFromPlatform):
LayoutTests:
* webrtc/video.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (217914 => 217915)
--- trunk/LayoutTests/ChangeLog 2017-06-08 03:10:43 UTC (rev 217914)
+++ trunk/LayoutTests/ChangeLog 2017-06-08 03:12:47 UTC (rev 217915)
@@ -1,3 +1,12 @@
+2017-06-07 Youenn Fablet <[email protected]>
+
+ RTCTrackEvent.track should be found in RTCTrackEvent.streams[0]
+ https://bugs.webkit.org/show_bug.cgi?id=173074
+
+ Reviewed by Eric Carlson.
+
+ * webrtc/video.html:
+
2017-06-07 Devin Rousso <[email protected]>
Web Inspector: Add ContextMenu item to log WebSocket object to console
Modified: trunk/LayoutTests/webrtc/video.html (217914 => 217915)
--- trunk/LayoutTests/webrtc/video.html 2017-06-08 03:10:43 UTC (rev 217914)
+++ trunk/LayoutTests/webrtc/video.html 2017-06-08 03:12:47 UTC (rev 217915)
@@ -55,6 +55,7 @@
assert_true(Array.isArray(trackEvent.streams), "Array.isArray() should return true");
assert_true(Object.isFrozen(trackEvent.streams), "Object.isFrozen() should return true");
assert_equals(trackEvent.track.id, stream.getVideoTracks()[0].id);
+ assert_equals(trackEvent.track, trackEvent.streams[0].getVideoTracks()[0]);
resolve(trackEvent.streams[0]);
};
});
Modified: trunk/Source/WebCore/ChangeLog (217914 => 217915)
--- trunk/Source/WebCore/ChangeLog 2017-06-08 03:10:43 UTC (rev 217914)
+++ trunk/Source/WebCore/ChangeLog 2017-06-08 03:12:47 UTC (rev 217915)
@@ -1,3 +1,15 @@
+2017-06-07 Youenn Fablet <[email protected]>
+
+ RTCTrackEvent.track should be found in RTCTrackEvent.streams[0]
+ https://bugs.webkit.org/show_bug.cgi?id=173074
+
+ Reviewed by Eric Carlson.
+
+ Covered by updated test.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::addTrackFromPlatform):
+
2017-06-07 Devin Rousso <[email protected]>
Web Inspector: Add ContextMenu item to log WebSocket object to console
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (217914 => 217915)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-06-08 03:10:43 UTC (rev 217914)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-06-08 03:12:47 UTC (rev 217915)
@@ -220,8 +220,9 @@
void MediaStream::addTrackFromPlatform(Ref<MediaStreamTrack>&& track)
{
- m_private->addTrack(&track->privateTrack(), MediaStreamPrivate::NotifyClientOption::Notify);
+ auto* privateTrack = &track->privateTrack();
internalAddTrack(WTFMove(track), StreamModifier::Platform);
+ m_private->addTrack(privateTrack, MediaStreamPrivate::NotifyClientOption::Notify);
}
bool MediaStream::internalAddTrack(Ref<MediaStreamTrack>&& trackToAdd, StreamModifier streamModifier)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
