[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9a975d315868d6601a021ab94c9d67cb7148d986
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 02:32:06 2010 +0000

    2010-01-03  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [Chromium] Implement CookieJarChromium::cookiesEnabled
            https://bugs.webkit.org/show_bug.cgi?id=33123
    
            Call out to ChromiumBridge to find out if cookies are enabled.
    
            * platform/chromium/ChromiumBridge.h:
            * platform/network/chromium/CookieJarChromium.cpp:
            (WebCore::cookiesEnabled):
    2010-01-03  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [Chromium] Implement CookieJarChromium::cookiesEnabled
            https://bugs.webkit.org/show_bug.cgi?id=33123
    
            Call out to the webKitClient() to see if cookies are enabled.  Also
            remove some straggling references to policyURL!
    
            * public/WebKitClient.h:
            (WebKit::WebKitClient::setCookies):
            (WebKit::WebKitClient::cookies):
            (WebKit::WebKitClient::rawCookies):
            (WebKit::WebKitClient::cookiesEnabled):
            * src/ChromiumBridge.cpp:
            (WebCore::ChromiumBridge::cookiesEnabled):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52699 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7b73014..4492e6a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Eric Seidel.
 
+        [Chromium] Implement CookieJarChromium::cookiesEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=33123
+
+        Call out to ChromiumBridge to find out if cookies are enabled.
+
+        * platform/chromium/ChromiumBridge.h:
+        * platform/network/chromium/CookieJarChromium.cpp:
+        (WebCore::cookiesEnabled):
+
+2010-01-03  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         [Chromium] Remove evaluateInNewContext (it's useless)
         https://bugs.webkit.org/show_bug.cgi?id=33068
 
diff --git a/WebCore/platform/chromium/ChromiumBridge.h b/WebCore/platform/chromium/ChromiumBridge.h
index 3709f7c..d30b9a8 100644
--- a/WebCore/platform/chromium/ChromiumBridge.h
+++ b/WebCore/platform/chromium/ChromiumBridge.h
@@ -87,6 +87,7 @@ namespace WebCore {
         static String cookies(const KURL& url, const KURL& firstPartyForCookies);
         static bool rawCookies(const KURL& url, const KURL& firstPartyForCookies, Vector<Cookie>*);
         static void deleteCookie(const KURL& url, const String& cookieName);
+        static bool cookiesEnabled(const KURL& url, const KURL& firstPartyForCookies);
 
         // DNS ----------------------------------------------------------------
         static void prefetchDNS(const String& hostname);
diff --git a/WebCore/platform/network/chromium/CookieJarChromium.cpp b/WebCore/platform/network/chromium/CookieJarChromium.cpp
index 279d9b0..35f1c3f 100644
--- a/WebCore/platform/network/chromium/CookieJarChromium.cpp
+++ b/WebCore/platform/network/chromium/CookieJarChromium.cpp
@@ -47,10 +47,9 @@ String cookies(const Document* document, const KURL& url)
     return ChromiumBridge::cookies(url, document->firstPartyForCookies());
 }
 
-bool cookiesEnabled(const Document*)
+bool cookiesEnabled(const Document* document)
 {
-    // FIXME: For now just assume cookies are always on.
-    return true;
+    return ChromiumBridge::cookiesEnabled(document->cookieURL(), document->firstPartyForCookies());
 }
 
 bool getRawCookies(const Document* document, const KURL& url, Vector<Cookie>& rawCookies)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ac870f1..04be19c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,24 @@
 
         Reviewed by Eric Seidel.
 
+        [Chromium] Implement CookieJarChromium::cookiesEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=33123
+
+        Call out to the webKitClient() to see if cookies are enabled.  Also
+        remove some straggling references to policyURL!
+
+        * public/WebKitClient.h:
+        (WebKit::WebKitClient::setCookies):
+        (WebKit::WebKitClient::cookies):
+        (WebKit::WebKitClient::rawCookies):
+        (WebKit::WebKitClient::cookiesEnabled):
+        * src/ChromiumBridge.cpp:
+        (WebCore::ChromiumBridge::cookiesEnabled):
+
+2010-01-03  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         [Chromium] Remove evaluateInNewContext (it's useless)
         https://bugs.webkit.org/show_bug.cgi?id=33068
 
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
index 2a00a9a..77f7092 100644
--- a/WebKit/chromium/public/WebKitClient.h
+++ b/WebKit/chromium/public/WebKitClient.h
@@ -178,10 +178,11 @@ public:
     // Network -------------------------------------------------------------
 
     virtual void setCookies(
-        const WebURL& url, const WebURL& policyURL, const WebString& cookies) { }
-    virtual WebString cookies(const WebURL& url, const WebURL& policyURL) { return WebString(); }
-    virtual bool rawCookies(const WebURL& url, const WebURL& policyURL, WebVector<WebCookie>*) { return false; }
+        const WebURL& url, const WebURL& firstPartyForCookies, const WebString& cookies) { }
+    virtual WebString cookies(const WebURL& url, const WebURL& firstPartyForCookies) { return WebString(); }
+    virtual bool rawCookies(const WebURL& url, const WebURL& firstPartyForCookies, WebVector<WebCookie>*) { return false; }
     virtual void deleteCookie(const WebURL& url, const WebString& cookieName) { }
+    virtual bool cookiesEnabled(const WebURL& url, 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 39a155f..9700e1a 100644
--- a/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/WebKit/chromium/src/ChromiumBridge.cpp
@@ -213,6 +213,12 @@ void ChromiumBridge::deleteCookie(const KURL& url, const String& cookieName)
     webKitClient()->deleteCookie(url, cookieName);
 }
 
+bool ChromiumBridge::cookiesEnabled(const KURL& url,
+                                    const KURL& firstPartyForCookies)
+{
+    return webKitClient()->cookiesEnabled(url, firstPartyForCookies);
+}
+
 // DNS ------------------------------------------------------------------------
 
 void ChromiumBridge::prefetchDNS(const String& hostname)

-- 
WebKit Debian packaging