Changeset 214190 in webkit

Timestamp:

Mar 20, 2017, 1:05:50 PM (8 years ago)

Author:

achristensen@apple.com

Message:

Prepare SocketStreamHandle for being created from WK2
​https://bugs.webkit.org/show_bug.cgi?id=169885

Reviewed by Andy Estes.

No change in behavior.

• Modules/websockets/WebSocketChannel.cpp:

(WebCore::WebSocketChannel::didOpenSocketStream):
(WebCore::WebSocketChannel::sendFrame):
Rename send to sendData to prevent name collisions with IPC::MessageSender::send.

• platform/network/SocketStreamHandle.cpp:

(WebCore::SocketStreamHandle::sendData):
(WebCore::SocketStreamHandle::send): Deleted.

• platform/network/SocketStreamHandle.h:
• platform/network/cf/SocketStreamHandleImpl.h:
• platform/network/curl/SocketStreamHandleImpl.h:
• platform/network/soup/SocketStreamHandleImpl.h:

Make platformSend and platformClose public so I can call them from IPC proxies.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/websockets/WebSocketChannel.cpp (modified) (2 diffs)
• platform/network/SocketStreamHandle.cpp (modified) (1 diff)
• platform/network/SocketStreamHandle.h (modified) (2 diffs)
• platform/network/cf/SocketStreamHandleImpl.h (modified) (1 diff)
• platform/network/curl/SocketStreamHandleImpl.h (modified) (1 diff)
• platform/network/soup/SocketStreamHandleImpl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-20  Alex Christensen  <achristensen@webkit.org>
+
+        Prepare SocketStreamHandle for being created from WK2
+        https://bugs.webkit.org/show_bug.cgi?id=169885
+
+        Reviewed by Andy Estes.
+
+        No change in behavior.
+
+        * Modules/websockets/WebSocketChannel.cpp:
+        (WebCore::WebSocketChannel::didOpenSocketStream):
+        (WebCore::WebSocketChannel::sendFrame):
+        Rename send to sendData to prevent name collisions with IPC::MessageSender::send.
+        * platform/network/SocketStreamHandle.cpp:
+        (WebCore::SocketStreamHandle::sendData):
+        (WebCore::SocketStreamHandle::send): Deleted.
+        * platform/network/SocketStreamHandle.h:
+        * platform/network/cf/SocketStreamHandleImpl.h:
+        * platform/network/curl/SocketStreamHandleImpl.h:
+        * platform/network/soup/SocketStreamHandleImpl.h:
+        Make platformSend and platformClose public so I can call them from IPC proxies.
+
 2017-03-20  Andy Estes  <aestes@apple.com>
 

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

@@ -279 +279 @@
         InspectorInstrumentation::willSendWebSocketHandshakeRequest(m_document, m_identifier, m_handshake->clientHandshakeRequest());
     CString handshakeMessage = m_handshake->clientHandshakeMessage();
-    handle.send(handshakeMessage.data(), handshakeMessage.length(), [this, protectedThis = makeRef(*this)] (bool success) {
+    handle.sendData(handshakeMessage.data(), handshakeMessage.length(), [this, protectedThis = makeRef(*this)] (bool success) {
         if (!success)
             fail("Failed to send WebSocket handshake.");
@@ -830 +830 @@
     frame.makeFrameData(frameData);
 
-    m_handle->send(frameData.data(), frameData.size(), WTFMove(completionHandler));
+    m_handle->sendData(frameData.data(), frameData.size(), WTFMove(completionHandler));
 }
 

trunk/Source/WebCore/platform/network/SocketStreamHandle.cpp

@@ -49 +49 @@
 }
 
-void SocketStreamHandle::send(const char* data, size_t length, Function<void(bool)> completionHandler)
+void SocketStreamHandle::sendData(const char* data, size_t length, Function<void(bool)> completionHandler)
 {
     if (m_state == Connecting || m_state == Closing)

trunk/Source/WebCore/platform/network/SocketStreamHandle.h

@@ -45 +45 @@
     SocketStreamState state() const;
 
-    void send(const char* data, size_t length, Function<void(bool)>);
+    void sendData(const char* data, size_t length, Function<void(bool)>);
     void close(); // Disconnect after all data in buffer are sent.
     void disconnect();
@@ -51 +51 @@
 
 protected:
-    SocketStreamHandle(const URL&, SocketStreamHandleClient&);
+    WEBCORE_EXPORT SocketStreamHandle(const URL&, SocketStreamHandleClient&);
 
     virtual void platformSend(const char* data, size_t length, Function<void(bool)>&&) = 0;

trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h

@@ -51 +51 @@
     virtual ~SocketStreamHandleImpl();
 
+    WEBCORE_EXPORT void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
+    WEBCORE_EXPORT void platformClose() final;
 private:
-    void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
-    void platformClose() final;
     size_t bufferedAmount() final;
     std::optional<size_t> platformSendInternal(const char*, size_t);

trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h

@@ -56 +56 @@
     virtual ~SocketStreamHandleImpl();
 
+    void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
+    void platformClose() final;
 private:
     SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&);
 
-    void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
-    void platformClose() final;
     size_t bufferedAmount() final;
     std::optional<size_t> platformSendInternal(const char*, size_t);

trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h

@@ -54 +54 @@
     virtual ~SocketStreamHandleImpl();
 
+    void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
+    void platformClose() final;
 private:
     SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&);
 
-    void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
-    void platformClose() final;
     size_t bufferedAmount() final;
     std::optional<size_t> platformSendInternal(const char*, size_t);