⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 92102 in webkit


Ignore:
Timestamp:
Aug 1, 2011, 12:26:41 AM (15 years ago)
Author:
yutak@chromium.org
Message:

WebSocket: Rename SocketStreamHandleClient member functions
​https://bugs.webkit.org/show_bug.cgi?id=65374

Reviewed by Kent Tamura.

Source/WebCore:

Rename SocketStreamHandleClient member functions to avoid conflict of the names of
FileReaderLoaderClient functions.

No change in behavior, thus no new tests are added.

  • platform/network/SocketStreamHandleClient.h:

(WebCore::SocketStreamHandleClient::didOpenSocketStream):
(WebCore::SocketStreamHandleClient::didCloseSocketStream):
(WebCore::SocketStreamHandleClient::didReceiveSocketStreamData):
(WebCore::SocketStreamHandleClient::didFailSocketStream):

  • platform/network/brew/SocketStreamHandleBrew.cpp:

(WebCore::SocketStreamHandlePrivate::socketConnected):
(WebCore::SocketStreamHandlePrivate::socketReadyRead):
(WebCore::SocketStreamHandlePrivate::socketClosed):
(WebCore::SocketStreamHandlePrivate::socketError):

  • platform/network/cf/SocketStreamHandleCFNet.cpp:

(WebCore::SocketStreamHandle::addCONNECTCredentials):
(WebCore::SocketStreamHandle::readStreamCallback):
(WebCore::SocketStreamHandle::writeStreamCallback):
(WebCore::SocketStreamHandle::reportErrorToClient):
(WebCore::SocketStreamHandle::platformClose):

  • platform/network/qt/SocketStreamHandleQt.cpp:

(WebCore::SocketStreamHandlePrivate::socketConnected):
(WebCore::SocketStreamHandlePrivate::socketReadyRead):
(WebCore::SocketStreamHandlePrivate::socketClosedCallback):
(WebCore::SocketStreamHandlePrivate::socketErrorCallback):

  • platform/network/soup/SocketStreamHandleSoup.cpp:

(WebCore::SocketStreamHandle::connected):
(WebCore::SocketStreamHandle::readBytes):
(WebCore::SocketStreamHandle::platformSend):
(WebCore::SocketStreamHandle::platformClose):

  • websockets/WebSocketChannel.cpp:

(WebCore::WebSocketChannel::didOpenSocketStream):
(WebCore::WebSocketChannel::didCloseSocketStream):
(WebCore::WebSocketChannel::didReceiveSocketStreamData):
(WebCore::WebSocketChannel::didFailSocketStream):
(WebCore::WebSocketChannel::resumeTimerFired):

  • websockets/WebSocketChannel.h:

Source/WebKit/chromium:

  • src/SocketStreamHandle.cpp:

(WebCore::SocketStreamHandleInternal::didOpenStream):
(WebCore::SocketStreamHandleInternal::didReceiveData):
(WebCore::SocketStreamHandleInternal::didClose):
(WebCore::SocketStreamHandleInternal::didFail):

