[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[caseq at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit cb162ab401a1f2c763ce85dbce1f21f5033d0eed
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 14 13:31:09 2011 +0000

    2011-01-14  Andrey Kosyakov  <caseq at chromium.org>
    
            Unreviewed test fix.
            Filter out /favicon.ico from page resources list to avoid test expectations mismatch on GTK.
    
            * http/tests/inspector/extensions-resources-redirect.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75789 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4f68900..103a843 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-14  Andrey Kosyakov  <caseq at chromium.org>
 
+        Unreviewed test fix.
+        Filter out /favicon.ico from page resources list to avoid test expectations mismatch on GTK.
+
+        * http/tests/inspector/extensions-resources-redirect.html:
+
+2011-01-14  Andrey Kosyakov  <caseq at chromium.org>
+
         Reviewed by Pavel Feldman.
 
         Web Inspector: redirected resources not handled properly in Network panel
diff --git a/LayoutTests/http/tests/inspector/extensions-resources-redirect.html b/LayoutTests/http/tests/inspector/extensions-resources-redirect.html
index b6d5b76..4b64989 100755
--- a/LayoutTests/http/tests/inspector/extensions-resources-redirect.html
+++ b/LayoutTests/http/tests/inspector/extensions-resources-redirect.html
@@ -45,8 +45,12 @@ function extension_testRedirectResourcesInHAR(nextTest)
     {
         var entries = har.entries;
         var urls = [];
-        for (var i = 0; i < entries.length; ++i)
-            urls.push(entries[i].request.url);
+        for (var i = 0; i < entries.length; ++i) {
+            var url = entries[i].request.url;
+            // Workaround for GTK DRT that requests favicon.ico along with the page.
+            if (!/\/favicon\.ico$/.test(url))
+                urls.push(url);
+        }
         urls.sort();
         output("Resources in HAR:\n" + urls.join("\n"));
         nextTest();

-- 
WebKit Debian packaging