[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 bdc49f6e8be6a9b7ea4f1fc7da3c77ddc0a7c78e
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 20:03:52 2010 +0000

    2010-03-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Fix critical being printed to stderr on every test. This is
            because the jar is only being created when soup hits the HTTP
            path. We should reconsider the time of its creation.
    
            * DumpRenderTree/gtk/DumpRenderTree.cpp:
            (resetDefaultsToConsistentValues):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55925 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d2eb61b..fb5da79 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Fix critical being printed to stderr on every test. This is
+        because the jar is only being created when soup hits the HTTP
+        path. We should reconsider the time of its creation.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+
 2010-03-12  Adam Roben  <aroben at apple.com>
 
         Teach prepare-ChangeLog to find modified selectors in CSS files
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 9f41538..6aa4c3e 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -350,7 +350,11 @@ static void resetDefaultsToConsistentValues()
 #ifdef HAVE_LIBSOUP_2_29_90
     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);
+
+    // We only create the jar when the soup backend needs to do
+    // HTTP. Should we initialize it earlier, perhaps?
+    if (jar)
+        g_object_set(G_OBJECT(jar), SOUP_COOKIE_JAR_ACCEPT_POLICY, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY, NULL);
 #endif
 
     setlocale(LC_ALL, "");

-- 
WebKit Debian packaging