Changeset 50820 in webkit


Ignore:
Timestamp:
Nov 11, 2009 10:36:47 AM (14 years ago)
Author:
Nate Chapin
Message:

2009-11-11 Nate Chapin <Nate Chapin>

Reviewed by Dimitri Glazkov.

​http://trac.webkit.org/changeset/50811 removed some methods from
platform/network/SocketStreamHandleClient.h, so remove them
here too.

​https://bugs.webkit.org/show_bug.cgi?id=31360

  • public/WebSocketStreamHandleClient.h:
  • src/SocketStreamHandle.cpp: (WebCore::SocketStreamHandleInternal::send):
Location:
trunk/WebKit/chromium
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/chromium/ChangeLog

    r50814 r50820  
     12009-11-11  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        http://trac.webkit.org/changeset/50811 removed some methods from
     6        platform/network/SocketStreamHandleClient.h, so remove them
     7        here too.
     8
     9        https://bugs.webkit.org/show_bug.cgi?id=31360
     10
     11        * public/WebSocketStreamHandleClient.h:
     12        * src/SocketStreamHandle.cpp:
     13        (WebCore::SocketStreamHandleInternal::send):
     14
    1152009-11-11  Nate Chapin  <japhet@chromium.org>
    216

  • trunk/WebKit/chromium/public/WebSocketStreamHandleClient.h

    r50688 r50820  
    4444public:
    4545
    46     // Called when WebSocketStreamHandle is going to open the URL.
    47     virtual void willOpenStream(WebSocketStreamHandle*, const WebURL&) = 0;
    48 
    4946    // Called when Socket Stream is opened.
    5047    virtual void didOpenStream(WebSocketStreamHandle*, int /* maxPendingSendAllowed */) = 0;

  • trunk/WebKit/chromium/src/SocketStreamHandle.cpp

    r50746 r50820  
    6161    void close();
    6262
    63     virtual void willOpenStream(WebSocketStreamHandle*, const WebURL&);
    64 
    6563    virtual void didOpenStream(WebSocketStreamHandle*, int);
    6664    virtual void didSendData(WebSocketStreamHandle*, int);
    … …  
    111109        m_pendingAmountSent += len;
    112110        LOG(Network, "sent");
    113         if (m_handle && m_handle->m_client)
    114             m_handle->m_client->willSendData(m_handle, webdata.data(), webdata.size());
    115111        return len;
    116112    }
    … …  
    124120    m_socket->close();
    125121}
    126 
    127 void SocketStreamHandleInternal::willOpenStream(WebSocketStreamHandle* socketHandle, const WebURL& url)
    128 {
    129     LOG(Network, "willOpenStream");
    130     if (m_handle && m_socket.get()) {
    131         ASSERT(socketHandle == m_socket.get());
    132         if (m_handle->m_client)
    133             m_handle->m_client->willOpenStream(m_handle, url);
    134     }
    135 }
    136 
     122   
    137123void SocketStreamHandleInternal::didOpenStream(WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed)
    138124{
    … …  
    246232}
    247233
    248 void SocketStreamHandle::receivedCancellation(const AuthenticationChallenge& challenge)
    249 {
    250     if (m_client)
    251         m_client->receivedCancellation(this, challenge);
    252 }
    253 
    254234}  // namespace WebCore
    255235
Note: See TracChangeset for help on using the changeset viewer.