Changeset 214190 in webkit


Ignore:
Timestamp:
Mar 20, 2017 1:05:50 PM (7 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:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r214189 r214190  
     12017-03-20  Alex Christensen  <achristensen@webkit.org>
     2
     3        Prepare SocketStreamHandle for being created from WK2
     4        https://bugs.webkit.org/show_bug.cgi?id=169885
     5
     6        Reviewed by Andy Estes.
     7
     8        No change in behavior.
     9
     10        * Modules/websockets/WebSocketChannel.cpp:
     11        (WebCore::WebSocketChannel::didOpenSocketStream):
     12        (WebCore::WebSocketChannel::sendFrame):
     13        Rename send to sendData to prevent name collisions with IPC::MessageSender::send.
     14        * platform/network/SocketStreamHandle.cpp:
     15        (WebCore::SocketStreamHandle::sendData):
     16        (WebCore::SocketStreamHandle::send): Deleted.
     17        * platform/network/SocketStreamHandle.h:
     18        * platform/network/cf/SocketStreamHandleImpl.h:
     19        * platform/network/curl/SocketStreamHandleImpl.h:
     20        * platform/network/soup/SocketStreamHandleImpl.h:
     21        Make platformSend and platformClose public so I can call them from IPC proxies.
     22
    1232017-03-20  Andy Estes  <aestes@apple.com>
    224

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

    r214106 r214190  
    279279        InspectorInstrumentation::willSendWebSocketHandshakeRequest(m_document, m_identifier, m_handshake->clientHandshakeRequest());
    280280    CString handshakeMessage = m_handshake->clientHandshakeMessage();
    281     handle.send(handshakeMessage.data(), handshakeMessage.length(), [this, protectedThis = makeRef(*this)] (bool success) {
     281    handle.sendData(handshakeMessage.data(), handshakeMessage.length(), [this, protectedThis = makeRef(*this)] (bool success) {
    282282        if (!success)
    283283            fail("Failed to send WebSocket handshake.");
    … …  
    830830    frame.makeFrameData(frameData);
    831831
    832     m_handle->send(frameData.data(), frameData.size(), WTFMove(completionHandler));
     832    m_handle->sendData(frameData.data(), frameData.size(), WTFMove(completionHandler));
    833833}
    834834

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

    r214114 r214190  
    4949}
    5050
    51 void SocketStreamHandle::send(const char* data, size_t length, Function<void(bool)> completionHandler)
     51void SocketStreamHandle::sendData(const char* data, size_t length, Function<void(bool)> completionHandler)
    5252{
    5353    if (m_state == Connecting || m_state == Closing)

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

    r214114 r214190  
    4545    SocketStreamState state() const;
    4646
    47     void send(const char* data, size_t length, Function<void(bool)>);
     47    void sendData(const char* data, size_t length, Function<void(bool)>);
    4848    void close(); // Disconnect after all data in buffer are sent.
    4949    void disconnect();
    … …  
    5151
    5252protected:
    53     SocketStreamHandle(const URL&, SocketStreamHandleClient&);
     53    WEBCORE_EXPORT SocketStreamHandle(const URL&, SocketStreamHandleClient&);
    5454
    5555    virtual void platformSend(const char* data, size_t length, Function<void(bool)>&&) = 0;

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

    r214114 r214190  
    5151    virtual ~SocketStreamHandleImpl();
    5252
     53    WEBCORE_EXPORT void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
     54    WEBCORE_EXPORT void platformClose() final;
    5355private:
    54     void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
    55     void platformClose() final;
    5656    size_t bufferedAmount() final;
    5757    std::optional<size_t> platformSendInternal(const char*, size_t);

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

    r214114 r214190  
    5656    virtual ~SocketStreamHandleImpl();
    5757
     58    void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
     59    void platformClose() final;
    5860private:
    5961    SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&);
    6062
    61     void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
    62     void platformClose() final;
    6363    size_t bufferedAmount() final;
    6464    std::optional<size_t> platformSendInternal(const char*, size_t);

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

    r214114 r214190  
    5454    virtual ~SocketStreamHandleImpl();
    5555
     56    void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
     57    void platformClose() final;
    5658private:
    5759    SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&);
    5860
    59     void platformSend(const char* data, size_t length, Function<void(bool)>&&) final;
    60     void platformClose() final;
    6161    size_t bufferedAmount() final;
    6262    std::optional<size_t> platformSendInternal(const char*, size_t);
Note: See TracChangeset for help on using the changeset viewer.