Title: [282635] trunk/Source/WebKit
- Revision
- 282635
- Author
- [email protected]
- Date
- 2021-09-16 23:31:10 -0700 (Thu, 16 Sep 2021)
Log Message
Make WebProcess use a RefPtr of LibWebRTCNetwork
https://bugs.webkit.org/show_bug.cgi?id=230342
Reviewed by Eric Carlson.
No change of behavior, ref counted object should use RefPtr<>, not unique_ptr.
* WebProcess/Network/webrtc/LibWebRTCNetwork.h:
(WebKit::LibWebRTCNetwork::create):
* WebProcess/Network/webrtc/WebRTCMonitor.cpp:
(WebKit::WebRTCMonitor::networksChanged):
(WebKit::WebRTCMonitor::sendOnMainThread): Deleted.
* WebProcess/Network/webrtc/WebRTCMonitor.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::libWebRTCNetwork):
* WebProcess/WebProcess.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (282634 => 282635)
--- trunk/Source/WebKit/ChangeLog 2021-09-17 05:32:39 UTC (rev 282634)
+++ trunk/Source/WebKit/ChangeLog 2021-09-17 06:31:10 UTC (rev 282635)
@@ -1,3 +1,22 @@
+2021-09-16 Youenn Fablet <[email protected]>
+
+ Make WebProcess use a RefPtr of LibWebRTCNetwork
+ https://bugs.webkit.org/show_bug.cgi?id=230342
+
+ Reviewed by Eric Carlson.
+
+ No change of behavior, ref counted object should use RefPtr<>, not unique_ptr.
+
+ * WebProcess/Network/webrtc/LibWebRTCNetwork.h:
+ (WebKit::LibWebRTCNetwork::create):
+ * WebProcess/Network/webrtc/WebRTCMonitor.cpp:
+ (WebKit::WebRTCMonitor::networksChanged):
+ (WebKit::WebRTCMonitor::sendOnMainThread): Deleted.
+ * WebProcess/Network/webrtc/WebRTCMonitor.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::libWebRTCNetwork):
+ * WebProcess/WebProcess.h:
+
2021-09-16 David Kilzer <[email protected]>
WebKit::WebProcessPool should use a weak observer with CFNotificationCenter
Modified: trunk/Source/WebKit/WebProcess/Network/webrtc/LibWebRTCNetwork.h (282634 => 282635)
--- trunk/Source/WebKit/WebProcess/Network/webrtc/LibWebRTCNetwork.h 2021-09-17 05:32:39 UTC (rev 282634)
+++ trunk/Source/WebKit/WebProcess/Network/webrtc/LibWebRTCNetwork.h 2021-09-17 06:31:10 UTC (rev 282635)
@@ -39,6 +39,7 @@
class LibWebRTCNetwork : public IPC::Connection::ThreadMessageReceiverRefCounted {
WTF_MAKE_FAST_ALLOCATED;
public:
+ static Ref<LibWebRTCNetwork> create() { return adoptRef(*new LibWebRTCNetwork()); }
~LibWebRTCNetwork();
IPC::Connection* connection() { return m_connection.get(); }
@@ -66,6 +67,7 @@
void setAsActive();
private:
+ LibWebRTCNetwork() = default;
#if USE(LIBWEBRTC)
void setSocketFactoryConnection();
Modified: trunk/Source/WebKit/WebProcess/Network/webrtc/WebRTCMonitor.cpp (282634 => 282635)
--- trunk/Source/WebKit/WebProcess/Network/webrtc/WebRTCMonitor.cpp 2021-09-17 05:32:39 UTC (rev 282634)
+++ trunk/Source/WebKit/WebProcess/Network/webrtc/WebRTCMonitor.cpp 2021-09-17 06:31:10 UTC (rev 282635)
@@ -39,13 +39,6 @@
#define WEBRTC_RELEASE_LOG(fmt, ...) RELEASE_LOG(Network, "%p - WebRTCMonitor::" fmt, this, ##__VA_ARGS__)
-void WebRTCMonitor::sendOnMainThread(Function<void(IPC::Connection&)>&& callback)
-{
- callOnMainRunLoop([callback = WTFMove(callback)]() {
- callback(WebProcess::singleton().ensureNetworkProcessConnection().connection());
- });
-}
-
void WebRTCMonitor::setEnumeratingAllNetworkInterfacesEnabled(bool enabled)
{
m_enableEnumeratingAllNetworkInterfaces = enabled;
@@ -73,7 +66,7 @@
void WebRTCMonitor::networksChanged(Vector<RTCNetwork>&& networkList, RTCNetwork::IPAddress&& ipv4, RTCNetwork::IPAddress&& ipv6)
{
- WEBRTC_RELEASE_LOG("networksChanged");
+ WEBRTC_RELEASE_LOG("NetworksChanged");
m_didReceiveNetworkList = true;
m_networkList = WTFMove(networkList);
Modified: trunk/Source/WebKit/WebProcess/Network/webrtc/WebRTCMonitor.h (282634 => 282635)
--- trunk/Source/WebKit/WebProcess/Network/webrtc/WebRTCMonitor.h 2021-09-17 05:32:39 UTC (rev 282634)
+++ trunk/Source/WebKit/WebProcess/Network/webrtc/WebRTCMonitor.h 2021-09-17 06:31:10 UTC (rev 282635)
@@ -68,8 +68,6 @@
private:
void networksChanged(Vector<RTCNetwork>&&, RTCNetwork::IPAddress&&, RTCNetwork::IPAddress&&);
- static void sendOnMainThread(Function<void(IPC::Connection&)>&&);
-
unsigned m_clientCount { 0 };
WeakHashSet<Observer> m_observers;
bool m_enableEnumeratingAllNetworkInterfaces { false };
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (282634 => 282635)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2021-09-17 05:32:39 UTC (rev 282634)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2021-09-17 06:31:10 UTC (rev 282635)
@@ -1889,7 +1889,7 @@
LibWebRTCNetwork& WebProcess::libWebRTCNetwork()
{
if (!m_libWebRTCNetwork)
- m_libWebRTCNetwork = makeUnique<LibWebRTCNetwork>();
+ m_libWebRTCNetwork = LibWebRTCNetwork::create();
return *m_libWebRTCNetwork;
}
Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (282634 => 282635)
--- trunk/Source/WebKit/WebProcess/WebProcess.h 2021-09-17 05:32:39 UTC (rev 282634)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2021-09-17 06:31:10 UTC (rev 282635)
@@ -667,7 +667,7 @@
Ref<WebCore::ReportingEndpointsCache> m_reportingEndpointsCache;
WebSocketChannelManager m_webSocketChannelManager;
- std::unique_ptr<LibWebRTCNetwork> m_libWebRTCNetwork;
+ RefPtr<LibWebRTCNetwork> m_libWebRTCNetwork;
HashSet<String> m_dnsPrefetchedHosts;
PAL::HysteresisActivity m_dnsPrefetchHystereris;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
