[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[darin at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0fdef4b4babae567372761c1bdba0710339c4b1d
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 26 06:49:44 2010 +0000

    2010-02-25  Darin Fisher  <darin at chromium.org>
    
            Reviewed by David Levin.
    
            Remove deprecated cookie methods.
            https://bugs.webkit.org/show_bug.cgi?id=35420
    
            * public/WebFrameClient.h:
            * public/WebKitClient.h:
            * src/ChromiumBridge.cpp:
            (WebCore::ChromiumBridge::setCookies):
            (WebCore::ChromiumBridge::cookies):
            (WebCore::ChromiumBridge::cookieRequestHeaderFieldValue):
            (WebCore::ChromiumBridge::rawCookies):
            (WebCore::ChromiumBridge::deleteCookie):
            (WebCore::ChromiumBridge::cookiesEnabled):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55269 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index add0877..d79e55e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,20 @@
+2010-02-25  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by David Levin.
+
+        Remove deprecated cookie methods.
+        https://bugs.webkit.org/show_bug.cgi?id=35420
+
+        * public/WebFrameClient.h:
+        * public/WebKitClient.h:
+        * src/ChromiumBridge.cpp:
+        (WebCore::ChromiumBridge::setCookies):
+        (WebCore::ChromiumBridge::cookies):
+        (WebCore::ChromiumBridge::cookieRequestHeaderFieldValue):
+        (WebCore::ChromiumBridge::rawCookies):
+        (WebCore::ChromiumBridge::deleteCookie):
+        (WebCore::ChromiumBridge::cookiesEnabled):
+
 2010-02-25  James Hawkins  <jhawkins at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebFrameClient.h b/WebKit/chromium/public/WebFrameClient.h
index 5975a72..9076386 100644
--- a/WebKit/chromium/public/WebFrameClient.h
+++ b/WebKit/chromium/public/WebFrameClient.h
@@ -78,7 +78,8 @@ public:
     
     // Services ------------------------------------------------------------
 
-    // A frame specific cookie jar.  May return null.
+    // A frame specific cookie jar.  May return null, in which case
+    // WebKitClient::cookieJar() will be called to access cookies.
     virtual WebCookieJar* cookieJar() { return 0; }
 
 
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
index c5a04b2..042833b 100644
--- a/WebKit/chromium/public/WebKitClient.h
+++ b/WebKit/chromium/public/WebKitClient.h
@@ -36,7 +36,6 @@
 #include "WebLocalizedString.h"
 #include "WebString.h"
 #include "WebURL.h"
-#include "WebVector.h"
 
 #include <time.h>
 
@@ -59,8 +58,6 @@ class WebSocketStreamHandle;
 class WebStorageNamespace;
 class WebThemeEngine;
 class WebURLLoader;
-struct WebCookie;
-template <typename T> class WebVector;
 
 class WebKitClient {
 public:
@@ -181,13 +178,6 @@ public:
 
     // Network -------------------------------------------------------------
 
-    // These cookie methods are DEPRECATED in favor of cookieJar accessor.
-    virtual void setCookies(const WebURL&, const WebURL& firstPartyForCookies, const WebString& cookies) { }
-    virtual WebString cookies(const WebURL&, const WebURL& firstPartyForCookies) { return WebString(); }
-    virtual bool rawCookies(const WebURL&, const WebURL& firstPartyForCookies, WebVector<WebCookie>*) { return false; }
-    virtual void deleteCookie(const WebURL&, const WebString& cookieName) { }
-    virtual bool cookiesEnabled(const WebURL&, const WebURL& firstPartyForCookies) { return true; }
-
     // A suggestion to prefetch IP information for the given hostname.
     virtual void prefetchHostName(const WebString&) { }
 
diff --git a/WebKit/chromium/src/ChromiumBridge.cpp b/WebKit/chromium/src/ChromiumBridge.cpp
index 1eba862..d1a4141 100644
--- a/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/WebKit/chromium/src/ChromiumBridge.cpp
@@ -193,8 +193,6 @@ void ChromiumBridge::setCookies(const Document* document, const KURL& url,
     WebCookieJar* cookieJar = getCookieJar(document);
     if (cookieJar)
         cookieJar->setCookie(url, document->firstPartyForCookies(), value);
-    else
-        webKitClient()->setCookies(url, document->firstPartyForCookies(), value); // DEPRECATED
 }
 
 String ChromiumBridge::cookies(const Document* document, const KURL& url)
@@ -203,8 +201,6 @@ String ChromiumBridge::cookies(const Document* document, const KURL& url)
     WebCookieJar* cookieJar = getCookieJar(document);
     if (cookieJar)
         result = cookieJar->cookies(url, document->firstPartyForCookies());
-    else
-        result = webKitClient()->cookies(url, document->firstPartyForCookies()); // DEPRECATED
     return result;
 }
 
@@ -215,10 +211,6 @@ String ChromiumBridge::cookieRequestHeaderFieldValue(const Document* document,
     WebCookieJar* cookieJar = getCookieJar(document);
     if (cookieJar)
         result = cookieJar->cookieRequestHeaderFieldValue(url, document->firstPartyForCookies());
-    else {
-        // FIXME: This does not return http-only cookies
-        result = webKitClient()->cookies(url, document->firstPartyForCookies()); // DEPRECATED
-    }
     return result;
 }
 
@@ -230,8 +222,6 @@ bool ChromiumBridge::rawCookies(const Document* document, const KURL& url, Vecto
     WebCookieJar* cookieJar = getCookieJar(document);
     if (cookieJar)
         cookieJar->rawCookies(url, document->firstPartyForCookies(), webCookies);
-    else
-        webKitClient()->rawCookies(url, document->firstPartyForCookies(), &webCookies); // DEPRECATED
 
     for (unsigned i = 0; i < webCookies.size(); ++i) {
         const WebCookie& webCookie = webCookies[i];
@@ -253,8 +243,6 @@ void ChromiumBridge::deleteCookie(const Document* document, const KURL& url, con
     WebCookieJar* cookieJar = getCookieJar(document);
     if (cookieJar)
         cookieJar->deleteCookie(url, cookieName);
-    else
-        webKitClient()->deleteCookie(url, cookieName); // DEPRECATED
 }
 
 bool ChromiumBridge::cookiesEnabled(const Document* document)
@@ -263,8 +251,6 @@ bool ChromiumBridge::cookiesEnabled(const Document* document)
     WebCookieJar* cookieJar = getCookieJar(document);
     if (cookieJar)
         result = cookieJar->cookiesEnabled(document->cookieURL(), document->firstPartyForCookies());
-    else
-        result = webKitClient()->cookiesEnabled(document->cookieURL(), document->firstPartyForCookies()); // DEPRECATED
     return result;
 }
 

-- 
WebKit Debian packaging