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

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 434555a454ef59abdcc56230af9cdc25edcda988
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 14:25:10 2010 +0000

    2010-03-12 Dan Winship <danw at gnome.org>
    
    Reviewed by Gustavo Noronha.
    
            Make the defaultCookieJar use a no-third-party policy. Most
            applications set their own cookie jar, but DumpRenderTree doesn't,
            so it was failing the new third-party-cookie test.
    
            * platform/network/soup/CookieJarSoup.cpp:
            (WebCore::defaultCookieJar):
    
    LayoutTests
    
    2010-03-12  Dan Winship  <danw at gnome.org>
    
            Reviewed by Gustavo Noronha.
    
            Revert previous; the test passes now.
    
            * platform/gtk/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55894 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8554197..57aaccc 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-12  Dan Winship  <danw at gnome.org>
+
+        Reviewed by Gustavo Noronha.
+
+        Revert previous; the test passes now.
+
+        * platform/gtk/Skipped:
+
 2010-03-12  Jochen Eisinger  <jochen at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 39790b2..b98d452 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5823,9 +5823,6 @@ fast/forms/multiple-form-submission-protection-mouse.html
 # mouseScrollBy() is not yet implemented in the GTK EventSender API.
 fast/events/remove-child-onscroll.html
 
-# Apparently a soup bug; See https://bugs.webkit.org/show_bug.cgi?id=35942
-http/tests/plugins/third-party-cookie-accept-policy.html
-
 # For some reason it fails on DRT, although works on GtkLauncher and other ports' DRT.
 # https://bugs.webkit.org/show_bug.cgi?id=35984
 fast/events/spatial-navigation/snav-iframe-with-offscreen-focusable-element.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fb1e787..361ce4d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-12  Dan Winship  <danw at gnome.org>
+
+        Reviewed by Gustavo Noronha.
+
+        Make the defaultCookieJar use a no-third-party policy. Most
+        applications set their own cookie jar, but DumpRenderTree doesn't,
+        so it was failing the new third-party-cookie test.
+
+        * platform/network/soup/CookieJarSoup.cpp:
+        (WebCore::defaultCookieJar):
+
 2010-03-11  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/WebCore/platform/network/soup/CookieJarSoup.cpp b/WebCore/platform/network/soup/CookieJarSoup.cpp
index f288482..56e9f12 100644
--- a/WebCore/platform/network/soup/CookieJarSoup.cpp
+++ b/WebCore/platform/network/soup/CookieJarSoup.cpp
@@ -36,7 +36,11 @@ SoupCookieJar* defaultCookieJar()
 {
     if (!cookiesInitialized) {
         cookiesInitialized = true;
-        setDefaultCookieJar(soup_cookie_jar_new());
+
+        cookieJar = soup_cookie_jar_new();
+#ifdef HAVE_LIBSOUP_2_29_90
+        soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
+#endif
     }
 
     return cookieJar;

-- 
WebKit Debian packaging