Changeset 202367 in webkit

Timestamp:

Jun 22, 2016 11:10:48 PM (8 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r201880): WebSockets based remote inspector is broken since r201880
​https://bugs.webkit.org/show_bug.cgi?id=158613

Reviewed by Michael Catanzaro.

In r201880 SocketStreamHandleClient was modified to receive references instead of
pointers. WebSocketServerConnection also implements SocketStreamHandleClient but since it's doesn't use
override, it was unnoticed and not updated, so we ended up using the default empty implementation instead of
the WebSocketServerConnection one.

• UIProcess/InspectorServer/WebSocketServerConnection.cpp:

(WebKit::WebSocketServerConnection::WebSocketServerConnection):
(WebKit::WebSocketServerConnection::setSocketHandle):
(WebKit::WebSocketServerConnection::shutdownNow):
(WebKit::WebSocketServerConnection::didCloseSocketStream):
(WebKit::WebSocketServerConnection::didReceiveSocketStreamData):
(WebKit::WebSocketServerConnection::didUpdateBufferedAmount):
(WebKit::WebSocketServerConnection::didFailSocketStream): Deleted.

• UIProcess/InspectorServer/WebSocketServerConnection.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/InspectorServer/WebSocketServerConnection.cpp (modified) (6 diffs)
• UIProcess/InspectorServer/WebSocketServerConnection.h (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-06-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r201880): WebSockets based remote inspector is broken since r201880
+        https://bugs.webkit.org/show_bug.cgi?id=158613
+
+        Reviewed by Michael Catanzaro.
+
+        In r201880 SocketStreamHandleClient was modified to receive references instead of
+        pointers. WebSocketServerConnection also implements SocketStreamHandleClient but since it's doesn't use
+        override, it was unnoticed and not updated, so we ended up using the default empty implementation instead of
+        the WebSocketServerConnection one.
+
+        * UIProcess/InspectorServer/WebSocketServerConnection.cpp:
+        (WebKit::WebSocketServerConnection::WebSocketServerConnection):
+        (WebKit::WebSocketServerConnection::setSocketHandle):
+        (WebKit::WebSocketServerConnection::shutdownNow):
+        (WebKit::WebSocketServerConnection::didCloseSocketStream):
+        (WebKit::WebSocketServerConnection::didReceiveSocketStreamData):
+        (WebKit::WebSocketServerConnection::didUpdateBufferedAmount):
+        (WebKit::WebSocketServerConnection::didFailSocketStream): Deleted.
+        * UIProcess/InspectorServer/WebSocketServerConnection.h:
+
 2016-06-22  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp

@@ -48 +48 @@
 
 WebSocketServerConnection::WebSocketServerConnection(WebSocketServerClient* client, WebSocketServer* server)
-    : m_identifier(0)
-    , m_mode(HTTP)
-    , m_server(server)
+    : m_server(server)
     , m_client(client)
-    , m_shutdownAfterSend(false)
 {
 }
@@ -61 +58 @@
 }
 
-void WebSocketServerConnection::setSocketHandle(PassRefPtr<WebCore::SocketStreamHandle> socket)
+void WebSocketServerConnection::setSocketHandle(Ref<SocketStreamHandle>&& socket)
 {
     ASSERT(!m_socket);
-    m_socket = socket;
+    m_socket = WTFMove(socket);
 }
 
@@ -71 +68 @@
     if (!m_socket)
         return;
-    RefPtr<SocketStreamHandle> socket = m_socket.release();
+    auto socket = WTFMove(m_socket);
     socket->close();
     m_shutdownAfterSend = false;
@@ -124 +121 @@
 }
 
-void WebSocketServerConnection::didCloseSocketStream(SocketStreamHandle*)
+void WebSocketServerConnection::didCloseSocketStream(SocketStreamHandle&)
 {
     // Destroy the SocketStreamHandle now to prevent closing an already closed socket later.
@@ -137 +134 @@
 }
 
-void WebSocketServerConnection::didReceiveSocketStreamData(SocketStreamHandle*, const char* data, int length)
+void WebSocketServerConnection::didReceiveSocketStreamData(SocketStreamHandle&, const char* data, int length)
 {
     // Each didReceiveData call adds more data to our buffer.
@@ -156 +153 @@
 }
 
-void WebSocketServerConnection::didUpdateBufferedAmount(WebCore::SocketStreamHandle*, size_t)
+void WebSocketServerConnection::didUpdateBufferedAmount(SocketStreamHandle&, size_t)
 {
     if (m_shutdownAfterSend && !m_socket->bufferedAmount())
         shutdownNow();
-}
-
-void WebSocketServerConnection::didFailSocketStream(SocketStreamHandle*, const SocketStreamError&)
-{
-    // Possible read or write error.
 }
 

trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h

@@ -47 +47 @@
 class WebSocketServerClient;
 
-class WebSocketServerConnection : public WebCore::SocketStreamHandleClient {
+class WebSocketServerConnection final : public WebCore::SocketStreamHandleClient {
 public:
     enum WebSocketServerMode { HTTP, WebSocket };
@@ -55 +55 @@
     unsigned identifier() const { return m_identifier; }
     void setIdentifier(unsigned id) { m_identifier = id; }
-    void setSocketHandle(PassRefPtr<WebCore::SocketStreamHandle>);
+    void setSocketHandle(Ref<WebCore::SocketStreamHandle>&&);
 
     // Sending data over the connection.
@@ -66 +66 @@
     void shutdownAfterSendOrNow();
 
+private:
     // SocketStreamHandleClient implementation.
-    virtual void didCloseSocketStream(WebCore::SocketStreamHandle*);
-    virtual void didReceiveSocketStreamData(WebCore::SocketStreamHandle*, const char* data, int length);
-    virtual void didUpdateBufferedAmount(WebCore::SocketStreamHandle*, size_t bufferedAmount);
-    virtual void didFailSocketStream(WebCore::SocketStreamHandle*, const WebCore::SocketStreamError&);
+    void didCloseSocketStream(WebCore::SocketStreamHandle&) override;
+    void didReceiveSocketStreamData(WebCore::SocketStreamHandle&, const char* data, int length) override;
+    void didUpdateBufferedAmount(WebCore::SocketStreamHandle&, size_t bufferedAmount) override;
 
-private:
     // HTTP Mode.
     void readHTTPMessage();
@@ -81 +80 @@
     bool readWebSocketFrame();
 
-protected:
-    unsigned m_identifier;
+    unsigned m_identifier { 0 };
     Vector<char> m_bufferedData;
-    WebSocketServerMode m_mode;
+    WebSocketServerMode m_mode { HTTP };
     RefPtr<WebCore::SocketStreamHandle> m_socket;
-    WebSocketServer* m_server;
-    WebSocketServerClient* m_client;
-    bool m_shutdownAfterSend;
+    WebSocketServer* m_server { nullptr };
+    WebSocketServerClient* m_client { nullptr };
+    bool m_shutdownAfterSend { false };
 };