Changeset 270882 in webkit

Timestamp:

Dec 16, 2020, 12:27:01 AM (5 years ago)

Author:

youenn@apple.com

Message:

Make sure WebKit WebSocketChannel handle suspend/resume correctly
​https://bugs.webkit.org/show_bug.cgi?id=219910

Reviewed by Alex Christensen.

Source/WebCore:

Covered by http/tests/websocket/tests/hybi/closed-when-entering-page-cache.html
and http/tests/websocket/tests/hybi/stop-on-resume-in-error-handler.html with NSURLSession WebSocket code path enabled.

• Modules/websockets/WebSocket.cpp:

(WebCore::WebSocket::resume):
In case resume is called and there are some events to dispatch, start the timer
even if the channel is not null.

Source/WebKit:

• WebProcess/Network/WebSocketChannel.cpp:

(WebKit::WebSocketChannel::fail):
Make sure fail triggers close event if page resumes.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/websockets/WebSocket.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/Network/WebSocketChannel.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-16  Youenn Fablet  <youenn@apple.com>
+
+        Make sure WebKit WebSocketChannel handle suspend/resume correctly
+        https://bugs.webkit.org/show_bug.cgi?id=219910
+
+        Reviewed by Alex Christensen.
+
+        Covered by http/tests/websocket/tests/hybi/closed-when-entering-page-cache.html
+        and http/tests/websocket/tests/hybi/stop-on-resume-in-error-handler.html with NSURLSession WebSocket code path enabled.
+
+        * Modules/websockets/WebSocket.cpp:
+        (WebCore::WebSocket::resume):
+        In case resume is called and there are some events to dispatch, start the timer
+        even if the channel is not null.
+
 2020-12-15  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/Modules/websockets/WebSocket.cpp

@@ -531 +531 @@
     if (m_channel)
         m_channel->resume();
-    else if (!m_pendingEvents.isEmpty() && !m_resumeTimer.isActive()) {
+
+    if (!m_pendingEvents.isEmpty() && !m_resumeTimer.isActive()) {
         // Fire the pending events in a timer as we are not allowed to execute arbitrary JS from resume().
         m_resumeTimer.startOneShot(0_s);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-12-16  Youenn Fablet  <youenn@apple.com>
+
+        Make sure WebKit WebSocketChannel handle suspend/resume correctly
+        https://bugs.webkit.org/show_bug.cgi?id=219910
+
+        Reviewed by Alex Christensen.
+
+        * WebProcess/Network/WebSocketChannel.cpp:
+        (WebKit::WebSocketChannel::fail):
+        Make sure fail triggers close event if page resumes.
+
 2020-12-15  Pablo Saavedra  <psaavedra@igalia.com>
 

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

@@ -221 +221 @@
         m_client->didReceiveMessageError();
 
-    if (!m_isClosing)
-        MessageSender::send(Messages::NetworkSocketChannel::Close { 0, reason });
+    if (m_isClosing)
+        return;
+
+    MessageSender::send(Messages::NetworkSocketChannel::Close { 0, reason });
+    didClose(WebCore::WebSocketChannel::CloseEventCodeAbnormalClosure, { });
 }