[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e385467667a260624fa29ddcdacdb1b8e34dfa4e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 02:15:26 2010 +0000

    2010-08-10  Sergio Villar Senin  <svillar at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] http/tests/media/video-cookie.html fails
            https://bugs.webkit.org/show_bug.cgi?id=42240
    
            * platform/gtk/Skipped: unskipped test
    2010-08-10  Sergio Villar Senin  <svillar at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] http/tests/media/video-cookie.html fails
            https://bugs.webkit.org/show_bug.cgi?id=42240
    
            * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
            (LayoutTestController::setAlwaysAcceptCookies): create the
            SoupCookieJar if it does not exist. Otherwise the accept policy
            won't be set.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65113 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d920a65..8fdcae2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-10  Sergio Villar Senin  <svillar at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] http/tests/media/video-cookie.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=42240
+
+        * platform/gtk/Skipped: unskipped test
+
 2010-08-10  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 1d17b7f..8251c0d 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5523,9 +5523,6 @@ fast/media/view-mode-media-feature.html
 # https://bugs.webkit.org/show_bug.cgi?id=37034
 http/tests/media/video-play-suspend.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=42240
-http/tests/media/video-cookie.html
-
 # Need to add functionality to DumpRenderTree to handle scrollbar police changes
 fast/overflow/scrollbar-restored-and-then-locked.html
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 908bdb7..aba0d26 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-10  Sergio Villar Senin  <svillar at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] http/tests/media/video-cookie.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=42240
+
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::setAlwaysAcceptCookies): create the
+        SoupCookieJar if it does not exist. Otherwise the accept policy
+        won't be set.
+
 2010-08-10  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 2bc7b32..b18ac03 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -252,6 +252,15 @@ void LayoutTestController::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
     SoupSession* session = webkit_get_default_session();
     SoupCookieJar* jar = reinterpret_cast<SoupCookieJar*>(soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR));
 
+    /* If the jar was not created - we create it on demand, i.e, just
+       in case we have HTTP requests - then we must create it here in
+       order to set the proper accept policy */
+    if (!jar) {
+        jar = soup_cookie_jar_new();
+        soup_session_add_feature(session, SOUP_SESSION_FEATURE(jar));
+        g_object_unref(jar);
+    }
+
     SoupCookieJarAcceptPolicy policy;
 
     if (alwaysAcceptCookies)

-- 
WebKit Debian packaging