| Index: Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp
|
| diff --git a/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp b/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp
|
| index d0373267adcb2c10c99894461c4e64a8dbe0ad76..a2d08f30bf1d34dc958c42ea38e69cc6b1294cdf 100644
|
| --- a/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp
|
| +++ b/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp
|
| @@ -59,7 +59,7 @@ SocketStreamHandleInternal::~SocketStreamHandleInternal()
|
| void SocketStreamHandleInternal::connect(const KURL& url)
|
| {
|
| m_socket = adoptPtr(WebKit::Platform::current()->createSocketStreamHandle());
|
| - LOG(Network, "connect");
|
| + LOG_INFO(Network, "connect");
|
| ASSERT(m_socket);
|
| ASSERT(m_handle);
|
| if (m_handle->m_client)
|
| @@ -69,12 +69,12 @@ void SocketStreamHandleInternal::connect(const KURL& url)
|
|
|
| int SocketStreamHandleInternal::send(const char* data, int len)
|
| {
|
| - LOG(Network, "send len=%d", len);
|
| + LOG_INFO(Network, "send len=%d", len);
|
| // FIXME: |m_socket| should not be null here, but it seems that there is the
|
| // case. We should figure out such a path and fix it rather than checking
|
| // null here.
|
| if (!m_socket) {
|
| - LOG(Network, "m_socket is null when sending. It should not be.");
|
| + LOG_INFO(Network, "m_socket is null when sending. It should not be.");
|
| return 0;
|
| }
|
| if (m_pendingAmountSent + len > m_maxPendingSendAllowed)
|
| @@ -85,23 +85,23 @@ int SocketStreamHandleInternal::send(const char* data, int len)
|
| WebKit::WebData webdata(data, len);
|
| if (m_socket->send(webdata)) {
|
| m_pendingAmountSent += len;
|
| - LOG(Network, "sent");
|
| + LOG_INFO(Network, "sent");
|
| return len;
|
| }
|
| - LOG(Network, "busy. buffering");
|
| + LOG_INFO(Network, "busy. buffering");
|
| return 0;
|
| }
|
|
|
| void SocketStreamHandleInternal::close()
|
| {
|
| - LOG(Network, "close");
|
| + LOG_INFO(Network, "close");
|
| if (m_socket)
|
| m_socket->close();
|
| }
|
|
|
| void SocketStreamHandleInternal::didOpenStream(WebKit::WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed)
|
| {
|
| - LOG(Network, "SocketStreamHandleInternal::didOpen %d",
|
| + LOG_INFO(Network, "SocketStreamHandleInternal::didOpen %d",
|
| maxPendingSendAllowed);
|
| ASSERT(maxPendingSendAllowed > 0);
|
| if (m_handle && m_socket) {
|
| @@ -113,12 +113,12 @@ void SocketStreamHandleInternal::didOpenStream(WebKit::WebSocketStreamHandle* so
|
| return;
|
| }
|
| }
|
| - LOG(Network, "no m_handle or m_socket?");
|
| + LOG_INFO(Network, "no m_handle or m_socket?");
|
| }
|
|
|
| void SocketStreamHandleInternal::didSendData(WebKit::WebSocketStreamHandle* socketHandle, int amountSent)
|
| {
|
| - LOG(Network, "SocketStreamHandleInternal::didSendData %d", amountSent);
|
| + LOG_INFO(Network, "SocketStreamHandleInternal::didSendData %d", amountSent);
|
| ASSERT(amountSent > 0);
|
| if (m_handle && m_socket) {
|
| ASSERT(socketHandle == m_socket.get());
|
| @@ -130,7 +130,7 @@ void SocketStreamHandleInternal::didSendData(WebKit::WebSocketStreamHandle* sock
|
|
|
| void SocketStreamHandleInternal::didReceiveData(WebKit::WebSocketStreamHandle* socketHandle, const WebKit::WebData& data)
|
| {
|
| - LOG(Network, "didReceiveData");
|
| + LOG_INFO(Network, "didReceiveData");
|
| if (m_handle && m_socket) {
|
| ASSERT(socketHandle == m_socket.get());
|
| if (m_handle->m_client)
|
| @@ -140,7 +140,7 @@ void SocketStreamHandleInternal::didReceiveData(WebKit::WebSocketStreamHandle* s
|
|
|
| void SocketStreamHandleInternal::didClose(WebKit::WebSocketStreamHandle* socketHandle)
|
| {
|
| - LOG(Network, "didClose");
|
| + LOG_INFO(Network, "didClose");
|
| if (m_handle && m_socket) {
|
| ASSERT(socketHandle == m_socket.get());
|
| m_socket.clear();
|
| @@ -153,7 +153,7 @@ void SocketStreamHandleInternal::didClose(WebKit::WebSocketStreamHandle* socketH
|
|
|
| void SocketStreamHandleInternal::didFail(WebKit::WebSocketStreamHandle* socketHandle, const WebKit::WebSocketStreamError& err)
|
| {
|
| - LOG(Network, "didFail");
|
| + LOG_INFO(Network, "didFail");
|
| if (m_handle && m_socket) {
|
| ASSERT(socketHandle == m_socket.get());
|
| m_socket.clear();
|
|
|