Title: [261748] branches/safari-610.1.13-branch/Source/WebKit
- Revision
- 261748
- Author
- alanc...@apple.com
- Date
- 2020-05-15 10:10:38 -0700 (Fri, 15 May 2020)
Log Message
Cherry-pick r261719. rdar://problem/63278098
Regression(r261163) Causes crashes on builds without libwebrtc.dylib
https://bugs.webkit.org/show_bug.cgi?id=211924
<rdar://problem/63206792>
Reviewed by Jer Noble.
* WebProcess/Network/NetworkProcessConnection.cpp:
(WebKit::NetworkProcessConnection::NetworkProcessConnection):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261719 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.13-branch/Source/WebKit/ChangeLog (261747 => 261748)
--- branches/safari-610.1.13-branch/Source/WebKit/ChangeLog 2020-05-15 16:44:30 UTC (rev 261747)
+++ branches/safari-610.1.13-branch/Source/WebKit/ChangeLog 2020-05-15 17:10:38 UTC (rev 261748)
@@ -1,3 +1,29 @@
+2020-05-15 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r261719. rdar://problem/63278098
+
+ Regression(r261163) Causes crashes on builds without libwebrtc.dylib
+ https://bugs.webkit.org/show_bug.cgi?id=211924
+ <rdar://problem/63206792>
+
+ Reviewed by Jer Noble.
+
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ (WebKit::NetworkProcessConnection::NetworkProcessConnection):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261719 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-05-14 Chris Dumez <cdu...@apple.com>
+
+ Regression(r261163) Causes crashes on builds without libwebrtc.dylib
+ https://bugs.webkit.org/show_bug.cgi?id=211924
+ <rdar://problem/63206792>
+
+ Reviewed by Jer Noble.
+
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ (WebKit::NetworkProcessConnection::NetworkProcessConnection):
+
2020-05-13 Alan Coon <alanc...@apple.com>
Cherry-pick r261478. rdar://problem/63203495
Modified: branches/safari-610.1.13-branch/Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp (261747 => 261748)
--- branches/safari-610.1.13-branch/Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp 2020-05-15 16:44:30 UTC (rev 261747)
+++ branches/safari-610.1.13-branch/Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp 2020-05-15 17:10:38 UTC (rev 261748)
@@ -76,7 +76,9 @@
, m_cookieAcceptPolicy(cookieAcceptPolicy)
{
m_connection->open();
- WebProcess::singleton().libWebRTCNetwork().setConnection(m_connection.copyRef());
+
+ if (LibWebRTCProvider::webRTCAvailable())
+ WebProcess::singleton().libWebRTCNetwork().setConnection(m_connection.copyRef());
}
NetworkProcessConnection::~NetworkProcessConnection()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes