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

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 4c27e4cdf9a729a00183c835fa10cfc75401ede0
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 16:05:59 2010 +0000

    2010-03-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Eric Carlson.
    
            [GTK] DRT does not handle cookie policy setting
            https://bugs.webkit.org/show_bug.cgi?id=36056
    
            Implement cookie accept policy setting for GTK+'s LayoutTestController.
    
            * DumpRenderTree/gtk/DumpRenderTree.cpp:
            (resetDefaultsToConsistentValues):
            * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
            (LayoutTestController::setAlwaysAcceptCookies):
    
    LayoutTests
    
    2010-03-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Eric Carlson.
    
            [GTK] DRT does not handle cookie policy setting
            https://bugs.webkit.org/show_bug.cgi?id=36056
    
            Fix tests to request that the cookie acceptance policy always allows cookies.
    
            * http/tests/media/video-cookie.html:
            * http/tests/media/video-referer.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 46eee4c..f71633c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -16,6 +16,18 @@
 
 2010-03-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
+        Reviewed by Eric Carlson.
+
+        [GTK] DRT does not handle cookie policy setting
+        https://bugs.webkit.org/show_bug.cgi?id=36056
+
+        Fix tests to request that the cookie acceptance policy always allows cookies.
+
+        * http/tests/media/video-cookie.html:
+        * http/tests/media/video-referer.html:
+
+2010-03-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
         [GTK] Fails fast/dom/Geolocation/maximum-age.htm
         https://bugs.webkit.org/show_bug.cgi?id=36053
 
diff --git a/LayoutTests/http/tests/media/video-cookie.html b/LayoutTests/http/tests/media/video-cookie.html
index d8e6af1..8d5408d 100644
--- a/LayoutTests/http/tests/media/video-cookie.html
+++ b/LayoutTests/http/tests/media/video-cookie.html
@@ -8,6 +8,7 @@
 <script>
     if (window.layoutTestController) {
         layoutTestController.dumpAsText();
+        layoutTestController.setAlwaysAcceptCookies(true);
         layoutTestController.waitUntilDone();
     }
 
diff --git a/LayoutTests/http/tests/media/video-referer.html b/LayoutTests/http/tests/media/video-referer.html
index 866099c..a4de911 100644
--- a/LayoutTests/http/tests/media/video-referer.html
+++ b/LayoutTests/http/tests/media/video-referer.html
@@ -8,6 +8,7 @@
 <script>
     if (window.layoutTestController) {
         layoutTestController.dumpAsText();
+        layoutTestController.setAlwaysAcceptCookies(true);
         layoutTestController.waitUntilDone();
     }
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eac5218..13b254e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Eric Carlson.
+
+        [GTK] DRT does not handle cookie policy setting
+        https://bugs.webkit.org/show_bug.cgi?id=36056
+
+        Implement cookie accept policy setting for GTK+'s LayoutTestController.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::setAlwaysAcceptCookies):
+
 2010-03-12  Adam Langley  <agl at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 18ba2e7..64c1e52 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -347,6 +347,10 @@ static void resetDefaultsToConsistentValues()
 
     webkit_reset_origin_access_white_lists();
 
+    SoupSession* session = webkit_get_default_session();
+    SoupCookieJar* jar = reinterpret_cast<SoupCookieJar*>(soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR));
+    g_object_set(G_OBJECT(jar), SOUP_COOKIE_JAR_ACCEPT_POLICY, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY, NULL);
+
     setlocale(LC_ALL, "");
 }
 
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 3d0289e..2d9d85d 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -210,7 +210,17 @@ void LayoutTestController::setAcceptsEditing(bool acceptsEditing)
 
 void LayoutTestController::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
 {
-    // FIXME: Implement this (and restore the default value before running each test in DumpRenderTree.cpp).
+    SoupSession* session = webkit_get_default_session();
+    SoupCookieJar* jar = reinterpret_cast<SoupCookieJar*>(soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR));
+
+    SoupCookieJarAcceptPolicy policy;
+
+    if (alwaysAcceptCookies)
+        policy = SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
+    else
+        policy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
+
+    g_object_set(G_OBJECT(jar), SOUP_COOKIE_JAR_ACCEPT_POLICY, policy, NULL);
 }
 
 void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive)

-- 
WebKit Debian packaging