Location:
trunk/Source
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r92098 r92102  
     12011-08-01  Yuta Kitamura  <yutak@chromium.org>
     2
     3        WebSocket: Rename SocketStreamHandleClient member functions
     4        https://bugs.webkit.org/show_bug.cgi?id=65374
     5
     6        Reviewed by Kent Tamura.
     7
     8        Rename SocketStreamHandleClient member functions to avoid conflict of the names of
     9        FileReaderLoaderClient functions.
     10
     11        No change in behavior, thus no new tests are added.
     12
     13        * platform/network/SocketStreamHandleClient.h:
     14        (WebCore::SocketStreamHandleClient::didOpenSocketStream):
     15        (WebCore::SocketStreamHandleClient::didCloseSocketStream):
     16        (WebCore::SocketStreamHandleClient::didReceiveSocketStreamData):
     17        (WebCore::SocketStreamHandleClient::didFailSocketStream):
     18        * platform/network/brew/SocketStreamHandleBrew.cpp:
     19        (WebCore::SocketStreamHandlePrivate::socketConnected):
     20        (WebCore::SocketStreamHandlePrivate::socketReadyRead):
     21        (WebCore::SocketStreamHandlePrivate::socketClosed):
     22        (WebCore::SocketStreamHandlePrivate::socketError):
     23        * platform/network/cf/SocketStreamHandleCFNet.cpp:
     24        (WebCore::SocketStreamHandle::addCONNECTCredentials):
     25        (WebCore::SocketStreamHandle::readStreamCallback):
     26        (WebCore::SocketStreamHandle::writeStreamCallback):
     27        (WebCore::SocketStreamHandle::reportErrorToClient):
     28        (WebCore::SocketStreamHandle::platformClose):
     29        * platform/network/qt/SocketStreamHandleQt.cpp:
     30        (WebCore::SocketStreamHandlePrivate::socketConnected):
     31        (WebCore::SocketStreamHandlePrivate::socketReadyRead):
     32        (WebCore::SocketStreamHandlePrivate::socketClosedCallback):
     33        (WebCore::SocketStreamHandlePrivate::socketErrorCallback):
     34        * platform/network/soup/SocketStreamHandleSoup.cpp:
     35        (WebCore::SocketStreamHandle::connected):
     36        (WebCore::SocketStreamHandle::readBytes):
     37        (WebCore::SocketStreamHandle::platformSend):
     38        (WebCore::SocketStreamHandle::platformClose):
     39        * websockets/WebSocketChannel.cpp:
     40        (WebCore::WebSocketChannel::didOpenSocketStream):
     41        (WebCore::WebSocketChannel::didCloseSocketStream):
     42        (WebCore::WebSocketChannel::didReceiveSocketStreamData):
     43        (WebCore::WebSocketChannel::didFailSocketStream):
     44        (WebCore::WebSocketChannel::resumeTimerFired):
     45        * websockets/WebSocketChannel.h:
     46
    1472011-07-31  Sheriff Bot  <webkit.review.bot@gmail.com>
    248

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

    r50951 r92102  
    4444        virtual ~SocketStreamHandleClient() { }
    4545
    46         virtual void didOpen(SocketStreamHandle*) { }
    47         virtual void didClose(SocketStreamHandle*) { }
    48         virtual void didReceiveData(SocketStreamHandle*, const char* /*data*/, int /*length*/) { }
     46        virtual void didOpenSocketStream(SocketStreamHandle*) { }
     47        virtual void didCloseSocketStream(SocketStreamHandle*) { }
     48        virtual void didReceiveSocketStreamData(SocketStreamHandle*, const char* /*data*/, int /*length*/) { }
    4949
    50         virtual void didFail(SocketStreamHandle*, const SocketStreamError&) { }
     50        virtual void didFailSocketStream(SocketStreamHandle*, const SocketStreamError&) { }
    5151
    5252        // No authentication for streams per se, but proxy may ask for credentials.

  • trunk/Source/WebCore/platform/network/brew/SocketStreamHandleBrew.cpp

    r61496 r92102  
    114114    if (m_streamHandle && m_streamHandle->client()) {
    115115        m_streamHandle->m_state = SocketStreamHandleBase::Open;
    116         m_streamHandle->client()->didOpen(m_streamHandle);
     116        m_streamHandle->client()->didOpenSocketStream(m_streamHandle);
    117117    }
    118118
    … …  
    131131        }
    132132
    133         m_streamHandle->client()->didReceiveData(m_streamHandle, buffer.data(), readSize);
     133        m_streamHandle->client()->didReceiveSocketStreamData(m_streamHandle, buffer.data(), readSize);
    134134    }
    135135
    … …  
    167167        m_streamHandle = 0;
    168168        // This following call deletes _this_. Nothing should be after it.
    169         streamHandle->client()->didClose(streamHandle);
     169        streamHandle->client()->didCloseSocketStream(streamHandle);
    170170    }
    171171}
    … …  
    178178        m_streamHandle = 0;
    179179        // This following call deletes _this_. Nothing should be after it.
    180         streamHandle->client()->didClose(streamHandle);
     180        streamHandle->client()->didCloseSocketStream(streamHandle);
    181181    }
    182182}

  • trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp

    r87135 r92102  
    330330    if (!CFHTTPAuthenticationRequiresUserNameAndPassword(authentication.get())) {
    331331        // That's all we can offer...
    332         m_client->didFail(this, SocketStreamError()); // FIXME: Provide a sensible error.
     332        m_client->didFailSocketStream(this, SocketStreamError()); // FIXME: Provide a sensible error.
    333333        return;
    334334    }
    … …  
    355355        if (!proxyAuthorizationString) {
    356356            // Fails e.g. for NTLM auth.
    357             m_client->didFail(this, SocketStreamError()); // FIXME: Provide a sensible error.
     357            m_client->didFailSocketStream(this, SocketStreamError()); // FIXME: Provide a sensible error.
    358358            return;
    359359        }
    … …  
    367367    // FIXME: Ask the client if credentials could not be found.
    368368
    369     m_client->didFail(this, SocketStreamError()); // FIXME: Provide a sensible error.
     369    m_client->didFailSocketStream(this, SocketStreamError()); // FIXME: Provide a sensible error.
    370370}
    371371
    … …  
    446446
    447447            RefPtr<SocketStreamHandle> protect(this); // The client can close the handle, potentially removing the last reference.
    448             m_client->didOpen(this);
     448            m_client->didOpenSocketStream(this);
    449449            if (m_state == Closed)
    450450                break;
    … …  
    464464        }
    465465
    466         m_client->didReceiveData(this, reinterpret_cast<const char*>(ptr), length);
     466        m_client->didReceiveSocketStreamData(this, reinterpret_cast<const char*>(ptr), length);
    467467
    468468        break;
    … …  
    505505
    506506            RefPtr<SocketStreamHandle> protect(this); // The client can close the handle, potentially removing the last reference.
    507             m_client->didOpen(this);
     507            m_client->didOpenSocketStream(this);
    508508            break;
    509509        }
    … …  
    544544    }
    545545
    546     m_client->didFail(this, SocketStreamError(static_cast<int>(errorCode), m_url.string(), description));
     546    m_client->didFailSocketStream(this, SocketStreamError(static_cast<int>(errorCode), m_url.string(), description));
    547547}
    548548
    … …  
    572572    if (!m_readStream) {
    573573        if (m_connectingSubstate == New || m_connectingSubstate == ExecutingPACFile)
    574             m_client->didClose(this);
     574            m_client->didCloseSocketStream(this);
    575575        return;
    576576    }
    … …  
    590590    m_writeStream = 0;
    591591
    592     m_client->didClose(this);
     592    m_client->didCloseSocketStream(this);
    593593}
    594594

  • trunk/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp

    r69221 r92102  
    8484    if (m_streamHandle && m_streamHandle->client()) {
    8585        m_streamHandle->m_state = SocketStreamHandleBase::Open;
    86         m_streamHandle->client()->didOpen(m_streamHandle);
     86        m_streamHandle->client()->didOpenSocketStream(m_streamHandle);
    8787    }
    8888}
    … …  
    9292    if (m_streamHandle && m_streamHandle->client()) {
    9393        QByteArray data = m_socket->read(m_socket->bytesAvailable());
    94         m_streamHandle->client()->didReceiveData(m_streamHandle, data.constData(), data.size());
     94        m_streamHandle->client()->didReceiveSocketStreamData(m_streamHandle, data.constData(), data.size());
    9595    }
    9696}
    … …  
    133133        m_streamHandle = 0;
    134134        // This following call deletes _this_. Nothing should be after it.
    135         streamHandle->client()->didClose(streamHandle);
     135        streamHandle->client()->didCloseSocketStream(streamHandle);
    136136    }
    137137}
    … …  
    144144        m_streamHandle = 0;
    145145        // This following call deletes _this_. Nothing should be after it.
    146         streamHandle->client()->didClose(streamHandle);
     146        streamHandle->client()->didCloseSocketStream(streamHandle);
    147147    }
    148148}

  • trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp

    r89197 r92102  
    103103{
    104104    if (error) {
    105         m_client->didFail(this, SocketStreamError(error->code));
     105        m_client->didFailSocketStream(this, SocketStreamError(error->code));
    106106        return;
    107107    }
    … …  
    118118    RefPtr<SocketStreamHandle> protect(this);
    119119    m_state = Open;
    120     m_client->didOpen(this);
     120    m_client->didOpenSocketStream(this);
    121121    if (!m_socketConnection) // Client closed the connection.
    122122        return;
    … …  
    126126{
    127127    if (error) {
    128         m_client->didFail(this, SocketStreamError(error->code));
     128        m_client->didFailSocketStream(this, SocketStreamError(error->code));
    129129        return;
    130130    }
    … …  
    137137    // The client can close the handle, potentially removing the last reference.
    138138    RefPtr<SocketStreamHandle> protect(this);
    139     m_client->didReceiveData(this, m_readBuffer, bytesRead);
     139    m_client->didReceiveSocketStreamData(this, m_readBuffer, bytesRead);
    140140    if (m_inputStream) // The client may have closed the connection.
    141141        g_input_stream_read_async(m_inputStream.get(), m_readBuffer, READ_BUFFER_SIZE, G_PRIORITY_DEFAULT, 0,
    … …  
    164164    gssize written = g_pollable_output_stream_write_nonblocking(m_outputStream.get(), data, length, 0, &error.outPtr());
    165165    if (error && !g_error_matches(error.get(), G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) {
    166         m_client->didFail(this, SocketStreamError(error->code)); // FIXME: Provide a sensible error.
     166        m_client->didFailSocketStream(this, SocketStreamError(error->code)); // FIXME: Provide a sensible error.
    167167        return 0;
    168168    }
    … …  
    186186        g_io_stream_close(G_IO_STREAM(m_socketConnection.get()), 0, &error.outPtr());
    187187        if (error)
    188             m_client->didFail(this, SocketStreamError(error->code)); // FIXME: Provide a sensible error.
     188            m_client->didFailSocketStream(this, SocketStreamError(error->code)); // FIXME: Provide a sensible error.
    189189        m_socketConnection = 0;
    190190    }
    … …  
    194194    delete m_readBuffer;
    195195
    196     m_client->didClose(this);
     196    m_client->didCloseSocketStream(this);
    197197}
    198198

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

    r91919 r92102  
    204204}
    205205
    206 void WebSocketChannel::didOpen(SocketStreamHandle* handle)
    207 {
    208     LOG(Network, "WebSocketChannel %p didOpen", this);
     206void WebSocketChannel::didOpenSocketStream(SocketStreamHandle* handle)
     207{
     208    LOG(Network, "WebSocketChannel %p didOpenSocketStream", this);
    209209    ASSERT(handle == m_handle);
    210210    if (!m_context)
    … …  
    217217}
    218218
    219 void WebSocketChannel::didClose(SocketStreamHandle* handle)
    220 {
    221     LOG(Network, "WebSocketChannel %p didClose", this);
     219void WebSocketChannel::didCloseSocketStream(SocketStreamHandle* handle)
     220{
     221    LOG(Network, "WebSocketChannel %p didCloseSocketStream", this);
    222222    if (m_identifier && m_context)
    223223        InspectorInstrumentation::didCloseWebSocket(m_context, m_identifier);
    … …  
    240240}
    241241
    242 void WebSocketChannel::didReceiveData(SocketStreamHandle* handle, const char* data, int len)
    243 {
    244     LOG(Network, "WebSocketChannel %p didReceiveData %d", this, len);
     242void WebSocketChannel::didReceiveSocketStreamData(SocketStreamHandle* handle, const char* data, int len)
     243{
     244    LOG(Network, "WebSocketChannel %p didReceiveSocketStreamData %d", this, len);
    245245    RefPtr<WebSocketChannel> protect(this); // The client can close the channel, potentially removing the last reference.
    246246    ASSERT(handle == m_handle);
    … …  
    269269}
    270270
    271 void WebSocketChannel::didFail(SocketStreamHandle* handle, const SocketStreamError& error)
    272 {
    273     LOG(Network, "WebSocketChannel %p didFail", this);
     271void WebSocketChannel::didFailSocketStream(SocketStreamHandle* handle, const SocketStreamError& error)
     272{
     273    LOG(Network, "WebSocketChannel %p didFailSocketStream", this);
    274274    ASSERT(handle == m_handle || !m_handle);
    275275    if (m_context) {
    … …  
    396396            break;
    397397    if (!m_suspended && m_client && m_closed && m_handle)
    398         didClose(m_handle.get());
     398        didCloseSocketStream(m_handle.get());
    399399}
    400400

  • trunk/Source/WebCore/websockets/WebSocketChannel.h

    r91919 r92102  
    6666        virtual void resume();
    6767
    68         virtual void didOpen(SocketStreamHandle*);
    69         virtual void didClose(SocketStreamHandle*);
    70         virtual void didReceiveData(SocketStreamHandle*, const char*, int);
    71         virtual void didFail(SocketStreamHandle*, const SocketStreamError&);
     68        // SocketStreamHandleClient functions.
     69        virtual void didOpenSocketStream(SocketStreamHandle*);
     70        virtual void didCloseSocketStream(SocketStreamHandle*);
     71        virtual void didReceiveSocketStreamData(SocketStreamHandle*, const char*, int);
     72        virtual void didFailSocketStream(SocketStreamHandle*, const SocketStreamError&);
    7273        virtual void didReceiveAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&);
    7374        virtual void didCancelAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&);

  • trunk/Source/WebKit/chromium/ChangeLog

    r92083 r92102  
     12011-08-01  Yuta Kitamura  <yutak@chromium.org>
     2
     3        WebSocket: Rename SocketStreamHandleClient member functions
     4        https://bugs.webkit.org/show_bug.cgi?id=65374
     5
     6        Reviewed by Kent Tamura.
     7
     8        * src/SocketStreamHandle.cpp:
     9        (WebCore::SocketStreamHandleInternal::didOpenStream):
     10        (WebCore::SocketStreamHandleInternal::didReceiveData):
     11        (WebCore::SocketStreamHandleInternal::didClose):
     12        (WebCore::SocketStreamHandleInternal::didFail):
     13
    1142011-07-31  Bill Budge  <bbudge@chromium.org>
    215

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

    r86067 r92102  
    131131        m_handle->m_state = SocketStreamHandleBase::Open;
    132132        if (m_handle->m_client) {
    133             m_handle->m_client->didOpen(m_handle);
     133            m_handle->m_client->didOpenSocketStream(m_handle);
    134134            return;
    135135        }
    … …  
    156156        ASSERT(socketHandle == m_socket.get());
    157157        if (m_handle->m_client)
    158             m_handle->m_client->didReceiveData(m_handle, data.data(), data.size());
     158            m_handle->m_client->didReceiveSocketStreamData(m_handle, data.data(), data.size());
    159159    }
    160160}
    … …  
    169169        m_handle = 0;
    170170        if (h->m_client)
    171             h->m_client->didClose(h);
     171            h->m_client->didCloseSocketStream(h);
    172172    }
    173173}
    … …  
    182182        m_handle = 0;
    183183        if (h->m_client)
    184             h->m_client->didClose(h); // didFail(h, err);
     184            h->m_client->didCloseSocketStream(h); // didFail(h, err);
    185185    }
    186186}
Note: See TracChangeset for help on using the changeset viewer.