Title: [238720] trunk
- Revision
- 238720
- Author
- ryanhad...@apple.com
- Date
- 2018-11-29 17:32:17 -0800 (Thu, 29 Nov 2018)
Log Message
Unreviewed, rolling out r238680.
Caused existing webrtc layout tests to fail an assertion.
Reverted changeset:
"A sender created through addTransceiver and populated using
addTrack should have its source set"
https://bugs.webkit.org/show_bug.cgi?id=192136
https://trac.webkit.org/changeset/238680
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (238719 => 238720)
--- trunk/LayoutTests/ChangeLog 2018-11-30 01:22:26 UTC (rev 238719)
+++ trunk/LayoutTests/ChangeLog 2018-11-30 01:32:17 UTC (rev 238720)
@@ -1,5 +1,18 @@
2018-11-29 Ryan Haddad <ryanhad...@apple.com>
+ Unreviewed, rolling out r238680.
+
+ Caused existing webrtc layout tests to fail an assertion.
+
+ Reverted changeset:
+
+ "A sender created through addTransceiver and populated using
+ addTrack should have its source set"
+ https://bugs.webkit.org/show_bug.cgi?id=192136
+ https://trac.webkit.org/changeset/238680
+
+2018-11-29 Ryan Haddad <ryanhad...@apple.com>
+
REGRESSION (r238090): [ MacOS WK1 ] Layout Test imported/blink/compositing/squashing/squashing-into-ancestor-painted-layer.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=191639
Modified: trunk/LayoutTests/webrtc/video-replace-track-expected.txt (238719 => 238720)
--- trunk/LayoutTests/webrtc/video-replace-track-expected.txt 2018-11-30 01:22:26 UTC (rev 238719)
+++ trunk/LayoutTests/webrtc/video-replace-track-expected.txt 2018-11-30 01:32:17 UTC (rev 238720)
@@ -2,5 +2,4 @@
PASS Switching from front to back camera
PASS Switching from front to back camera, with lower resolution
PASS Switching from front to back camera, with higher resolution
-PASS Replace a track for a sender created by addTransceiver and used by addTrack
Modified: trunk/LayoutTests/webrtc/video-replace-track.html (238719 => 238720)
--- trunk/LayoutTests/webrtc/video-replace-track.html 2018-11-30 01:22:26 UTC (rev 238719)
+++ trunk/LayoutTests/webrtc/video-replace-track.html 2018-11-30 01:32:17 UTC (rev 238720)
@@ -181,14 +181,6 @@
});
}, "Switching from front to back camera, with higher resolution");
-
-promise_test(async (test) => {
- const stream = await navigator.mediaDevices.getUserMedia({ video: true });
- const pc = new RTCPeerConnection();
- pc.addTransceiver("video", {direction: "sendonly"});
- const sender = pc.addTrack(stream.getVideoTracks()[0], stream);
- await sender.replaceTrack(stream.getVideoTracks()[0].clone());
-}, "Replace a track for a sender created by addTransceiver and used by addTrack");
</script>
</body>
</html>
Modified: trunk/Source/WebCore/ChangeLog (238719 => 238720)
--- trunk/Source/WebCore/ChangeLog 2018-11-30 01:22:26 UTC (rev 238719)
+++ trunk/Source/WebCore/ChangeLog 2018-11-30 01:32:17 UTC (rev 238720)
@@ -1,3 +1,16 @@
+2018-11-29 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r238680.
+
+ Caused existing webrtc layout tests to fail an assertion.
+
+ Reverted changeset:
+
+ "A sender created through addTransceiver and populated using
+ addTrack should have its source set"
+ https://bugs.webkit.org/show_bug.cgi?id=192136
+ https://trac.webkit.org/changeset/238680
+
2018-11-29 Justin Fan <justin_...@apple.com>
Remove dangling WebGPU file references from WebCore project
Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp (238719 => 238720)
--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp 2018-11-30 01:22:26 UTC (rev 238719)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp 2018-11-30 01:32:17 UTC (rev 238720)
@@ -403,7 +403,6 @@
return Exception { TypeError, "Unable to add track"_s };
if (auto sender = findExistingSender(m_peerConnection.currentSenders(), *senderBackend)) {
- backendFromRTPSender(*sender).takeSource(*senderBackend);
sender->setTrack(makeRef(track));
sender->setMediaStreamIds(WTFMove(mediaStreamIds));
return sender.releaseNonNull();
Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h (238719 => 238720)
--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h 2018-11-30 01:22:26 UTC (rev 238719)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h 2018-11-30 01:32:17 UTC (rev 238720)
@@ -94,12 +94,6 @@
ASSERT(hasSource());
}
- void takeSource(LibWebRTCRtpSenderBackend& backend)
- {
- ASSERT(backend.hasSource());
- setSource(WTFMove(backend.m_source));
- }
-
private:
void replaceTrack(ScriptExecutionContext&, RTCRtpSender&, RefPtr<MediaStreamTrack>&&, DOMPromiseDeferred<void>&&) final;
RTCRtpSendParameters getParameters() const final;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
