[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 31761603e692ccea86093be5351b1c8b5f2bd086
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 17:22:52 2009 +0000

            Reviewed by Sam Weinig.
    
            https://bugs.webkit.org/show_bug.cgi?id=31327
            Clean up SocketStreamHandleClient interface
    
            No change in behavior.
    
            * platform/network/SocketStreamHandleClient.h: Removed willOpenStream and willSendData.
            (WebCore::SocketStreamHandleClient::willOpenStream): Removed. This is currently not used by
            the only client (WebSocketChannel), and it's not clear what this callback's semantics
            should be.
            (WebCore::SocketStreamHandleClient::willSendData): Ditto.
            (WebCore::SocketStreamHandleClient::receivedCancellation): Removed, because it was misplaced.
            For ResourceHandle, this method is called when the user cancels authentication sheet,
            not when something happens with the stream.
    
            * websockets/WebSocketChannel.h: Some WebSocketChannel methods were virtual without any
            reason. Also, added didReceiveAuthenticationChallenge/didCancelAuthenticationChallenge.
    
            * websockets/WebSocketChannel.cpp: Adjusted for the above change. Authentication-related
            callbacks have no real implementation yet.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50811 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index af17d67..ffb739b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2009-11-10  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31327
+        Clean up SocketStreamHandleClient interface
+
+        No change in behavior.
+
+        * platform/network/SocketStreamHandleClient.h: Removed willOpenStream and willSendData.
+        (WebCore::SocketStreamHandleClient::willOpenStream): Removed. This is currently not used by
+        the only client (WebSocketChannel), and it's not clear what this callback's semantics
+        should be.
+        (WebCore::SocketStreamHandleClient::willSendData): Ditto.
+        (WebCore::SocketStreamHandleClient::receivedCancellation): Removed, because it was misplaced.
+        For ResourceHandle, this method is called when the user cancels authentication sheet,
+        not when something happens with the stream.
+
+        * websockets/WebSocketChannel.h: Some WebSocketChannel methods were virtual without any
+        reason. Also, added didReceiveAuthenticationChallenge/didCancelAuthenticationChallenge.
+
+        * websockets/WebSocketChannel.cpp: Adjusted for the above change. Authentication-related
+        callbacks have no real implementation yet.
+
 2009-11-11  Zoltan Horvath  <zoltan at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/network/SocketStreamHandleClient.h b/WebCore/platform/network/SocketStreamHandleClient.h
index 04c744e..1586334 100644
--- a/WebCore/platform/network/SocketStreamHandleClient.h
+++ b/WebCore/platform/network/SocketStreamHandleClient.h
@@ -43,9 +43,6 @@ namespace WebCore {
     public:
         virtual ~SocketStreamHandleClient() { }
 
-        virtual void willOpenStream(SocketStreamHandle*, const KURL&) { }
-        virtual void willSendData(SocketStreamHandle*, const char* /*data*/, int /*length*/) { }
-
         virtual void didOpen(SocketStreamHandle*) { }
         virtual void didClose(SocketStreamHandle*) { }
         virtual void didReceiveData(SocketStreamHandle*, const char* /*data*/, int /*length*/) { }
@@ -54,7 +51,6 @@ namespace WebCore {
 
         virtual void didReceiveAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&) { }
         virtual void didCancelAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&) { }
-        virtual void receivedCancellation(SocketStreamHandle*, const AuthenticationChallenge&) { }
     };
 
 }  // namespace WebCore
diff --git a/WebCore/websockets/WebSocketChannel.cpp b/WebCore/websockets/WebSocketChannel.cpp
index be388b4..e71c0fa 100644
--- a/WebCore/websockets/WebSocketChannel.cpp
+++ b/WebCore/websockets/WebSocketChannel.cpp
@@ -112,14 +112,6 @@ void WebSocketChannel::disconnect()
         m_handle->close();
 }
 
-void WebSocketChannel::willOpenStream(SocketStreamHandle*, const KURL&)
-{
-}
-
-void WebSocketChannel::willSendData(SocketStreamHandle*, const char*, int)
-{
-}
-
 void WebSocketChannel::didOpen(SocketStreamHandle* handle)
 {
     LOG(Network, "WebSocketChannel %p didOpen", this);
@@ -228,6 +220,14 @@ void WebSocketChannel::didFail(SocketStreamHandle* handle, const SocketStreamErr
     handle->close();
 }
 
+void WebSocketChannel::didReceiveAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&)
+{
+}
+
+void WebSocketChannel::didCancelAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&)
+{
+}
+
 bool WebSocketChannel::appendToBuffer(const char* data, int len)
 {
     char* newBuffer = 0;
diff --git a/WebCore/websockets/WebSocketChannel.h b/WebCore/websockets/WebSocketChannel.h
index ad38163..14b1e8c 100644
--- a/WebCore/websockets/WebSocketChannel.h
+++ b/WebCore/websockets/WebSocketChannel.h
@@ -50,21 +50,18 @@ namespace WebCore {
         static PassRefPtr<WebSocketChannel> create(ScriptExecutionContext* context, WebSocketChannelClient* client, const KURL& url, const String& protocol) { return adoptRef(new WebSocketChannel(context, client, url, protocol)); }
         virtual ~WebSocketChannel();
 
-        virtual void connect();
+        void connect();
+        bool send(const String& msg);
+        unsigned long bufferedAmount() const;
+        void close();
+        void disconnect(); // Will suppress didClose().
 
-        virtual bool send(const String& msg);
-        virtual unsigned long bufferedAmount() const;
-
-        virtual void close();
-
-        virtual void disconnect();
-
-        virtual void willOpenStream(SocketStreamHandle*, const KURL&);
-        virtual void willSendData(SocketStreamHandle*, const char*, int);
         virtual void didOpen(SocketStreamHandle*);
         virtual void didClose(SocketStreamHandle*);
         virtual void didReceiveData(SocketStreamHandle*, const char*, int);
         virtual void didFail(SocketStreamHandle*, const SocketStreamError&);
+        virtual void didReceiveAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&);
+        virtual void didCancelAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&);
 
     private:
         WebSocketChannel(ScriptExecutionContext*, WebSocketChannelClient*, const KURL&, const String&);

-- 
WebKit Debian packaging