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

[japhet at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 01c6dce4b3cee6a30b0a7bf683948aab048b99bd
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 18:36:47 2009 +0000

    2009-11-11  Nate Chapin  <japhet at chromium.org>
    
            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):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50820 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6e28836..5b4f131 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,19 @@
 2009-11-11  Nate Chapin  <japhet at chromium.org>
 
+        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):
+
+2009-11-11  Nate Chapin  <japhet at chromium.org>
+
         Reviewed by Eric Seidel.
 
         Remove some additional references to dragSourceMovedTo() not
diff --git a/WebKit/chromium/public/WebSocketStreamHandleClient.h b/WebKit/chromium/public/WebSocketStreamHandleClient.h
index 7dcf9a5..82f328c 100644
--- a/WebKit/chromium/public/WebSocketStreamHandleClient.h
+++ b/WebKit/chromium/public/WebSocketStreamHandleClient.h
@@ -43,9 +43,6 @@ class WebURL;
 class WebSocketStreamHandleClient {
 public:
 
-    // Called when WebSocketStreamHandle is going to open the URL.
-    virtual void willOpenStream(WebSocketStreamHandle*, const WebURL&) = 0;
-
     // Called when Socket Stream is opened.
     virtual void didOpenStream(WebSocketStreamHandle*, int /* maxPendingSendAllowed */) = 0;
 
diff --git a/WebKit/chromium/src/SocketStreamHandle.cpp b/WebKit/chromium/src/SocketStreamHandle.cpp
index 356733c..9f19942 100644
--- a/WebKit/chromium/src/SocketStreamHandle.cpp
+++ b/WebKit/chromium/src/SocketStreamHandle.cpp
@@ -60,8 +60,6 @@ public:
     int send(const char*, int);
     void close();
 
-    virtual void willOpenStream(WebSocketStreamHandle*, const WebURL&);
-
     virtual void didOpenStream(WebSocketStreamHandle*, int);
     virtual void didSendData(WebSocketStreamHandle*, int);
     virtual void didReceiveData(WebSocketStreamHandle*, const WebData&);
@@ -110,8 +108,6 @@ int SocketStreamHandleInternal::send(const char* data, int len)
     if (m_socket->send(webdata)) {
         m_pendingAmountSent += len;
         LOG(Network, "sent");
-        if (m_handle && m_handle->m_client)
-            m_handle->m_client->willSendData(m_handle, webdata.data(), webdata.size());
         return len;
     }
     LOG(Network, "busy. buffering");
@@ -123,17 +119,7 @@ void SocketStreamHandleInternal::close()
     LOG(Network, "close");
     m_socket->close();
 }
-
-void SocketStreamHandleInternal::willOpenStream(WebSocketStreamHandle* socketHandle, const WebURL& url)
-{
-    LOG(Network, "willOpenStream");
-    if (m_handle && m_socket.get()) {
-        ASSERT(socketHandle == m_socket.get());
-        if (m_handle->m_client)
-            m_handle->m_client->willOpenStream(m_handle, url);
-    }
-}
-
+    
 void SocketStreamHandleInternal::didOpenStream(WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed)
 {
     LOG(Network, "SocketStreamHandleInternal::didOpen %d",
@@ -245,12 +231,6 @@ void SocketStreamHandle::receivedRequestToContinueWithoutCredential(const Authen
     notImplemented();
 }
 
-void SocketStreamHandle::receivedCancellation(const AuthenticationChallenge& challenge)
-{
-    if (m_client)
-        m_client->receivedCancellation(this, challenge);
-}
-
 }  // namespace WebCore
 
 #endif  // ENABLE(WEB_SOCKETS)

-- 
WebKit Debian packaging