Changeset 260063 in webkit

Timestamp:

Apr 14, 2020 2:30:15 AM (4 years ago)

Author:

youenn@apple.com

Message:

WebSocketChannel should remove itself from its manager map
​https://bugs.webkit.org/show_bug.cgi?id=210424

Reviewed by Alex Christensen.

WebSocketChannelManager was never removing any entry from its map.
To fix this, the manager is now keeping a WeakPtr to each channel.
When the channel is destroyed, it will remove itself from its channel manager.

• WebProcess/Network/WebSocketChannel.cpp:

(WebKit::WebSocketChannel::WebSocketChannel):
(WebKit::WebSocketChannel::~WebSocketChannel):

• WebProcess/Network/WebSocketChannel.h:
• WebProcess/Network/WebSocketChannelManager.cpp:

(WebKit::WebSocketChannelManager::addChannel):
(WebKit::WebSocketChannelManager::createWebSocketChannel): Deleted.

• WebProcess/Network/WebSocketChannelManager.h:

(WebKit::WebSocketChannelManager::removeChannel):

• WebProcess/Network/WebSocketProvider.cpp:

(WebKit::WebSocketProvider::createWebSocketChannel):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Network/WebSocketChannel.cpp (modified) (1 diff)
• WebProcess/Network/WebSocketChannel.h (modified) (1 diff)
• WebProcess/Network/WebSocketChannelManager.cpp (modified) (1 diff)
• WebProcess/Network/WebSocketChannelManager.h (modified) (1 diff)
• WebProcess/Network/WebSocketProvider.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-14  Youenn Fablet  <youenn@apple.com>
+
+        WebSocketChannel should remove itself from its manager map
+        https://bugs.webkit.org/show_bug.cgi?id=210424
+
+        Reviewed by Alex Christensen.
+
+        WebSocketChannelManager was never removing any entry from its map.
+        To fix this, the manager is now keeping a WeakPtr to each channel.
+        When the channel is destroyed, it will remove itself from its channel manager.
+
+        * WebProcess/Network/WebSocketChannel.cpp:
+        (WebKit::WebSocketChannel::WebSocketChannel):
+        (WebKit::WebSocketChannel::~WebSocketChannel):
+        * WebProcess/Network/WebSocketChannel.h:
+        * WebProcess/Network/WebSocketChannelManager.cpp:
+        (WebKit::WebSocketChannelManager::addChannel):
+        (WebKit::WebSocketChannelManager::createWebSocketChannel): Deleted.
+        * WebProcess/Network/WebSocketChannelManager.h:
+        (WebKit::WebSocketChannelManager::removeChannel):
+        * WebProcess/Network/WebSocketProvider.cpp:
+        (WebKit::WebSocketProvider::createWebSocketChannel):
+
 2020-04-14  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp

@@ -76 +76 @@
     , m_inspector(document)
 {
+    WebProcess::singleton().webSocketChannelManager().addChannel(*this);
 }
 
 WebSocketChannel::~WebSocketChannel()
 {
+    WebProcess::singleton().webSocketChannelManager().removeChannel(*this);
 }
 

trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.h

@@ -43 +43 @@
 namespace WebKit {
 
-class WebSocketChannel : public IPC::MessageSender, public IPC::MessageReceiver, public WebCore::ThreadableWebSocketChannel, public RefCounted<WebSocketChannel> {
+class WebSocketChannel : public IPC::MessageSender, public IPC::MessageReceiver, public WebCore::ThreadableWebSocketChannel, public RefCounted<WebSocketChannel>, public CanMakeWeakPtr<WebSocketChannel> {
 public:
     static Ref<WebSocketChannel> create(WebCore::Document&, WebCore::WebSocketChannelClient&);

trunk/Source/WebKit/WebProcess/Network/WebSocketChannelManager.cpp

@@ -29 +29 @@
 namespace WebKit {
 
-RefPtr<WebCore::ThreadableWebSocketChannel> WebSocketChannelManager::createWebSocketChannel(WebCore::Document& document, WebCore::WebSocketChannelClient& client)
+void WebSocketChannelManager::addChannel(WebSocketChannel& channel)
 {
-    auto channel = WebSocketChannel::create(document, client);
-    m_channels.add(channel->identifier(), channel.copyRef());
-    return channel;
+    ASSERT(!m_channels.contains(channel.identifier()));
+    m_channels.add(channel.identifier(), makeWeakPtr(channel));
 }
 

trunk/Source/WebKit/WebProcess/Network/WebSocketChannelManager.h

@@ -43 +43 @@
 public:
     WebSocketChannelManager() = default;
-    RefPtr<WebCore::ThreadableWebSocketChannel> createWebSocketChannel(WebCore::Document&, WebCore::WebSocketChannelClient&);
 
     void networkProcessCrashed();
     void didReceiveMessage(IPC::Connection&, IPC::Decoder&);
 
+    void addChannel(WebSocketChannel&);
+    void removeChannel(WebSocketChannel& channel) { m_channels.remove(channel.identifier() ); }
+
 private:
-    HashMap<WebSocketIdentifier, Ref<WebSocketChannel>> m_channels;
+    HashMap<WebSocketIdentifier, WeakPtr<WebSocketChannel>> m_channels;
 };
 

trunk/Source/WebKit/WebProcess/Network/WebSocketProvider.cpp

@@ -32 +32 @@
 #include "WebSocketProvider.h"
 
-#include "WebProcess.h"
 #include "WebSocketChannelManager.h"
 #include "WebSocketStream.h"
@@ -47 +46 @@
 RefPtr<ThreadableWebSocketChannel> WebSocketProvider::createWebSocketChannel(Document& document, WebSocketChannelClient& client)
 {
-    return WebProcess::singleton().webSocketChannelManager().createWebSocketChannel(document, client);
+    return WebSocketChannel::create(document, client);
 }