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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit a590b27eb0c82ae6824679cb275ae3db3b00a738
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 19:45:06 2010 +0000

    Make urlSuitableForTestResult work for http: URLs, too
    
    Fixes <http://webkit.org/b/42276>
    http/tests/loading/preload-slow-loading.php and
    http/tests/mime/uppercase-mime-type.html fail on Windows.
    
    Reviewed by Darin Adler.
    
    * DumpRenderTree/win/DumpRenderTree.cpp:
    (urlSuitableForTestResult): Don't bail if the URL starts with http://.
    We want this function to work for those URLs, too!
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63346 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d9f8246..2655545 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-14  Adam Roben  <aroben at apple.com>
+
+        Make urlSuitableForTestResult work for http: URLs, too
+
+        Fixes <http://webkit.org/b/42276>
+        http/tests/loading/preload-slow-loading.php and
+        http/tests/mime/uppercase-mime-type.html fail on Windows.
+
+        Reviewed by Darin Adler.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (urlSuitableForTestResult): Don't bail if the URL starts with http://.
+        We want this function to work for those URLs, too!
+
 2010-07-13  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index 451ff86..1286397 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -134,7 +134,7 @@ bool setAlwaysAcceptCookies(bool alwaysAcceptCookies)
 
 wstring urlSuitableForTestResult(const wstring& url)
 {
-    if (!url.c_str() || url.find(L"file://") == wstring::npos)
+    if (!url.c_str() || (url.find(L"file://") == wstring::npos && url.find(L"http://") == wstring::npos))
         return url;
 
     return PathFindFileNameW(url.c_str());

-- 
WebKit Debian packaging