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

[christian at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8554862f04e65d939721bec6dc6bae547d8d6b4a
Author: christian at webkit.org <christian at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 16 19:03:50 2009 +0000

    2009-12-16  Christian Dywan  <christian at twotoasts.de>
    
            Reviewed by Gustavo Noronha Silva.
    
            Take into account favicon.ico in the webresource test.
    
            * tests/testwebresource.c:
            (test_web_resource_sub_resource_loading):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52207 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 33f2d7c..0d8c12e 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-16  Christian Dywan  <christian at twotoasts.de>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Take into account favicon.ico in the webresource test.
+
+        * tests/testwebresource.c:
+        (test_web_resource_sub_resource_loading):
+
 2009-12-16  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Rubber-stamped by Xan Lopez.
diff --git a/WebKit/gtk/tests/testwebresource.c b/WebKit/gtk/tests/testwebresource.c
index b9cd40b..e134281 100644
--- a/WebKit/gtk/tests/testwebresource.c
+++ b/WebKit/gtk/tests/testwebresource.c
@@ -271,8 +271,10 @@ static void test_web_resource_sub_resource_loading()
     g_object_unref(main_resource);
 
     sub_resources = webkit_web_data_source_get_subresources(data_source);
+    // Expected resources: javascripts.js, favicon.ico
     g_assert(sub_resources);
-    g_assert(!sub_resources->next);
+    g_assert(sub_resources->next);
+    g_assert(!sub_resources->next->next);
 
     g_assert(WEBKIT_WEB_RESOURCE(sub_resources->data) == sub_resource);
     

-- 
WebKit Debian packaging