Title: [284955] branches/safari-612-branch/Source/WebKit
- Revision
- 284955
- Author
- [email protected]
- Date
- 2021-10-27 14:06:19 -0700 (Wed, 27 Oct 2021)
Log Message
Cherry-pick r283604. rdar://problem/81171560
Close NetworkRTCProvider sockets explicitly when closing NetworkRTCProvider
https://bugs.webkit.org/show_bug.cgi?id=231228
<rdar://83237496>
Reviewed by Eric Carlson.
* NetworkProcess/webrtc/NetworkRTCProvider.cpp:
(WebKit::NetworkRTCProvider::close):
Make sure to explictly closing the socket before deleting it.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283604 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (284954 => 284955)
--- branches/safari-612-branch/Source/WebKit/ChangeLog 2021-10-27 21:06:17 UTC (rev 284954)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog 2021-10-27 21:06:19 UTC (rev 284955)
@@ -1,5 +1,34 @@
2021-10-26 Russell Epstein <[email protected]>
+ Cherry-pick r283604. rdar://problem/81171560
+
+ Close NetworkRTCProvider sockets explicitly when closing NetworkRTCProvider
+ https://bugs.webkit.org/show_bug.cgi?id=231228
+ <rdar://83237496>
+
+ Reviewed by Eric Carlson.
+
+ * NetworkProcess/webrtc/NetworkRTCProvider.cpp:
+ (WebKit::NetworkRTCProvider::close):
+ Make sure to explictly closing the socket before deleting it.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283604 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-06 Youenn Fablet <[email protected]>
+
+ Close NetworkRTCProvider sockets explicitly when closing NetworkRTCProvider
+ https://bugs.webkit.org/show_bug.cgi?id=231228
+ <rdar://83237496>
+
+ Reviewed by Eric Carlson.
+
+ * NetworkProcess/webrtc/NetworkRTCProvider.cpp:
+ (WebKit::NetworkRTCProvider::close):
+ Make sure to explictly closing the socket before deleting it.
+
+2021-10-26 Russell Epstein <[email protected]>
+
Cherry-pick r283703. rdar://problem/84629308
ScopedEGLDefaultDisplay should be removed
Modified: branches/safari-612-branch/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp (284954 => 284955)
--- branches/safari-612-branch/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp 2021-10-27 21:06:17 UTC (rev 284954)
+++ branches/safari-612-branch/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp 2021-10-27 21:06:19 UTC (rev 284955)
@@ -126,7 +126,10 @@
m_rtcMonitor.stopUpdating();
callOnRTCNetworkThread([this]() {
- m_sockets.clear();
+ auto sockets = WTFMove(m_sockets);
+ for (auto& socket : m_sockets.values())
+ socket->close();
+ ASSERT(sockets.isEmpty());
#if PLATFORM(COCOA)
m_attributedBundleIdentifiers.clear();
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
