MAC build fix after r101507.
authorreni@webkit.org <reni@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Nov 2011 15:35:57 +0000 (15:35 +0000)
committerreni@webkit.org <reni@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Nov 2011 15:35:57 +0000 (15:35 +0000)
Rubber stamped by Csaba Osztrogonac.

* platform/network/SocketStreamHandleClient.h:
(WebCore::SocketStreamHandleClient::didUpdateBufferedAmount):
* websockets/WebSocket.cpp:
(WebCore::WebSocket::didUpdateBufferedAmount):
* websockets/WebSocket.h:
* websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::didUpdateBufferedAmount):
* websockets/WebSocketChannel.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@101515 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/network/SocketStreamHandleClient.h
Source/WebCore/websockets/WebSocket.cpp
Source/WebCore/websockets/WebSocket.h
Source/WebCore/websockets/WebSocketChannel.cpp
Source/WebCore/websockets/WebSocketChannel.h

index a103be3..4a4acb9 100644 (file)
@@ -1,3 +1,18 @@
+2011-11-30  Renata Hodovan  <reni@webkit.org>
+
+        MAC build fix after r101507.
+
+        Rubber stamped by Csaba Osztrogonac.
+
+        * platform/network/SocketStreamHandleClient.h:
+        (WebCore::SocketStreamHandleClient::didUpdateBufferedAmount):
+        * websockets/WebSocket.cpp:
+        (WebCore::WebSocket::didUpdateBufferedAmount):
+        * websockets/WebSocket.h:
+        * websockets/WebSocketChannel.cpp:
+        (WebCore::WebSocketChannel::didUpdateBufferedAmount):
+        * websockets/WebSocketChannel.h:
+
 2011-11-30  John Knottenbelt  <jknotten@chromium.org>
 
         Remove unnecessary asserts in HTMLTextAreaElement.
index fa97a5d..573986a 100644 (file)
@@ -46,7 +46,7 @@ namespace WebCore {
         virtual void didOpenSocketStream(SocketStreamHandle*) { }
         virtual void didCloseSocketStream(SocketStreamHandle*) { }
         virtual void didReceiveSocketStreamData(SocketStreamHandle*, const char* /*data*/, int /*length*/) { }
-        virtual void didUpdateBufferedAmount(SocketStreamHandle*, size_t bufferedAmount) { }
+        virtual void didUpdateBufferedAmount(SocketStreamHandle*, size_t /*bufferedAmount*/) { }
 
         virtual void didFailSocketStream(SocketStreamHandle*, const SocketStreamError&) { }
 
index b04483d..f9fd2fe 100644 (file)
@@ -507,6 +507,7 @@ void WebSocket::didReceiveMessageError()
 
 void WebSocket::didUpdateBufferedAmount(unsigned long bufferedAmount)
 {
+    UNUSED_PARAM(bufferedAmount);
     LOG(Network, "WebSocket %p didUpdateBufferedAmount %lu", this, bufferedAmount);
 }
 
index 70c3653..f94977a 100644 (file)
@@ -106,7 +106,7 @@ public:
     virtual void didReceiveMessage(const String& message);
     virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> >);
     virtual void didReceiveMessageError();
-    virtual void didUpdateBufferedAmount(unsigned long bufferedAmount);
+    virtual void didUpdateBufferedAmount(unsigned long);
     virtual void didStartClosingHandshake();
     virtual void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
 
index 36902f1..f052f57 100644 (file)
@@ -325,7 +325,7 @@ void WebSocketChannel::didReceiveSocketStreamData(SocketStreamHandle* handle, co
             break;
 }
 
-void WebSocketChannel::didUpdateBufferedAmount(SocketStreamHandle* handle, size_t bufferedAmount)
+void WebSocketChannel::didUpdateBufferedAmount(SocketStreamHandle*, size_t bufferedAmount)
 {
     if (m_client)
         m_client->didUpdateBufferedAmount(bufferedAmount);
index 6f1ed34..389df52 100644 (file)
@@ -81,7 +81,7 @@ public:
     virtual void didOpenSocketStream(SocketStreamHandle*);
     virtual void didCloseSocketStream(SocketStreamHandle*);
     virtual void didReceiveSocketStreamData(SocketStreamHandle*, const char*, int);
-    virtual void didUpdateBufferedAmount(SocketStreamHandle*, size_t bufferedAmount);
+    virtual void didUpdateBufferedAmount(SocketStreamHandle*, size_t);
     virtual void didFailSocketStream(SocketStreamHandle*, const SocketStreamError&);
     virtual void didReceiveAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&);
     virtual void didCancelAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&);